Merge branch 'master' of github.com:gnuboard/g5

adm/config_form.php

@@ -570,14 +570,14 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td colspan="3">
                 <?php if (!function_exists('curl_init')) echo help('<b>경고) curl이 지원되지 않아 네이버 신디케이션을 사용할수 없습니다.</b>'); ?>
                 <?php echo help('네이버 신디케이션 연동키(token)을 입력하면 네이버 신디케이션을 사용할 수 있습니다.<br>연동키는 <a href="http://webmastertool.naver.com/" target="_blank"><u>네이버 웹마스터도구</u></a> -> 네이버 신디케이션에서 발급할 수 있습니다.') ?>
-                <input type="text" name="cf_syndi_token" value="<?php echo get_sanitize_input($config['cf_syndi_token']); ?>" id="cf_syndi_token" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_token" value="<?php echo isset($config['cf_syndi_token']) ? get_sanitize_input($config['cf_syndi_token']) : ''; ?>" id="cf_syndi_token" class="frm_input" size="70">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_syndi_except">네이버 신디케이션 제외게시판</label></th>
             <td colspan="3">
                 <?php echo help('네이버 신디케이션 수집에서 제외할 게시판 아이디를 | 로 구분하여 입력하십시오. 예) notice|adult<br>참고로 그룹접근사용 게시판, 글읽기 권한 2 이상 게시판, 비밀글은 신디케이션 수집에서 제외됩니다.') ?>
-                <input type="text" name="cf_syndi_except" value="<?php echo get_sanitize_input($config['cf_syndi_except']); ?>" id="cf_syndi_except" class="frm_input" size="70">
+                <input type="text" name="cf_syndi_except" value="<?php echo isset($config['cf_syndi_except']) ? get_sanitize_input($config['cf_syndi_except']) : ''; ?>" id="cf_syndi_except" class="frm_input" size="70">
             </td>
         </tr>
         </tbody>
@@ -1317,7 +1317,7 @@ include_once('_rewrite_config_form.php');
             <th scope="row"><label for="cf_icode_token_key">아이코드 토큰키<br>(JSON버전)</label></th>
             <td>
                 <?php echo help("아이코드 JSON 버전의 경우 아이코드 토큰키를 입력시 실행됩니다.<br>SMS 전송유형을 LMS로 설정시 90바이트 이내는 SMS, 90 ~ 2000 바이트는 LMS 그 이상은 절삭 되어 LMS로 발송됩니다."); ?>
-                <input type="text" name="cf_icode_token_key" value="<?php echo $config['cf_icode_token_key']; ?>" id="cf_icode_token_key" class="frm_input" size="40">
+                <input type="text" name="cf_icode_token_key" value="<?php echo isset($config['cf_icode_token_key']) ? get_sanitize_input($config['cf_icode_token_key']) : ''; ?>" id="cf_icode_token_key" class="frm_input" size="40">
                 <?php echo help("아이코드 사이트 -> 토큰키관리 메뉴에서 생성한 토큰키를 입력합니다."); ?>
                 <br>
                 서버아이피 : <?php echo $_SERVER['SERVER_ADDR']; ?>

adm/faqformupdate.php

@@ -12,11 +12,11 @@ else
 
 check_admin_token();
 
-$fm_id = isset($_POST['fm_id']) ? (int) $_POST['fm_id'] : 0;
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
+$fa_id = isset($_REQUEST['fa_id']) ? (int) $_REQUEST['fa_id'] : 0;
 $fa_subject = isset($_POST['fa_subject']) ? $_POST['fa_subject'] : '';
 $fa_content = isset($_POST['fa_content']) ? $_POST['fa_content'] : '';
 $fa_order = isset($_POST['fa_order']) ? (int) $_POST['fa_order'] : 0;
-$fa_id = isset($_POST['fa_id']) ? (int) $_POST['fa_id'] : 0;
 
 $sql_common = " fa_subject = '$fa_subject',
                 fa_content = '$fa_content',

adm/faqmasterformupdate.php

@@ -15,7 +15,7 @@ check_admin_token();
 @mkdir(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/faq", G5_DIR_PERMISSION);
 
-$fm_id = isset($_POST['fm_id']) ? (int) $_POST['fm_id'] : 0;
+$fm_id = isset($_REQUEST['fm_id']) ? (int) $_REQUEST['fm_id'] : 0;
 $fm_himg_del = isset($_POST['fm_himg_del']) ? (int) $_POST['fm_himg_del'] : 0;
 $fm_timg_del = isset($_POST['fm_timg_del']) ? (int) $_POST['fm_timg_del'] : 0;
 $fm_subject = isset($_POST['fm_subject']) ? strip_tags(clean_xss_attributes($_POST['fm_subject'])) : '';

adm/newwinformupdate.php

@@ -2,7 +2,7 @@
 $sub_menu = '100310';
 include_once('./_common.php');
 
-$nw_id = isset($_POST['nw_id']) ? preg_replace('/[^0-9]/', '', $_POST['nw_id']) : 0;
+$nw_id = isset($_REQUEST['nw_id']) ? preg_replace('/[^0-9]/', '', $_REQUEST['nw_id']) : 0;
 
 if ($w == "u" || $w == "d")
     check_demo();

adm/sms_admin/form_group.php

@@ -136,7 +136,7 @@ function grouplist_submit(f)
         </td>
         <td class="td_left">
             <label for="fg_name_<?php echo $i; ?>" class="sound_only">그룹명</label>
-            <input type="text" name="fg_name[<?php echo $i; ?>]" value="<?php echo $group[$i]['fg_name']?>" id="fg_name_<?php echo $i; ?>" class="frm_input">
+            <input type="text" name="fg_name[<?php echo $i; ?>]" value="<?php echo get_sanitize_input($group[$i]['fg_name']); ?>" id="fg_name_<?php echo $i; ?>" class="frm_input">
             <input type="checkbox" name="fg_member[<?php echo $i; ?>]" value="1" id="fg_member_<?php echo $i; ?>" <?php if ($group[$i]['fg_member']) echo 'checked';?>>
             <label for="fg_member_<?php echo $i; ?>">회원</label>
         </td>

adm/sms_admin/form_group_update.php

@@ -13,7 +13,7 @@ if ($w == 'u') // 업데이트
         // 실제 번호를 넘김
         $k = $post_cnk[$i];
         $fg_no = isset($_POST['fg_no'][$k]) ? (int) $_POST['fg_no'][$k] : 0;
-        $fg_name = isset($_POST['fg_name'][$k]) ? addslashes(strip_tags($_POST['fg_name'][$k])) : '';
+        $fg_name = isset($_POST['fg_name'][$k]) ? addslashes(strip_tags(clean_xss_attributes($_POST['fg_name'][$k]))) : '';
         $fg_member = isset($_POST['fg_member'][$k]) ? addslashes(strip_tags($_POST['fg_member'][$k])) : '';
 
         if (!is_numeric($fg_no))
@@ -82,11 +82,11 @@ else if ($w == 'no')
 }
 else // 등록
 {
+    $fg_name = isset($_POST['fg_name']) ? addslashes(strip_tags(clean_xss_attributes($_POST['fg_name']))) : '';
+
     if (!strlen(trim($fg_name)))
         alert('그룹명을 입력해주세요');
 
-    $fg_name = addslashes(strip_tags($fg_name));
-
     $res = sql_fetch("select fg_name from {$g5['sms5_form_group_table']} where fg_name = '$fg_name'");
     if ($res)
         alert('같은 그룹명이 존재합니다.');

adm/view.php

@@ -2,6 +2,7 @@
 include_once('./_common.php');
 
 $call = isset($_REQUEST['call']) ?  strtolower(preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['call'])) : '';
+$token = isset($_REQUEST['token']) ? clean_xss_tags($_REQUEST['token'], 1, 1) : '';
 
 if( ! $call ){
     return;

bbs/content.php

@@ -12,12 +12,12 @@ if( !isset($g5['content_table']) ){
 // 내용
 if($co_seo_title){
     $co = get_content_by_field($g5['content_table'], 'content', 'co_seo_title', generate_seo_title($co_seo_title));
-    $co_id = $co['co_id'];
+    $co_id = isset($co['co_id']) ? $co['co_id'] : 0;
 } else {
     $co = get_content_db($co_id);
 }
 
-if( ! (isset($co['co_seo_title']) && $co['co_seo_title']) && $co['co_id'] ){
+if( ! (isset($co['co_seo_title']) && $co['co_seo_title']) && isset($co['co_id']) && $co['co_id'] ){
     seo_title_update($g5['content_table'], $co['co_id'], 'content');
 }
 

bbs/new_delete.php

@@ -10,7 +10,6 @@ $board = array('bo_table'=>'');
 $save_bo_table = array();
 $save_wr_id = array();
 $count_chk_bn_id = (isset($_POST['chk_bn_id']) && is_array($_POST['chk_bn_id'])) ? count($_POST['chk_bn_id']) : 0;
-$count_write = 0;
 
 for($i=0;$i<$count_chk_bn_id;$i++)
 {
@@ -19,6 +18,8 @@ for($i=0;$i<$count_chk_bn_id;$i++)
 
     $bo_table = isset($_POST['bo_table'][$k]) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['bo_table'][$k]) : '';
     $wr_id    = isset($_POST['wr_id'][$k]) ? preg_replace('/[^0-9]/i', '', $_POST['wr_id'][$k]) : 0;
+    
+    $count_write = $count_comment = 0;
 
     $save_bo_table[$i] = $bo_table;
 	$save_wr_id[$i] = $wr_id;

bbs/point.php

@@ -21,6 +21,17 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
+$sql = " select *
+            {$sql_common}
+            {$sql_order}
+            limit {$from_record}, {$rows} ";
+
+$result = sql_query($sql);
+
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+    $list[] = $row;
+}
+
 include_once($member_skin_path.'/point.skin.php');
 
 include_once(G5_PATH.'/tail.sub.php');

bbs/register_form_update.php

@@ -34,8 +34,8 @@ if(!$mb_id)
 $mb_password    = isset($_POST['mb_password']) ? trim($_POST['mb_password']) : '';
 $mb_password_re = isset($_POST['mb_password_re']) ? trim($_POST['mb_password_re']) : '';
 $mb_name        = isset($_POST['mb_name']) ? trim($_POST['mb_name']) : '';
-$mb_nick        = isset($_POST['mb_name']) ? trim($_POST['mb_nick']) : '';
-$mb_email       = isset($_POST['mb_name']) ? trim($_POST['mb_email']) : '';
+$mb_nick        = isset($_POST['mb_nick']) ? trim($_POST['mb_nick']) : '';
+$mb_email       = isset($_POST['mb_email']) ? trim($_POST['mb_email']) : '';
 $mb_sex         = isset($_POST['mb_sex'])           ? trim($_POST['mb_sex'])         : "";
 $mb_birth       = isset($_POST['mb_birth'])         ? trim($_POST['mb_birth'])       : "";
 $mb_homepage    = isset($_POST['mb_homepage'])      ? trim($_POST['mb_homepage'])    : "";

bbs/view.php

@@ -28,7 +28,7 @@ if (!$board['bo_use_list_view']) {
     $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply < '{$write['wr_reply']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
     $prev = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
-    if (isset($prev['wr_id']) && !$prev['wr_id'])     {
+    if (! (isset($prev['wr_id']) && $prev['wr_id'])) {
         $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num < '{$write['wr_num']}' {$sql_search} order by wr_num desc, wr_reply desc limit 1 ";
         $prev = sql_fetch($sql);
     }
@@ -37,7 +37,7 @@ if (!$board['bo_use_list_view']) {
     $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num = '{$write['wr_num']}' and wr_reply > '{$write['wr_reply']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
     $next = sql_fetch($sql);
     // 위의 쿼리문으로 값을 얻지 못했다면
-    if (isset($next['wr_id']) && !$next['wr_id']) {
+    if (! (isset($next['wr_id']) && $next['wr_id'])) {
         $sql = " select wr_id, wr_subject, wr_datetime from {$write_table} where wr_is_comment = 0 and wr_num > '{$write['wr_num']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
         $next = sql_fetch($sql);
     }

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.4.3');
+define('G5_GNUBOARD_VER', '5.4.4.8');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

lib/common.lib.php

@@ -2044,17 +2044,18 @@ function bad_tag_convert($code)
     global $view;
     global $member, $is_admin;
 
-    if ($is_admin && $member['mb_id'] != $view['mb_id']) {
+    if ($is_admin && $member['mb_id'] !== $view['mb_id']) {
         //$code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>(\<\/(embed|object)\>)?#i",
         // embed 또는 object 태그를 막지 않는 경우 필터링이 되도록 수정
-        $code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>?(\<\/(embed|object)\>)?#i",
-                    create_function('$matches', 'return "<div class=\"embedx\">보안문제로 인하여 관리자 아이디로는 embed 또는 object 태그를 볼 수 없습니다. 확인하시려면 관리권한이 없는 다른 아이디로 접속하세요.</div>";'),
-                    $code);
+        $code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>?(\<\/(embed|object)\>)?#i", '_callback_bad_tag_convert', $code);
     }
 
     return preg_replace("/\<([\/]?)(script|iframe|form)([^\>]*)\>?/i", "&lt;$1$2$3&gt;", $code);
 }
 
+function _callback_bad_tag_convert($matches){
+    return "<div class=\"embedx\">보안문제로 인하여 관리자 아이디로는 embed 또는 object 태그를 볼 수 없습니다. 확인하시려면 관리권한이 없는 다른 아이디로 접속하세요.</div>";
+}
 
 // 토큰 생성
 function _token()

lib/get_data.lib.php

@@ -96,48 +96,48 @@ function get_menu_db($use_mobile=0, $is_cache=false){
     global $g5;
 
     static $cache = array();
-    
-	$cache = run_replace('get_menu_db_cache', $cache, $use_mobile, $is_cache);
-	
-	$key = md5($use_mobile);
+
+    $cache = run_replace('get_menu_db_cache', $cache, $use_mobile, $is_cache);
+
+    $key = md5($use_mobile);
 
     if( $is_cache && isset($cache[$key]) ){
         return $cache[$key];
     }
-	
-	$where = $use_mobile ? "me_mobile_use = '1'" : "me_use = '1'";
 
-	if( !($cache[$key] = run_replace('get_menu_db', array(), $use_mobile)) ){
-		$sql = " select *
-					from {$g5['menu_table']}
-					where $where
-					  and length(me_code) = '2'
-					order by me_order, me_id ";
-		$result = sql_query($sql, false);
+    $where = $use_mobile ? "me_mobile_use = '1'" : "me_use = '1'";
 
-		for ($i=0; $row=sql_fetch_array($result); $i++) {
-			
-			$row['ori_me_link'] = $row['me_link'];
-			$row['me_link'] = short_url_clean($row['me_link']);
+    if( !($cache[$key] = run_replace('get_menu_db', array(), $use_mobile)) ){
+        $sql = " select *
+                from {$g5['menu_table']}
+                where $where
+                and length(me_code) = '2'
+                order by me_order, me_id ";
+        $result = sql_query($sql, false);
+
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
+
+            $row['ori_me_link'] = $row['me_link'];
+            $row['me_link'] = short_url_clean($row['me_link']);
             $row['sub'] = isset($row['sub']) ? $row['sub'] : array();
-			$cache[$key][$i] = $row;
+            $cache[$key][$i] = $row;
 
-			$sql2 = " select *
-						from {$g5['menu_table']}
-						where $where
-						  and length(me_code) = '4'
-						  and substring(me_code, 1, 2) = '{$row['me_code']}'
-						order by me_order, me_id ";
-			$result2 = sql_query($sql2);
-			for ($k=0; $row2=sql_fetch_array($result2); $k++) {
-				$row2['ori_me_link'] = $row2['me_link'];
-				$row2['me_link'] = short_url_clean($row2['me_link']);
-				$cache[$key][$i]['sub'][$k] = $row2;
-			}
-		}
-	}
+            $sql2 = " select *
+                    from {$g5['menu_table']}
+                    where $where
+                    and length(me_code) = '4'
+                    and substring(me_code, 1, 2) = '{$row['me_code']}'
+                    order by me_order, me_id ";
+            $result2 = sql_query($sql2);
+            for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                $row2['ori_me_link'] = $row2['me_link'];
+                $row2['me_link'] = short_url_clean($row2['me_link']);
+                $cache[$key][$i]['sub'][$k] = $row2;
+            }
+        }
+    }
 
-	return $cache[$key];
+    return $cache[$key];
 }
 
 // 게시판 테이블에서 하나의 행을 읽음
@@ -465,7 +465,7 @@ function get_memo_not_read($mb_id, $add_where='')
     $sql = " SELECT count(*) as cnt FROM {$g5['memo_table']} WHERE me_recv_mb_id = '$mb_id' and me_type= 'recv' and me_read_datetime like '0%' $add_where ";
     $row = sql_fetch($sql, false);
 
-    return $row['cnt'];
+    return isset($row['cnt']) ? $row['cnt'] : 0;
 }
 
 function get_scrap_totals($mb_id=''){
@@ -476,5 +476,5 @@ function get_scrap_totals($mb_id=''){
     $sql = " select count(*) as cnt from {$g5['scrap_table']} where 1=1 $add_where";
     $row = sql_fetch($sql, false);
 
-    return $row['cnt'];
+    return isset($row['cnt']) ? $row['cnt'] : 0;
 }

lib/mailer.lib.php

@@ -16,6 +16,12 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc=
     if ($type != 1)
         $content = nl2br($content);
 
+    $result = run_replace('mailer', $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc);
+    
+    if( isset($result['return']) ){
+        return $result['return'];
+    }
+
     $mail = new PHPMailer(); // defaults to using php "mail()"
     if (defined('G5_SMTP') && G5_SMTP) {
         $mail->IsSMTP(); // telling the class to use SMTP

lib/uri.lib.php

@@ -91,7 +91,7 @@ function get_pretty_url($folder, $no='', $query_string='', $action='')
                 $url .= ($folder === 'content') ? '?co_id='. $no : '?'. $no;
             }
             if($query_string) {
-                $url .= ($no ? '?' : '&'). $query_string;
+                $url .= (!$no ? '?' : '&'). $query_string;
             }
         }
 

mobile/newwin.inc.php

@@ -16,7 +16,7 @@ $result = sql_query($sql, false);
 for ($i=0; $nw=sql_fetch_array($result); $i++)
 {
     // 이미 체크 되었다면 Continue
-    if ($_COOKIE["hd_pops_{$nw['nw_id']}"])
+    if (isset($_COOKIE["hd_pops_{$nw['nw_id']}"]) && $_COOKIE["hd_pops_{$nw['nw_id']}"])
         continue;
 ?>
 

mobile/skin/latest/basic/latest.skin.php

@@ -28,7 +28,8 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
             $img = $thumb['src'] ? $thumb['src'] : '';
             $img_content = $img ? '<img src="'.$img.'" alt="'.$thumb['alt'].'" >' : '';
-            
+            $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
             $echo_ul = ( $i && (($i % $divisor_count) === 0) ) ? '</ul><ul class="item">'.PHP_EOL : '';
 
             echo $echo_ul;
@@ -38,10 +39,10 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
+                    echo "<a href=\"".$wr_href."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
-                echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
+                echo "<a href=\"".$wr_href."\" class=\"lt_tit\">";
                 if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
                 if ($list[$i]['is_notice'])
                     echo "<strong>".$list[$i]['subject']."</strong>";

mobile/skin/latest/comment/latest.skin.php

@@ -15,7 +15,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
             <div class="cm_lt_info">
-            	<a href="<?php echo $list[$i]['href']; ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
+            	<a href="<?php echo get_pretty_url($bo_table, $list[$i]['wr_id']); ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
 				<br>
 				<span class="lt_nick"><?php echo $list[$i]['name'] ?></span>
             	<span class="lt_date"><?php echo $list[$i]['datetime2'] ?></span>              

mobile/skin/latest/notice/latest.skin.php

@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

mobile/skin/member/basic/point.skin.php

@@ -18,13 +18,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <ul class="point_list">
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_list">자료가 없습니다.</li>';

skin/latest/basic/latest.skin.php

@@ -14,7 +14,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

skin/latest/notice/latest.skin.php

@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

skin/latest/pic_block/latest.skin.php

@@ -23,13 +23,14 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         $thumb['alt'] = '이미지가 없습니다.';
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+    $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
     ?>
         <li class="gallery_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
+            <a href="<?php echo $wr_href; ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".$wr_href."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

skin/latest/pic_list/latest.skin.php

@@ -17,6 +17,8 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         
         $img_link_html = '';
         
+        $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
         if( $i === 0 ) {
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
@@ -27,7 +29,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
+            $img_link_html = '<a href="'.$wr_href.'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
@@ -35,7 +37,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  
-            echo "<a href=\"".$list[$i]['href']."\" class=\"pic_li_tit\"> ";
+            echo "<a href=\"".$wr_href."\" class=\"pic_li_tit\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

skin/member/basic/point.skin.php

@@ -18,13 +18,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <ul class="point_list">
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_li">자료가 없습니다.</li>';

theme/basic/mobile/skin/latest/basic/latest.skin.php

@@ -28,7 +28,8 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
             $img = $thumb['src'] ? $thumb['src'] : '';
             $img_content = $img ? '<img src="'.$img.'" alt="'.$thumb['alt'].'" >' : '';
-            
+            $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
+
             $echo_ul = ( $i && (($i % $divisor_count) === 0) ) ? '</ul><ul class="item">'.PHP_EOL : '';
 
             echo $echo_ul;
@@ -38,10 +39,10 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
+                    echo "<a href=\"".$wr_href."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
-                echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
+                echo "<a href=\"".$wr_href."\" class=\"lt_tit\">";
                 if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i> ";
                 if ($list[$i]['is_notice'])
                     echo "<strong>".$list[$i]['subject']."</strong>";

theme/basic/mobile/skin/latest/comment/latest.skin.php

@@ -15,7 +15,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
             <div class="cm_lt_info">
-            	<a href="<?php echo $list[$i]['href']; ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
+            	<a href="<?php echo get_pretty_url($bo_table, $list[$i]['wr_id']); ?>" class="over"><?php echo $list[$i]['subject']; ?></a>
 				<br>
 				<span class="lt_nick"><?php echo $list[$i]['name'] ?></span>
             	<span class="lt_date"><?php echo $list[$i]['datetime2'] ?></span>              

theme/basic/mobile/skin/latest/notice/latest.skin.php

@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

theme/basic/mobile/skin/member/basic/point.skin.php

@@ -19,12 +19,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
 
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_list">자료가 없습니다.</li>';

theme/basic/skin/latest/basic/latest.skin.php

@@ -14,7 +14,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

theme/basic/skin/latest/notice/latest.skin.php

@@ -16,7 +16,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
             if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
              //echo $list[$i]['icon_reply']." ";
-            echo "<a href=\"".$list[$i]['href']."\">";
+            echo "<a href=\"".get_pretty_url($bo_table, $list[$i]['wr_id'])."\">";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

theme/basic/skin/latest/pic_block/latest.skin.php

@@ -23,13 +23,14 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
         $thumb['alt'] = '이미지가 없습니다.';
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+    $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
     ?>
         <li class="galley_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
+            <a href="<?php echo $wr_href; ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
-            echo "<a href=\"".$list[$i]['href']."\"> ";
+            echo "<a href=\"".$wr_href."\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

theme/basic/skin/latest/pic_list/latest.skin.php

@@ -16,6 +16,8 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
     for ($i=0; $i<$list_count; $i++) {
         
         $img_link_html = '';
+
+        $wr_href = get_pretty_url($bo_table, $list[$i]['wr_id']);
         
         if( $i === 0 ) {
             $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
@@ -27,7 +29,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
+            $img_link_html = '<a href="'.$wr_href.'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
@@ -35,7 +37,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  
-            echo "<a href=\"".$list[$i]['href']."\" class=\"pic_li_tit\"> ";
+            echo "<a href=\"".$wr_href."\" class=\"pic_li_tit\"> ";
             if ($list[$i]['is_notice'])
                 echo "<strong>".$list[$i]['subject']."</strong>";
             else

theme/basic/skin/member/basic/point.skin.php

@@ -19,12 +19,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php
             $sum_point1 = $sum_point2 = $sum_point3 = 0;
 
-            $sql = " select *
-                        {$sql_common}
-                        {$sql_order}
-                        limit {$from_record}, {$rows} ";
-            $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $i = 0;
+            foreach((array) $list as $row){
                 $point1 = $point2 = 0;
                 $point_use_class = '';
                 if ($row['po_point'] > 0) {
@@ -55,7 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 </span>
             </li>
             <?php
-            }
+                $i++;
+            }   // end foreach
 
             if ($i == 0)
                 echo '<li class="empty_li">자료가 없습니다.</li>';