Merge branch 'g54' of github.com:gnuboard/g5 into 54

adm/_common.php

@@ -6,4 +6,6 @@ include_once(G5_ADMIN_PATH.'/admin.lib.php');
 if( isset($token) ){
     $token = @htmlspecialchars(strip_tags($token), ENT_QUOTES);
 }
+
+run_event('admin_common');
 ?>

adm/admin.lib.php

@@ -486,6 +486,37 @@ function admin_check_xss_params($params){
     return;
 }
 
+function admin_menu_find_by($call, $search_key){
+    global $menu;
+    
+    static $cache_menu = array();
+    
+    if( empty($cache_menu) ){
+        foreach( $menu as $k1=>$arr1 ){
+
+            if (empty($arr1) ) continue;
+            foreach( $arr1 as $k2=>$arr2 ){
+                if (empty($arr2) ) continue;
+
+                $menu_key = isset($arr2[3]) ? $arr2[3] : '';
+                if (empty($menu_key) ) continue;
+
+                $cache_menu[$menu_key] = array(
+                    'sub_menu'=>$arr2[0],
+                    'title'=>$arr2[1],
+                    'link'=>$arr2[2],
+                    );
+            }
+        }
+    }
+
+    if( isset($cache_menu[$call]) && isset($cache_menu[$call][$search_key]) ){
+        return$cache_menu[$call][$search_key];
+    }
+
+    return '';
+}
+
 // 접근 권한 검사
 if (!$member['mb_id'])
 {
@@ -541,6 +572,11 @@ foreach($menu_files as $file){
 }
 @ksort($amenu);
 
+$amenu = run_replace('admin_amenu', $amenu);
+if( isset($menu) && $menu ){
+    $menu = run_replace('admin_menu', $menu); 
+}
+
 $arr_query = array();
 if (isset($sst))  $arr_query[] = 'sst='.$sst;
 if (isset($sod))  $arr_query[] = 'sod='.$sod;

adm/board_copy_update.php

@@ -160,6 +160,8 @@ if ($copy_case == 'schema_data_both') {
         }
     }
     $d->close();
+    
+    run_event('admin_board_copy_file', $bo_table, $target_table);
 
     // 글복사
     $sql = " insert into {$g5['write_prefix']}$target_table select * from {$g5['write_prefix']}$bo_table ";
@@ -181,6 +183,9 @@ if ($copy_case == 'schema_data_both') {
 
 if (count($file_copy)) {
     for ($i=0; $i<count($file_copy); $i++) {
+
+        $file_copy[$i] = run_replace('admin_copy_update_file', $file_copy[$i], $file_copy[$i]['bf_file'], $bo_table, $target_table);
+
         $sql = " insert into {$g5['board_file_table']}
                     set bo_table = '$target_table',
                          wr_id = '{$file_copy[$i]['wr_id']}',
@@ -189,11 +194,15 @@ if (count($file_copy)) {
                          bf_file = '{$file_copy[$i]['bf_file']}',
                          bf_download = '{$file_copy[$i]['bf_download']}',
                          bf_content = '".addslashes($file_copy[$i]['bf_content'])."',
+                         bf_fileurl = '".addslashes($file_copy[$i]['bf_fileurl'])."',
+                         bf_thumburl = '".addslashes($file_copy[$i]['bf_thumburl'])."',
+                         bf_storage = '".addslashes($file_copy[$i]['bf_storage'])."',
                          bf_filesize = '{$file_copy[$i]['bf_filesize']}',
                          bf_width = '{$file_copy[$i]['bf_width']}',
                          bf_height = '{$file_copy[$i]['bf_height']}',
                          bf_type = '{$file_copy[$i]['bf_type']}',
                          bf_datetime = '{$file_copy[$i]['bf_datetime']}' ";
+
         sql_query($sql, false);
     }
 }

adm/board_form.php

@@ -1114,25 +1114,23 @@ $pg_anchor = '<ul class="anchor">
             <td>
                 <?php echo help('리스트에서 기본으로 정렬에 사용할 필드를 선택합니다. "기본"으로 사용하지 않으시는 경우 속도가 느려질 수 있습니다.') ?>
                 <select id="bo_sort_field" name="bo_sort_field">
-                    <option value="" <?php echo get_selected($board['bo_sort_field'], ""); ?>>wr_num, wr_reply : 기본</option>
-                    <option value="wr_datetime asc" <?php echo get_selected($board['bo_sort_field'], "wr_datetime asc"); ?>>wr_datetime asc : 날짜 이전것 부터</option>
-                    <option value="wr_datetime desc" <?php echo get_selected($board['bo_sort_field'], "wr_datetime desc"); ?>>wr_datetime desc : 날짜 최근것 부터</option>
-                    <option value="wr_hit asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_hit asc, wr_num, wr_reply"); ?>>wr_hit asc : 조회수 낮은것 부터</option>
-                    <option value="wr_hit desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_hit desc, wr_num, wr_reply"); ?>>wr_hit desc : 조회수 높은것 부터</option>
-                    <option value="wr_last asc" <?php echo get_selected($board['bo_sort_field'], "wr_last asc"); ?>>wr_last asc : 최근글 이전것 부터</option>
-                    <option value="wr_last desc" <?php echo get_selected($board['bo_sort_field'], "wr_last desc"); ?>>wr_last desc : 최근글 최근것 부터</option>
-                    <option value="wr_comment asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_comment asc, wr_num, wr_reply"); ?>>wr_comment asc : 댓글수 낮은것 부터</option>
-                    <option value="wr_comment desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_comment desc, wr_num, wr_reply"); ?>>wr_comment desc : 댓글수 높은것 부터</option>
-                    <option value="wr_good asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_good asc, wr_num, wr_reply"); ?>>wr_good asc : 추천수 낮은것 부터</option>
-                    <option value="wr_good desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_good desc, wr_num, wr_reply"); ?>>wr_good desc : 추천수 높은것 부터</option>
-                    <option value="wr_nogood asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_nogood asc, wr_num, wr_reply"); ?>>wr_nogood asc : 비추천수 낮은것 부터</option>
-                    <option value="wr_nogood desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_nogood desc, wr_num, wr_reply"); ?>>wr_nogood desc : 비추천수 높은것 부터</option>
-                    <option value="wr_subject asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_subject asc, wr_num, wr_reply"); ?>>wr_subject asc : 제목 오름차순</option>
-                    <option value="wr_subject desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_subject desc, wr_num, wr_reply"); ?>>wr_subject desc : 제목 내림차순</option>
-                    <option value="wr_name asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_name asc, wr_num, wr_reply"); ?>>wr_name asc : 글쓴이 오름차순</option>
-                    <option value="wr_name desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "wr_name desc, wr_num, wr_reply"); ?>>wr_name desc : 글쓴이 내림차순</option>
-                    <option value="ca_name asc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "ca_name asc, wr_num, wr_reply"); ?>>ca_name asc : 분류명 오름차순</option>
-                    <option value="ca_name desc, wr_num, wr_reply" <?php echo get_selected($board['bo_sort_field'], "ca_name desc, wr_num, wr_reply"); ?>>ca_name desc : 분류명 내림차순</option>
+                    <?php foreach( get_board_sort_fields($board) as $v ){
+                        
+                        $option_value = $order_by_str = $v[0];
+                        if( $v[0] === 'wr_num, wr_reply' ){
+                            $selected = (! $board['bo_sort_field']) ? 'selected="selected"' : '';
+                            $option_value = '';
+                        } else {
+                            $selected = ($board['bo_sort_field'] === $v[0]) ? 'selected="selected"' : '';
+                        }
+                        
+                        if( $order_by_str !== 'wr_num, wr_reply' ){
+                            $tmp = explode(',', $v[0]);
+                            $order_by_str = $tmp[0];
+                        }
+
+                        echo '<option value="'.$option_value.'" '.$selected.' >'.$order_by_str.' : '.$v[1].'</option>';
+                    } //end foreach ?>
                 </select>
             </td>
             <td class="td_grpset">

adm/board_list_update.php

@@ -10,6 +10,10 @@ if (!count($_POST['chk'])) {
 
 check_admin_token();
 
+$act_button = isset($_POST['act_button']) ? strip_tags($_POST['act_button']) : '';
+$chk = (isset($_POST['chk']) && is_array($_POST['chk'])) ? $_POST['chk'] : array();
+$board_table = (isset($_POST['board_table']) && is_array($_POST['board_table'])) ? $_POST['board_table'] : array();
+
 if ($_POST['act_button'] == "선택수정") {
 
     auth_check($auth[$sub_menu], 'w');
@@ -74,5 +78,7 @@ if ($_POST['act_button'] == "선택수정") {
 
 }
 
+run_event('admin_board_list_update', $act_button, $chk, $board_table, $qstr);
+
 goto_url('./board_list.php?'.$qstr);
 ?>

adm/cache_file_delete.php

@@ -10,6 +10,8 @@ if(function_exists('social_log_file_delete')){
     social_log_file_delete();
 }
 
+run_event('adm_cache_file_delete_before');
+
 $g5['title'] = '캐시파일 일괄삭제';
 include_once('./admin.head.php');
 ?>
@@ -31,6 +33,9 @@ $cnt=0;
 echo '<ul class="session_del">'.PHP_EOL;
 
 $files = glob(G5_DATA_PATH.'/cache/latest-*');
+$content_files = glob(G5_DATA_PATH.'/cache/content-*');
+
+$files = array_merge($files, $content_files);
 if (is_array($files)) {
     foreach ($files as $cache_file) {
         $cnt++;
@@ -44,6 +49,8 @@ if (is_array($files)) {
     }
 }
 
+run_event('adm_cache_file_delete');
+
 echo '<li>완료됨</li></ul>'.PHP_EOL;
 echo '<div class="local_desc01 local_desc"><p><strong>최신글 캐시파일 '.$cnt.'건 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
 ?>

adm/config_form.php

@@ -1089,7 +1089,7 @@ include_once('_rewrite_config_form.php');
                     <input type="checkbox" name="cf_social_servicelist[]" id="check_social_kakao" value="kakao" <?php echo option_array_checked('kakao', $config['cf_social_servicelist']); ?> >
                     <label for="check_social_kakao">카카오 로그인을 사용합니다</label>
                     <div>
-                    <h3>카카오 웹 Redirect Path</h3>
+                    <h3>카카오 로그인 Redirect URI</h3>
                     <p><?php echo get_social_callbackurl('kakao', true); ?></p>
                     </div>
                 </div>

adm/dbupgrade.php

@@ -147,6 +147,20 @@ if(!isset($member['mb_memo_cnt'])) {
     $is_check = true;
 }
 
+// 파일테이블에 추가 칼럼
+
+$sql = " SHOW COLUMNS FROM `{$g5['board_file_table']}` LIKE 'bf_fileurl' ";
+$row = sql_fetch($sql);
+
+if( !$row ) {
+    sql_query(" ALTER TABLE `{$g5['board_file_table']}` 
+                ADD COLUMN `bf_fileurl` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bf_content`,
+                ADD COLUMN `bf_thumburl` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bf_fileurl`,
+                ADD COLUMN `bf_storage` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bf_thumburl`", true);
+
+    $is_check = true;
+}
+
 $is_check = run_replace('admin_dbupgrade', $is_check);
 
 $db_upgrade_msg = $is_check ? 'DB 업그레이드가 완료되었습니다.' : '더 이상 업그레이드 할 내용이 없습니다.<br>현재 DB 업그레이드가 완료된 상태입니다.';

adm/member_form.php

@@ -441,6 +441,8 @@ this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }">
     <?php
         }   //end if
     }   //end if
+
+    run_event('admin_member_form_add', $mb, $w, 'table');
     ?>
 
     <?php for ($i=1; $i<=10; $i++) { ?>
@@ -476,7 +478,8 @@ function fmember_submit(f)
     return true;
 }
 </script>
-
 <?php
+run_event('admin_member_form_after', $mb, $w);
+
 include_once('./admin.tail.php');
 ?>

adm/qa_config.php

@@ -306,7 +306,7 @@ if(!isset($qaconfig['qa_include_head'])) {
         <tr>
             <th scope="row"><label for="qa_insert_content">글쓰기 기본 내용</label></th>
             <td>
-                <textarea id="qa_insert_content" name="qa_insert_content" rows="5"><?php echo $qaconfig['qa_insert_content'] ?></textarea>
+                <textarea id="qa_insert_content" name="qa_insert_content" rows="5"><?php echo html_purifier($qaconfig['qa_insert_content']); ?></textarea>
             </td>
         </tr>
         <?php for ($i=1; $i<=5; $i++) { ?>

adm/qa_config_update.php

@@ -50,6 +50,8 @@ if( $qa_include_tail && ! is_include_path_check($qa_include_tail, 1) ){
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
 }
 
+$_POST['qa_title'] = strip_tags($_POST['qa_title']);
+
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
                 qa_category             = '{$_POST['qa_category']}',

adm/sms_admin/ajax.sms_write_form.php

@@ -74,10 +74,13 @@ while($res = sql_fetch_array($qry))
     ";
 }
 
-$arr_ajax_msg['error'] = "";
-$arr_ajax_msg['list_text'] = $list_text;
-$arr_ajax_msg['page'] = $page;
-$arr_ajax_msg['total_count'] = $total_count;
-$arr_ajax_msg['total_page'] = $total_page;
+$arr_ajax_msg = array(
+'error'=>'',
+'list_text'=>$list_text,
+'page'=>$page,
+'total_count'=>$total_count,
+'total_page'=>$total_page
+);
+
 die( json_encode($arr_ajax_msg) );
 ?>

adm/sms_admin/history_view.php

@@ -12,6 +12,10 @@ if( $st && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){
     $st = '';
 }
 
+if( $sst && !in_array($sst, array('mb_id', 'bk_no', 'hs_name', 'hs_hp', 'hs_datetime', 'hs_flag', 'hs_code', 'hs_memo', 'hs_log')) ){
+    $sst = '';
+}
+
 auth_check($auth[$sub_menu], "r");
 
 $g5['title'] = "문자전송 상세내역";
@@ -22,7 +26,7 @@ if (!is_numeric($wr_no))
 if ($spage < 1) $spage = 1;
 
 if ($sst && trim($ssv))
-    $sql_search = " and $sst like '%$ssv%' ";
+    $sql_search = " and $sst like '%".sql_real_escape_string($ssv)."%' ";
 else
     $sql_search = "";
 

adm/view.php

@@ -0,0 +1,20 @@
+<?php
+include_once('./_common.php');
+
+$call = isset($_REQUEST['call']) ?  strtolower(preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['call'])) : '';
+
+if( ! $call || ! $is_admin ){
+    return;
+}
+
+run_event('admin_request_handler_'.$call, $arr_query, $token);
+
+$sub_menu = admin_menu_find_by($call, 'sub_menu');
+$g5['title'] = admin_menu_find_by($call, 'title');
+
+include_once ('./admin.head.php');
+
+run_event('admin_get_page_'.$call, $arr_query, $token);
+
+include_once ('./admin.tail.php');
+?>

bbs/delete.php

@@ -80,7 +80,11 @@ while ($row = sql_fetch_array($result))
         $sql2 = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ";
         $result2 = sql_query($sql2);
         while ($row2 = sql_fetch_array($result2)) {
-            @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row2['bf_file']));
+
+            $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row2['bf_file']), $row2);
+            if( file_exists($delete_file) ){
+                @unlink($delete_file);
+            }
             // 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {
                 delete_board_thumbnail($bo_table, $row2['bf_file']);

bbs/delete_all.php

@@ -98,7 +98,10 @@ for ($i=$chk_count-1; $i>=0; $i--)
             $result2 = sql_query($sql2);
             while ($row2 = sql_fetch_array($result2)) {
                 // 파일삭제
-                @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '',$row2['bf_file']));
+                $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '',$row2['bf_file']), $row2);
+                if( file_exists($delete_file) ){
+                    @unlink($delete_file);
+                }
 
                 // 썸네일삭제
                 if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {

bbs/download.php

@@ -17,7 +17,7 @@ if (!get_session('ss_view_'.$bo_table.'_'.$wr_id))
 if($board['bo_download_point'] < 0 && $is_guest)
     alert('다운로드 권한이 없습니다.\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?wr_id='.$wr_id.'&amp;'.$qstr.'&amp;url='.urlencode(get_pretty_url($bo_table, $wr_id)));
 
-$sql = " select bf_source, bf_file from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$no' ";
+$sql = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$no' ";
 $file = sql_fetch($sql);
 if (!$file['bf_file'])
     alert_close('파일 정보가 존재하지 않습니다.');
@@ -47,8 +47,11 @@ if ($member['mb_level'] < $board['bo_download_level']) {
 
 $filepath = G5_DATA_PATH.'/file/'.$bo_table.'/'.$file['bf_file'];
 $filepath = addslashes($filepath);
-if (!is_file($filepath) || !file_exists($filepath))
+$file_exist_check = (!is_file($filepath) || !file_exists($filepath)) ? false : true;
+
+if ( false === run_replace('download_file_exist_check', $file_exist_check, $file) ){
     alert('파일이 존재하지 않습니다.');
+}
 
 // 사용자 코드 실행
 @include_once($board_skin_path.'/download.skin.php');
@@ -101,6 +104,8 @@ $original = urlencode($file['bf_source']);
 
 @include_once($board_skin_path.'/download.tail.skin.php');
 
+run_event('download_file_header', $file, $file_exist_check);
+
 if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_SERVER['HTTP_USER_AGENT'])) {
     header("content-type: doesn/matter");
     header("content-length: ".filesize("$filepath"));

bbs/good.php

@@ -1,10 +1,12 @@
 <?php
 include_once('./_common.php');
 
+run_event('bbs_good_before', $bo_table, $wr_id, $good);
+
 @include_once($board_skin_path.'/good.head.skin.php');
 
 // 자바스크립트 사용가능할 때
-if($_POST['js'] == "on") {
+if(isset($_POST['js']) && $_POST['js'] === "on") {
     $error = $count = "";
 
     function print_result($error, $count)
@@ -151,5 +153,7 @@ if($_POST['js'] == "on") {
     }
 }
 
+run_event('bbs_good_after', $bo_table, $wr_id, $good);
+
 @include_once($board_skin_path.'/good.tail.skin.php');
 ?>

bbs/list.php

@@ -153,10 +153,15 @@ if (!$sst) {
         $sod = "";
     }
 } else {
-    // 게시물 리스트의 정렬 대상 필드가 아니라면 공백으로 (nasca 님 09.06.16)
-    // 리스트에서 다른 필드로 정렬을 하려면 아래의 코드에 해당 필드를 추가하세요.
-    // $sst = preg_match("/^(wr_subject|wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
-    $sst = preg_match("/^(wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
+    $board_sort_fields = get_board_sort_fields($board, 1);
+    if (!$sod && array_key_exists($sst, $board_sort_fields)) {
+        $sst = $board_sort_fields[$sst];
+    } else {
+        // 게시물 리스트의 정렬 대상 필드가 아니라면 공백으로 (nasca 님 09.06.16)
+        // 리스트에서 다른 필드로 정렬을 하려면 아래의 코드에 해당 필드를 추가하세요.
+        // $sst = preg_match("/^(wr_subject|wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
+        $sst = preg_match("/^(wr_datetime|wr_hit|wr_good|wr_nogood)$/i", $sst) ? $sst : "";
+    }
 }
 
 if(!$sst)

bbs/login_check.php

@@ -54,6 +54,8 @@ if ( is_use_email_certify() && !preg_match("/[1-9]/", $mb['mb_email_certify']))
     confirm("{$mb['mb_email']} 메일로 메일인증을 받으셔야 로그인 가능합니다. 다른 메일주소로 변경하여 인증하시려면 취소를 클릭하시기 바랍니다.", G5_URL, G5_BBS_URL.'/register_email.php?mb_id='.$mb_id.'&ckey='.$ckey);
 }
 
+run_event('login_session_before', $mb, $is_social_login);
+
 @include_once($member_skin_path.'/login_check.skin.php');
 
 // 회원아이디 세션 생성
@@ -103,6 +105,8 @@ if ($url) {
         $post_check_keys[] = 'provider';
     }
 
+    $post_check_keys = run_replace('login_check_post_check_keys', $post_check_keys, $link, $is_social_login);
+
     foreach($_POST as $key=>$value) {
         if ($key && !in_array($key, $post_check_keys)) {
             $link .= "$split$key=$value";
@@ -121,7 +125,7 @@ if(function_exists('social_login_success_after')){
     social_login_session_clear(1);
 }
 
-run_event('member_login_check', $mb, $link);
+run_event('member_login_check', $mb, $link, $is_social_login);
 
 goto_url($link);
 ?>

bbs/move_update.php

@@ -126,8 +126,13 @@ while ($row = sql_fetch_array($result))
                         // 원본파일을 복사하고 퍼미션을 변경
                         // 제이프로님 코드제안 적용
                         $copy_file_name = ($bo_table !== $move_bo_table) ? $row3['bf_file'] : $row2['wr_id'].'_copy_'.$insert_id.'_'.$row3['bf_file'];
-                        @copy($src_dir.'/'.$row3['bf_file'], $dst_dir.'/'.$copy_file_name);
-                        @chmod($dst_dir.'/'.$copy_file_name, G5_FILE_PERMISSION);
+                        $is_exist_file = is_file($src_dir.'/'.$row3['bf_file']) && file_exists($src_dir.'/'.$row3['bf_file']);
+                        if( $is_exist_file ){
+                            @copy($src_dir.'/'.$row3['bf_file'], $dst_dir.'/'.$copy_file_name);
+                            @chmod($dst_dir.'/'.$row3['bf_file'], G5_FILE_PERMISSION);
+                        }
+
+                        $row3 = run_replace('bbs_move_update_file', $row3, $copy_file_name, $bo_table, $move_bo_table, $insert_id);
                     }
 
                     $sql = " insert into {$g5['board_file_table']}
@@ -138,6 +143,9 @@ while ($row = sql_fetch_array($result))
                                      bf_file = '$copy_file_name',
                                      bf_download = '{$row3['bf_download']}',
                                      bf_content = '".addslashes($row3['bf_content'])."',
+                                     bf_fileurl = '".addslashes($row3['bf_fileurl'])."',
+                                     bf_thumburl = '".addslashes($row3['bf_thumburl'])."',
+                                     bf_storage = '".addslashes($row3['bf_storage'])."',
                                      bf_filesize = '{$row3['bf_filesize']}',
                                      bf_width = '{$row3['bf_width']}',
                                      bf_height = '{$row3['bf_height']}',
@@ -200,7 +208,11 @@ if ($sw == 'move')
     {
         if( isset($save[$i]['bf_file']) && $save[$i]['bf_file'] ){
             for ($k=0; $k<count($save[$i]['bf_file']); $k++) {
-                @unlink($save[$i]['bf_file'][$k]);
+                $del_file = $save[$i]['bf_file'][$k];
+
+                if ( is_file($del_file) && file_exists($del_file) ){
+                    @unlink($del_file);
+                }
 
                 // 썸네일 파일 삭제, 먼지손 님 코드 제안
                 delete_board_thumbnail($bo_table, basename($save[$i]['bf_file'][$k]));

bbs/password_lost2.php

@@ -21,9 +21,9 @@ $row = sql_fetch($sql);
 if ($row['cnt'] > 1)
     alert('동일한 메일주소가 2개 이상 존재합니다.\\n\\n관리자에게 문의하여 주십시오.');
 
-$sql = " select mb_no, mb_id, mb_name, mb_nick, mb_email, mb_datetime from {$g5['member_table']} where mb_email = '$email' ";
+$sql = " select mb_no, mb_id, mb_name, mb_nick, mb_email, mb_datetime, mb_leave_date from {$g5['member_table']} where mb_email = '$email' ";
 $mb = sql_fetch($sql);
-if (!$mb['mb_id'])
+if (!$mb['mb_id'] || $mb['mb_leave_date'])
     alert('존재하지 않는 회원입니다.');
 else if (is_admin($mb['mb_id']))
     alert('관리자 아이디는 접근 불가합니다.');
@@ -71,5 +71,7 @@ $content .= '</div>';
 
 mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb['mb_email'], $subject, $content, 1);
 
+run_event('password_lost2_after', $mb, $mb_nonce, $mb_lost_certify);
+
 alert_close($email.' 메일로 회원아이디와 비밀번호를 인증할 수 있는 메일이 발송 되었습니다.\\n\\n메일을 확인하여 주십시오.');
 ?>

bbs/password_lost_certify.php

@@ -4,9 +4,11 @@ include_once('./_common.php');
 // 봇의 메일 링크 크롤링을 방지합니다.
 if(function_exists('check_mail_bot')){ check_mail_bot($_SERVER['REMOTE_ADDR']); }
 
+run_event('password_lost_certify_before');
+
 // 오류시 공히 Error 라고 처리하는 것은 회원정보가 있는지? 비밀번호가 틀린지? 를 알아보려는 해킹에 대비한것
 
-$mb_no = trim($_GET['mb_no']);
+$mb_no = preg_replace('#[^0-9]#', '', trim($_GET['mb_no']));
 $mb_nonce = trim($_GET['mb_nonce']);
 
 // 회원아이디가 아닌 회원고유번호로 회원정보를 구한다.
@@ -22,6 +24,9 @@ sql_query(" update {$g5['member_table']} set mb_lost_certify = '' where mb_no =
 if ($mb_nonce === substr($mb['mb_lost_certify'], 0, 32)) {
     $new_password_hash = substr($mb['mb_lost_certify'], 33);
     sql_query(" update {$g5['member_table']} set mb_password = '$new_password_hash' where mb_no = '$mb_no' ");
+
+    run_event('password_lost_certify_after', $mb, $mb_nonce);
+
     alert('비밀번호가 변경됐습니다.\\n\\n회원아이디와 변경된 비밀번호로 로그인 하시기 바랍니다.', G5_BBS_URL.'/login.php');
 }
 else {

bbs/qawrite.php

@@ -67,7 +67,7 @@ if(is_file($skin_file)) {
 
     $content = '';
     if ($w == '') {
-        $content = $qaconfig['qa_insert_content'];
+        $content = html_purifier($qaconfig['qa_insert_content']);
     } else if($w == 'r') {
         if($is_dhtml_editor)
             $content = '<div><br><br><br>====== 이전 답변내용 =======<br></div>';

bbs/register_form.php

@@ -3,6 +3,8 @@ include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 
+run_event('register_form_before');
+
 // 불법접근을 막도록 토큰생성
 $token = md5(uniqid(rand(), true));
 set_session("ss_token", $token);
@@ -139,5 +141,8 @@ if ($config['cf_use_addr'])
     add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
 
 include_once($member_skin_path.'/register_form.skin.php');
+
+run_event('register_form_after', $w, $agree, $agree2);
+
 include_once('./_tail.php');
 ?>

bbs/write_update.php

@@ -424,6 +424,9 @@ if ($w == '' || $w == 'r') {
 
     $bo_notice = board_notice($board['bo_notice'], $wr_id, $notice);
     sql_query(" update {$g5['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' ");
+
+    // 글을 수정한 경우에는 제목이 달라질수도 있으니 static variable 를 새로고침합니다.
+    $write = get_write( $write_table, $wr['wr_id'], false);
 }
 
 // 게시판그룹접근사용을 하지 않아야 하고 비회원 글읽기가 가능해야 하며 비밀글이 아니어야 합니다.
@@ -466,13 +469,20 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
     $upload[$i]['image'][0] = '';
     $upload[$i]['image'][1] = '';
     $upload[$i]['image'][2] = '';
+    $upload[$i]['fileurl'] = '';
+    $upload[$i]['thumburl'] = '';
+    $upload[$i]['storage'] = '';
 
     // 삭제에 체크가 되어있다면 파일을 삭제합니다.
     if (isset($_POST['bf_file_del'][$i]) && $_POST['bf_file_del'][$i]) {
         $upload[$i]['del_check'] = true;
 
-        $row = sql_fetch(" select bf_file from {$g5['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' and bf_no = '{$i}' ");
-        @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
+        $row = sql_fetch(" select * from {$g5['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' and bf_no = '{$i}' ");
+
+        $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row['bf_file']), $row);
+        if( file_exists($delete_file) ){
+            @unlink($delete_file);
+        }
         // 썸네일삭제
         if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
             delete_board_thumbnail($bo_table, $row['bf_file']);
@@ -524,8 +534,12 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
         // 4.00.11 - 글답변에서 파일 업로드시 원글의 파일이 삭제되는 오류를 수정
         if ($w == 'u') {
             // 존재하는 파일이 있다면 삭제합니다.
-            $row = sql_fetch(" select bf_file from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$i' ");
-            @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
+            $row = sql_fetch(" select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$i' ");
+
+            $delete_file = run_replace('delete_file_path', G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row['bf_file']), $row);
+            if( file_exists($delete_file) ){
+                @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
+            }
             // 이미지파일이면 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
                 delete_board_thumbnail($bo_table, $row['bf_file']);
@@ -554,6 +568,7 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
         chmod($dest_file, G5_FILE_PERMISSION);
 
         $dest_file = run_replace('write_update_upload_file', $dest_file, $board, $wr_id, $w);
+        $upload[$i] = run_replace('write_update_upload_array', $upload[$i], $dest_file, $board, $wr_id, $w);
     }
 }
 
@@ -575,6 +590,9 @@ for ($i=0; $i<count($upload); $i++)
                         set bf_source = '{$upload[$i]['source']}',
                              bf_file = '{$upload[$i]['file']}',
                              bf_content = '{$bf_content[$i]}',
+                             bf_fileurl = '{$upload[$i]['fileurl']}',
+                             bf_thumburl = '{$upload[$i]['thumburl']}',
+                             bf_storage = '{$upload[$i]['storage']}',
                              bf_filesize = '{$upload[$i]['filesize']}',
                              bf_width = '{$upload[$i]['image']['0']}',
                              bf_height = '{$upload[$i]['image']['1']}',
@@ -604,6 +622,9 @@ for ($i=0; $i<count($upload); $i++)
                          bf_source = '{$upload[$i]['source']}',
                          bf_file = '{$upload[$i]['file']}',
                          bf_content = '{$bf_content[$i]}',
+                         bf_fileurl = '{$upload[$i]['fileurl']}',
+                         bf_thumburl = '{$upload[$i]['thumburl']}',
+                         bf_storage = '{$upload[$i]['storage']}',
                          bf_download = 0,
                          bf_filesize = '{$upload[$i]['filesize']}',
                          bf_width = '{$upload[$i]['image']['0']}',

config.php

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

head.sub.php

@@ -2,6 +2,8 @@
 // 이 파일은 새로운 파일 생성시 반드시 포함되어야 함
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
+run_event('head_sub');
+
 // 테마 head.sub.php 파일
 if(!defined('G5_IS_ADMIN') && defined('G5_THEME_PATH') && is_file(G5_THEME_PATH.'/head.sub.php')) {
     require_once(G5_THEME_PATH.'/head.sub.php');
@@ -58,9 +60,9 @@ if($config['cf_add_meta'])
 <?php
 if (defined('G5_IS_ADMIN')) {
     if(!defined('_THEME_PREVIEW_'))
-        echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
+        echo '<link rel="stylesheet" href="'.run_replace('head_css_url', G5_ADMIN_URL.'/css/admin.css?ver='.G5_CSS_VER, G5_URL).'">'.PHP_EOL;
 } else {
-    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
+    echo '<link rel="stylesheet" href="'.run_replace('head_css_url', G5_CSS_URL.'/'.(G5_IS_MOBILE ?'mobile':'default').'.css?ver='.G5_CSS_VER, G5_URL).'">'.PHP_EOL;
 }
 ?>
 <!--[if lte IE 8]>
@@ -81,16 +83,17 @@ var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
 var g5_admin_url = "<?php echo G5_ADMIN_URL; ?>";
 <?php } ?>
 </script>
-<script src="<?php echo G5_JS_URL ?>/jquery-1.12.4.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery-migrate-1.4.1.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/placeholders.min.js"></script>
-<link rel="stylesheet" href="<?php echo G5_JS_URL ?>/font-awesome/css/font-awesome.min.css">
 <?php
+add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 1);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 1);
+
 if(G5_IS_MOBILE) {
-    echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
+    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 2); // overflow scroll 감지
 }
 if(!defined('G5_IS_ADMIN'))
     echo $config['cf_add_script'];

install/gnuboard5.sql

@@ -133,6 +133,9 @@ CREATE TABLE IF NOT EXISTS `g5_board_file` (
   `bf_file` varchar(255) NOT NULL default '',
   `bf_download` int(11) NOT NULL,
   `bf_content` text NOT NULL,
+  `bf_fileurl` VARCHAR(255) NOT NULL DEFAULT '',
+  `bf_thumburl` VARCHAR(255) NOT NULL DEFAULT '',
+  `bf_storage` VARCHAR(50) NOT NULL DEFAULT '',
   `bf_filesize` int(11) NOT NULL default '0',
   `bf_width` int(11) NOT NULL default '0',
   `bf_height` smallint(6) NOT NULL default '0',

install/install_db.php

@@ -290,9 +290,8 @@ for ($i=0; $i<count($tmp_bo_table); $i++)
     sql_query($sql, true, $dblink);
 
     // 게시판 테이블 생성
-    $file = file("../adm/sql_write.sql");
+    $file = file("../".G5_ADMIN_DIR."/sql_write.sql");
     $file = get_db_create_replace($file);
-
     $sql = implode($file, "\n");
 
     $create_table = $table_prefix.'write_' . $tmp_bo_table[$i];

lib/common.lib.php

@@ -310,6 +310,9 @@ function get_file($bo_table, $wr_id)
         $file[$no]['image_width'] = $row['bf_width'] ? $row['bf_width'] : 640;
         $file[$no]['image_height'] = $row['bf_height'] ? $row['bf_height'] : 480;
         $file[$no]['image_type'] = $row['bf_type'];
+        $file[$no]['bf_fileurl'] = $row['bf_fileurl'];
+        $file[$no]['bf_thumburl'] = $row['bf_thumburl'];
+        $file[$no]['bf_storage'] = $row['bf_storage'];
         $file['count']++;
     }
 
@@ -704,7 +707,7 @@ function get_write($write_table, $wr_id, $is_cache=false)
 
     $write = $g5_object->get('bbs', $wr_id, $wr_bo_table);
 
-    if( !$write ){
+    if( !$write || $is_cache == false ){
         $sql = " select * from {$write_table} where wr_id = '{$wr_id}' ";
         $write = sql_fetch($sql);
 
@@ -3706,12 +3709,15 @@ function is_include_path_check($path='', $is_input='')
             if( preg_match('/\/data\/(file|editor|qa|cache|member|member_image|session|tmp)\/[A-Za-z0-9_]{1,20}\//i', $replace_path) ){
                 return false;
             }
-            if( (preg_match('/\.\.\//i', $replace_path) || preg_match('/^\/.*/i', $replace_path)) && preg_match('/plugin\//i', $replace_path) && preg_match('/okname\//i', $replace_path) ){
+            if( preg_match('/'.G5_PLUGIN_DIR.'\//i', $replace_path) && (preg_match('/'.G5_OKNAME_DIR.'\//i', $replace_path) || preg_match('/'.G5_KCPCERT_DIR.'\//i', $replace_path) || preg_match('/'.G5_LGXPAY_DIR.'\//i', $replace_path)) ){
                 return false;
             }
             if( substr_count($replace_path, './') > 5 ){
                 return false;
             }
+            if( defined('G5_SHOP_DIR') && preg_match('/'.G5_SHOP_DIR.'\//i', $replace_path) && preg_match('/kcp\//i', $replace_path) ){
+                return false;
+            }
         }
 
         $extension = pathinfo($path, PATHINFO_EXTENSION);

lib/get_data.lib.php

@@ -351,6 +351,42 @@ function get_bo_table_banned_word(){
     return run_replace('get_bo_table_banned_word', $folders);
 }
 
+function get_board_sort_fields($board=array(), $make_key_return=''){
+    $bo_sort_fields = run_replace('get_board_sort_fields', array(
+        array('wr_num, wr_reply', '기본'),
+        array('wr_datetime asc', '날짜 이전것 부터'),
+        array('wr_datetime desc', '날짜 최근것 부터'),
+        array('wr_hit asc, wr_num, wr_reply', '조회수 낮은것 부터'),
+        array('wr_hit desc, wr_num, wr_reply', '조회수 높은것 부터'),
+        array('wr_last asc', '최근글 이전것 부터'),
+        array('wr_last desc', '최근글 최근것 부터'),
+        array('wr_comment asc, wr_num, wr_reply', '댓글수 낮은것 부터'),
+        array('wr_comment desc, wr_num, wr_reply', '댓글수 높은것 부터'),
+        array('wr_good asc, wr_num, wr_reply', '추천수 낮은것 부터'),
+        array('wr_good desc, wr_num, wr_reply', '추천수 높은것 부터'),
+        array('wr_nogood asc, wr_num, wr_reply', '비추천수 낮은것 부터'),
+        array('wr_nogood desc, wr_num, wr_reply', '비추천수 높은것 부터'),
+        array('wr_subject asc, wr_num, wr_reply', '제목 오름차순'),
+        array('wr_subject desc, wr_num, wr_reply', '제목 내림차순'),
+        array('wr_name asc, wr_num, wr_reply', '글쓴이 오름차순'),
+        array('wr_name desc, wr_num, wr_reply', '글쓴이 내림차순'),
+        array('ca_name asc, wr_num, wr_reply', '분류명 오름차순'),
+        array('ca_name desc, wr_num, wr_reply', '분류명 내림차순'),
+    ), $board, $make_key_return);
+
+    if( $make_key_return ){
+        
+        $returns = array();
+        foreach( $bo_sort_fields as $v ){
+            $key = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*\s]/", "", $v[0]);
+            $returns[$key] = $v[0];
+        }
+        
+        return $returns;
+    }
+    return $bo_sort_fields;
+}
+
 function get_board_sfl_select_options($sfl){
 
     global $is_admin;

lib/outlogin.lib.php

@@ -5,6 +5,8 @@ if (!defined('_GNUBOARD_')) exit;
 function outlogin($skin_dir='basic')
 {
     global $config, $member, $g5, $urlencode, $is_admin, $is_member;
+    
+    $is_auth = false;
 
     if (array_key_exists('mb_nick', $member)) {
         $nick  = get_text(cut_str($member['mb_nick'], $config['cf_cut_name']));
@@ -43,7 +45,6 @@ function outlogin($skin_dir='basic')
         }
         
         $mb_scrap_cnt = isset($member['mb_scrap_cnt']) ? (int) $member['mb_scrap_cnt'] : '';
-        $is_auth = false;
         $sql = " select count(*) as cnt from {$g5['auth_table']} where mb_id = '{$member['mb_id']}' ";
         $row = sql_fetch($sql);
         if ($row['cnt'])
@@ -61,6 +62,6 @@ function outlogin($skin_dir='basic')
     $content = ob_get_contents();
     ob_end_clean();
 
-    return $content;
+    return run_replace('outlogin_content', $content, $is_auth, $outlogin_url, $outlogin_action_url);
 }
 ?>

lib/thumbnail.lib.php

@@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit;
 function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_create=false, $is_crop=false, $crop_mode='center', $is_sharpen=false, $um_value='80/0.5/3')
 {
     global $g5, $config;
-    $filename = $alt = "";
+    $filename = $alt = $data_path = '';
     $edt = false;
 
     $row = get_thumbnail_find_cache($bo_table, $wr_id, 'file');
@@ -45,6 +45,8 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
 
                     break;
                 }
+
+                $filename = run_replace('get_editor_filename', $filename, $p);
             }   //end for
         }   //end if
     }
@@ -52,6 +54,10 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
     if(!$filename)
         return false;
 
+    if( $thumbnail_info = run_replace('get_list_thumbnail_info', array(), array('bo_table'=>$bo_table, 'wr_id'=>$wr_id, 'data_path'=>$data_path, 'edt'=>$edt, 'filename'=>$filename, 'filepath'=>$filepath, 'thumb_width'=>$thumb_width, 'thumb_height'=>$thumb_height, 'is_create'=>$is_create, 'is_crop'=>$is_crop, 'crop_mode'=>$crop_mode, 'is_sharpen'=>$is_sharpen, 'um_value'=>$um_value)) ){
+        return $thumbnail_info;
+    }
+
     $tname = thumbnail($filename, $filepath, $filepath, $thumb_width, $thumb_height, $is_create, $is_crop, $crop_mode, $is_sharpen, $um_value);
 
     if($tname) {
@@ -73,6 +79,20 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
     return $thumb;
 }
 
+// 게시글보기 파일 썸네일 리턴
+function get_file_thumbnail($file){
+    
+    if( ! is_array($file) ) return '';
+
+    if( preg_match('/(\.jpg|\.jpeg|\.gif|\.png|\.bmp)$/i', $file['file']) && $contents = run_replace('get_file_thumbnail_tags', '', $file) ){
+        return $contents;
+    } else if ($file['view']) {
+        return get_view_thumbnail($file['view']);
+    }
+
+    return $file['view'];
+}
+
 // 게시글보기 썸네일 생성
 function get_view_thumbnail($contents, $thumb_width=0)
 {

mobile/skin/board/basic/view.skin.php

@@ -84,10 +84,7 @@ jQuery(function($){
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
             echo "</div>\n";
 		}

mobile/skin/board/gallery/view.skin.php

@@ -86,10 +86,7 @@ jQuery(function($){
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
             echo "</div>\n";
 		}

mobile/skin/latest/basic/style.css

@@ -7,7 +7,7 @@
 .lt ul li {padding:15px 0;border-bottom:1px solid #e5ecee}
 .lt ul li:last-child {border-bottom:0}
 .lt ul li:after {display:block;visibility:hidden;clear:both;content:""}
-.lt ul li:hover a {color:#3a8afd}
+.lt ul li:hover a.lt_tit {color:#3a8afd}
 .lt .lt_thumb {display:inline-block;float:left;margin-right:10px}
 .lt .lt_thumb img {width:138px;height:auto;overflow:hidden}
 .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px}
@@ -30,6 +30,8 @@
 .lt .comment_icon {background:url('./img/icon_comment.png') no-repeat 50% 50%;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li {text-align:center;padding:40px 0;color:#777}
 
+.lt .owl-carousel .owl-item .profile_img img{width:auto}
+
 .lt_page {background:#fff;text-align:center;padding:10px 15px;line-height:25px;border-bottom:1px solid #e5ecee}
 .lt_page button {display:inline-block;background:#fff;width:25px;height:25px;border:1px solid #dbdee6;text-align:center;color:#cdcdce}
 .lt_page span {color:#6e6e6e}

mobile/skin/member/basic/login.skin.php

@@ -40,7 +40,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 </div>
 
 <script>
-$(function(){
+jQuery(function($){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 비밀번호를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
@@ -50,6 +50,9 @@ $(function(){
 
 function flogin_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'login_sumit', [f, 'flogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>

plugin/editor/cheditor5/imageUpload/delete.php

@@ -34,6 +34,10 @@ if( $file_arr[1] !== che_get_file_passname() ){
 $filepath = SAVE_DIR . '/' . $filesrc;
 $r = false;
 
+if( function_exists('run_event') ){
+    run_event('delete_editor_file', $filepath, $r);
+}
+
 if (file_exists($filepath)) {
 	$r = unlink($filepath);
 	if ($r) {

plugin/editor/cheditor5/imageUpload/upload.php

@@ -117,9 +117,14 @@ try {
 } catch (Exception $e) {
 }
 
-$rdata = sprintf('{"fileUrl": "%s/%s", "filePath": "%s", "fileName": "%s", "fileSize": "%d" }',
-	SAVE_URL,
-	$filename,
+$file_url = SAVE_URL.'/'.$filename;
+
+if( function_exists('run_replace') ){
+    $file_url = run_replace('get_editor_upload_url', $file_url, $savefile, array());
+}
+
+$rdata = sprintf('{"fileUrl": "%s", "filePath": "%s", "fileName": "%s", "fileSize": "%d" }',
+	$file_url,
 	$savefile,
 	$filename,
 	$filesize );

plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php

@@ -1176,6 +1176,10 @@ class UploadHandler
                     $image_width_height = $this->get_image_size($file_path);
                     $file->width = $image_width_height[0];
                     $file->height = $image_width_height[1];
+
+                    if( function_exists('run_replace') ){
+                        $file->url = run_replace('get_editor_upload_url', $file->url, $file_path, $file);
+                    }
                 } else {    //로빈아빠님이 알려주심, 이미지 업로드 체크
                     unlink($file_path);
                     $file->error = $this->get_error_message('accept_file_types');
@@ -1441,6 +1445,11 @@ class UploadHandler
             if( substr($file_name, 0 , 32) != $this->get_file_passname() ) continue;    //session_id() 와 비교하여 틀리면 지우지 않음
             $file_path = $this->get_upload_path($file_name);
             $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
+
+            if( function_exists('run_event') ){
+                run_event('delete_editor_file', $file_path, $success);
+            }
+
             if ($success) {
                 foreach($this->options['image_versions'] as $version => $options) {
                     if (!empty($version)) {

plugin/sms5/ajax.sms_emoticon.php

@@ -18,6 +18,8 @@ if (is_numeric($fg_no))
 else
     $sql_group = "";
 
+$sv = isset($sv) ? get_search_string($sv) : '';
+
 if ($st == 'all') {
     $sql_search = "and (fo_name like '%{$sv}%' or fo_content like '%{$sv}%')";
 } else if ($st == 'name') {
@@ -61,10 +63,13 @@ for($k=0;$res = sql_fetch_array($qry);$k++)
     $list_text[$k]['fo_name'] = cut_str($res['fo_name'],20);
 }
 
-$arr_ajax_msg['error'] = "";
-$arr_ajax_msg['list_text'] = $list_text;
-$arr_ajax_msg['page'] = $page;
-$arr_ajax_msg['total_count'] = $total_count;
-$arr_ajax_msg['total_page'] = $total_page;
+$arr_ajax_msg = array(
+'error'=>'',
+'list_text'=>$list_text,
+'page'=>$page,
+'total_count'=>$total_count,
+'total_page'=>$total_page
+);
+
 die( json_encode($arr_ajax_msg) );
 ?>

plugin/sns/view.sns.skin.php

@@ -24,11 +24,38 @@ $bo_v_sns_class = $config['cf_kakao_js_apikey'] ? 'show_kakao' : '';
 ?>
 
 <?php if($config['cf_kakao_js_apikey']) { ?>
-<script src="//developers.kakao.com/sdk/js/kakao.min.js"></script>
-<script src="<?php echo G5_JS_URL; ?>/kakaolink.js"></script>
-<script>
-    // 사용할 앱의 Javascript 키를 설정해 주세요.
-    Kakao.init("<?php echo $config['cf_kakao_js_apikey']; ?>");
+<script src="//developers.kakao.com/sdk/js/kakao.min.js" charset="utf-8"></script>
+<script src="<?php echo G5_JS_URL; ?>/kakaolink.js" charset="utf-8"></script>
+<script type='text/javascript'>
+    //<![CDATA[
+        // 사용할 앱의 Javascript 키를 설정해 주세요.
+        Kakao.init("<?php echo $config['cf_kakao_js_apikey']; ?>");
+
+        function Kakao_sendLink() {
+            var webUrl = location.protocol+"<?php echo '//'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; ?>",
+                imageUrl = $("#bo_v_img").find("img").attr("src") || $(".view_image").find("img").attr("src") || '';
+
+            Kakao.Link.sendDefault({
+                objectType: 'feed',
+                content: {
+                    title: "<?php echo str_replace(array('%27', '&#034;' , '\"'), '', strip_tags($view['subject'])); ?>",
+                    description: "<?php echo preg_replace('/\r\n|\r|\n/','', strip_tags(get_text(cut_str(strip_tags($view['wr_content']), 200), 1))); ?>",
+                    imageUrl: imageUrl,
+                    link: {
+                        mobileWebUrl: webUrl,
+                        webUrl: webUrl
+                    }
+                },
+                buttons: [{
+                    title: '자세히 보기',
+                    link: {
+                        mobileWebUrl: webUrl,
+                        webUrl: webUrl
+                    }
+                }]
+            });
+        }
+    //]]>
 </script>
 <?php } ?>
 
@@ -37,7 +64,6 @@ $bo_v_sns_class = $config['cf_kakao_js_apikey'] ? 'show_kakao' : '';
     <li><a href="<?php echo $twitter_url; ?>" target="_blank" class="sns_t"><img src="<?php echo G5_SNS_URL; ?>/icon/twitter.png" alt="트위터로  공유" width="20"><span>트위터 공유</span></a></li>
     <li><a href="<?php echo $gplus_url; ?>" target="_blank" class="sns_g"><img src="<?php echo G5_SNS_URL; ?>/icon/gplus.png" alt="구글플러스로 공유" width="20"><span>구글+ 공유</span></a></li>
     <?php if($config['cf_kakao_js_apikey']) { ?>
-    <li><a href="javascript:kakaolink_send('<?php echo str_replace(array('%27', '\''), '', $sns_msg); ?>', '<?php echo urlencode('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); ?>');" class="sns_k"><img src="<?php echo G5_SNS_URL; ?>/icon/kakaotalk.png" alt="카카오톡으로 보내기" width="20"></a></li>
+    <li><a href="javascript:Kakao_sendLink();" class="sns_k" ><img src="<?php echo G5_SNS_URL; ?>/icon/kakaotalk.png" alt="카카오톡으로 보내기" width="20"></a></li>
     <?php } ?>
 </ul>
-

plugin/social/includes/functions.php

@@ -48,10 +48,6 @@ function get_social_callbackurl($provider, $no_domain=false){
 
     $base_url = G5_SOCIAL_LOGIN_BASE_URL;
 
-    if( $provider === 'kakao' && $no_domain ){
-        $base_url = '/'.ltrim(parse_url($base_url, PHP_URL_PATH), '/');
-    }
-
     if ( $provider === 'twitter' ){
         return $base_url;
     }

plugin/social/register_member_update.php

@@ -44,6 +44,7 @@ if( ! $mb_nick || ! $mb_name ){
     $tmp = explode('@', $mb_email);
     $mb_nick = $mb_nick ? $mb_nick : $tmp[0];
     $mb_name = $mb_name ? $mb_name : $tmp[0];
+    $mb_nick = exist_mb_nick_recursive($mb_nick, '');
 }
 
 if( ! isset($mb_password) || ! $mb_password ){

skin/board/basic/style.css

@@ -122,6 +122,8 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .chk_box input[type="checkbox"] + label {position:relative;color:#676e70}
 .chk_box input[type="checkbox"] + label:hover {color:#2172f8}
 .chk_box input[type="checkbox"] + label span {float:left;width:15px;height:15px;display:block;background:#fff;border:1px solid #d0d4df;border-radius:3px}
+.write_div .chk_box input[type="checkbox"] + label, .bo_vc_w .chk_box input[type="checkbox"] + label {padding-left:20px}
+.write_div .chk_box input[type="checkbox"] + label span, .bo_vc_w .chk_box input[type="checkbox"] + label span {position:absolute;top:2px;left:0;width:15px;height:15px;display:block;margin:0;background:#fff;border:1px solid #d0d4df;border-radius:3px}
 .chk_box input[type="checkbox"]:checked + label {color:#000}
 .chk_box input[type="checkbox"]:checked + label span {background:url(./img/chk.png) no-repeat 50% 50% #3a8afd;border-color:#1471f6;border-radius:3px}
 

skin/board/basic/view.skin.php

@@ -94,10 +94,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
 
             echo "</div>\n";

skin/board/gallery/style.css

@@ -91,6 +91,8 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .chk_box input[type="checkbox"] + label {position:relative;padding-left:20px;color:#676e70;vertical-align:baseline}
 .chk_box input[type="checkbox"] + label:hover{color:#2172f8}
 .chk_box input[type="checkbox"] + label span {position:absolute;top:10px;left:10px;width:15px;height:15px;display:block;background:#fff;border:1px solid #d0d4df;border-radius:3px}
+.write_div .chk_box input[type="checkbox"] + label, .bo_vc_w .chk_box input[type="checkbox"] + label {padding-left:20px}
+.write_div .chk_box input[type="checkbox"] + label span, .bo_vc_w .chk_box input[type="checkbox"] + label span {position:absolute;top:2px;left:0;width:15px;height:15px;display:block;margin:0;background:#fff;border:1px solid #d0d4df;border-radius:3px}
 .chk_box input[type="checkbox"]:checked + label {color:#000}
 .chk_box input[type="checkbox"]:checked + label span {background:url(./img/chk.png) no-repeat 50% 50% #3a8afd;border-color:#1471f6;border-radius:3px}
 .all_chk.chk_box input[type="checkbox"] + label span {top:0;left:0}
@@ -103,6 +105,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_li {}
 #bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
 #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
+#bo_gall .gall_con {position:relative}
 
 .gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10 {position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0}
 .gall_row .col-gn-0,.latest_row .col-gn-1 {width:100%}
@@ -147,7 +150,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_info .gall_date,
 #bo_gall .gall_info .gall_view {display:inline-block;margin-left:10px;color:#777}
 
-#bo_gall .gall_option {position:absolute;top:170px;left:10px}
+#bo_gall .gall_option {position:absolute;top:10px;right:10px}
 #bo_gall .gall_option strong {background:#fff;padding:5px 10px;border-radius:30px;-webkit-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2);
 -moz-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2);
 box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2)}

skin/board/gallery/view.skin.php

@@ -94,10 +94,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
 
             echo "</div>\n";

skin/latest/basic/latest.skin.php

@@ -9,7 +9,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php for ($i=0; $i<count($list); $i++) {  ?>
-        <li>
+        <li class="basic_li">
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 

skin/latest/basic/style.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.lat {position:relative;margin-bottom:20px;overflow:hidden;background:#fff}
+.lat {position:relative;margin-bottom:20px;background:#fff}
 .lat .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .lat .lat_title a {position:relative;color:#000;display:inline-block}
 

skin/latest/pic_block/latest.skin.php

@@ -23,7 +23,7 @@ $thumb_height = 150;
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
     ?>
-        <li>
+        <li class="galley_li">
             <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";

skin/latest/pic_block/style.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.pic_lt {position:relative;margin-bottom:20px;overflow:hidden;background:#fff}
+.pic_lt {position:relative;margin-bottom:20px;background:#fff}
 .pic_lt .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .pic_lt .lat_title a {color:#000;display:inline-block;position:relative}
 
@@ -10,6 +10,7 @@
 .pic_lt ul:after {display:block;visibility:hidden;clear:both;content:""}
 .pic_lt ul {margin: 0 -10px}
 .pic_lt li {float:left;width:25%;padding:0 10px}
+.pic_lt li.galley_li:nth-child(4n+1) {clear: both!important}
 .pic_lt li .lt_img {margin:5px 0;display:block}
 .pic_lt li .lt_img img {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}

skin/latest/pic_list/latest.skin.php

@@ -4,8 +4,8 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
-$thumb_width = 210;
-$thumb_height = 150;
+$thumb_width = 297;
+$thumb_height = 212;
 ?>
 
 <div class="pic_li_lt">
@@ -13,18 +13,24 @@ $thumb_height = 150;
     <ul>
     <?php
     for ($i=0; $i<count($list); $i++) {
-    $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
+        
+        $img_link_html = '';
+        
+        if( $i === 0 ) {
+            $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
-    if($thumb['src']) {
-        $img = $thumb['src'];
-    } else {
-        $img = G5_IMG_URL.'/no_img.png';
-        $thumb['alt'] = '이미지가 없습니다.';
-    }
-    $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+            if($thumb['src']) {
+                $img = $thumb['src'];
+            } else {
+                $img = G5_IMG_URL.'/no_img.png';
+                $thumb['alt'] = '이미지가 없습니다.';
+            }
+            $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.$img_content.'</a>';
+        }
     ?>
         <li>
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
+            <?php echo $img_link_html; ?>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  

skin/latest/pic_list/style.css

@@ -1,9 +1,10 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.pic_li_lt {position:relative;width:33.3333%;float:left;padding:0 10px;overflow:hidden;background:#fff}
+.pic_li_lt {position:relative;width:33.3333%;float:left;padding:0 10px;background:#fff}
 .pic_li_lt .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .pic_li_lt .lat_title a {color:#000;display:inline-block;position:relative}
+.latest_top_wr .pic_li_lt:nth-child(3n+1) {clear: both!important}
 
 .pic_li_lt .lt_more {position:absolute;top:11px;right:10px;display:block;width:25px;line-height:25px;color:#aaa;border-radius:3px;text-align:center}
 .pic_li_lt .lt_more:hover {color:#777}

skin/member/basic/login.skin.php

@@ -40,7 +40,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 </div>
 
 <script>
-$(function(){
+jQuery(function($){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 비밀번호를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
@@ -50,7 +50,10 @@ $(function(){
 
 function flogin_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'login_sumit', [f, 'flogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>
 <!-- } 로그인 끝 -->

skin/outlogin/basic/outlogin.skin.1.php

@@ -40,14 +40,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
 </section>
 
 <script>
-$omi = $('#ol_id');
-$omp = $('#ol_pw');
-$omi_label = $('#ol_idlabel');
-$omi_label.addClass('ol_idlabel');
-$omp_label = $('#ol_pwlabel');
-$omp_label.addClass('ol_pwlabel');
+jQuery(function($) {
 
-$(function() {
+    var $omi = $('#ol_id'),
+        $omp = $('#ol_pw'),
+        $omi_label = $('#ol_idlabel'),
+        $omp_label = $('#ol_pwlabel');
+
+    $omi_label.addClass('ol_idlabel');
+    $omp_label.addClass('ol_pwlabel');
 
     $("#auto_login").click(function(){
         if ($(this).is(":checked")) {
@@ -59,7 +60,10 @@ $(function() {
 
 function fhead_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'outlogin1', [f, 'foutlogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>
 <!-- } 로그인 전 아웃로그인 끝 -->

theme/basic/head.sub.php

@@ -49,7 +49,7 @@ if($config['cf_add_meta'])
     echo $config['cf_add_meta'].PHP_EOL;
 ?>
 <title><?php echo $g5_head_title; ?></title>
-<link rel="stylesheet" href="<?php echo G5_THEME_CSS_URL; ?>/<?php echo G5_IS_MOBILE ? 'mobile' : 'default'; ?>.css?ver=<?php echo G5_CSS_VER; ?>">
+<link rel="stylesheet" href="<?php echo run_replace('head_css_url', G5_THEME_CSS_URL.'/'.(G5_IS_MOBILE ? 'mobile' : 'default').'.css?ver='.G5_CSS_VER, G5_THEME_URL); ?>">
 <!--[if lte IE 8]>
 <script src="<?php echo G5_JS_URL ?>/html5.js"></script>
 <![endif]-->
@@ -65,16 +65,17 @@ var g5_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_editor'])?$config['cf_editor']:''; ?>";
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
 </script>
-<script src="<?php echo G5_JS_URL ?>/jquery-1.12.4.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery-migrate-1.4.1.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
-<script src="<?php echo G5_JS_URL ?>/placeholders.min.js"></script>
-<link rel="stylesheet" href="<?php echo G5_JS_URL ?>/font-awesome/css/font-awesome.min.css">
 <?php
+add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 1);
+add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 1);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 1);
+
 if(G5_IS_MOBILE) {
-    echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
+    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 2); // overflow scroll 감지
 }
 if(!defined('G5_IS_ADMIN'))
     echo $config['cf_add_script'];

theme/basic/mobile/skin/board/basic/view.skin.php

@@ -84,10 +84,7 @@ jQuery(function($){
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
             echo "</div>\n";
 		}

theme/basic/mobile/skin/board/gallery/view.skin.php

@@ -86,10 +86,7 @@ jQuery(function($){
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
             echo "</div>\n";
 		}

theme/basic/mobile/skin/latest/basic/style.css

@@ -7,7 +7,7 @@
 .lt ul li {padding:15px 0;border-bottom:1px solid #e5ecee}
 .lt ul li:last-child {border-bottom:0}
 .lt ul li:after {display:block;visibility:hidden;clear:both;content:""}
-.lt ul li:hover a {color:#3a8afd}
+.lt ul li:hover a.lt_tit {color:#3a8afd}
 .lt .lt_thumb {display:inline-block;float:left;margin-right:10px}
 .lt .lt_thumb img {width:138px;height:auto;overflow:hidden}
 .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px}
@@ -30,6 +30,8 @@
 .lt .comment_icon {background:url('./img/icon_comment.png') no-repeat 50% 50%;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li {text-align:center;padding:40px 0;color:#777}
 
+.lt .owl-carousel .owl-item .profile_img img{width:auto}
+
 .lt_page {background:#fff;text-align:center;padding:10px 15px;line-height:25px;border-bottom:1px solid #e5ecee}
 .lt_page button {display:inline-block;background:#fff;width:25px;height:25px;border:1px solid #dbdee6;text-align:center;color:#cdcdce}
 .lt_page span {color:#6e6e6e}

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

@@ -40,7 +40,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 </div>
 
 <script>
-$(function(){
+jQuery(function($){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 비밀번호를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
@@ -50,6 +50,9 @@ $(function(){
 
 function flogin_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'login_sumit', [f, 'flogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>

theme/basic/skin/board/basic/style.css

@@ -122,6 +122,8 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .chk_box input[type="checkbox"] + label {position:relative;color:#676e70}
 .chk_box input[type="checkbox"] + label:hover {color:#2172f8}
 .chk_box input[type="checkbox"] + label span {float:left;width:15px;height:15px;display:block;background:#fff;border:1px solid #d0d4df;border-radius:3px}
+.write_div .chk_box input[type="checkbox"] + label, .bo_vc_w .chk_box input[type="checkbox"] + label {padding-left:20px}
+.write_div .chk_box input[type="checkbox"] + label span, .bo_vc_w .chk_box input[type="checkbox"] + label span {position:absolute;top:2px;left:0;width:15px;height:15px;display:block;margin:0;background:#fff;border:1px solid #d0d4df;border-radius:3px}
 .chk_box input[type="checkbox"]:checked + label {color:#000}
 .chk_box input[type="checkbox"]:checked + label span {background:url(./img/chk.png) no-repeat 50% 50% #3a8afd;border-color:#1471f6;border-radius:3px}
 

theme/basic/skin/board/basic/view.skin.php

@@ -94,10 +94,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
 
             echo "</div>\n";

theme/basic/skin/board/gallery/style.css

@@ -91,6 +91,8 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .chk_box input[type="checkbox"] + label {position:relative;padding-left:20px;color:#676e70;vertical-align:baseline}
 .chk_box input[type="checkbox"] + label:hover{color:#2172f8}
 .chk_box input[type="checkbox"] + label span {position:absolute;top:10px;left:10px;width:15px;height:15px;display:block;background:#fff;border:1px solid #d0d4df;border-radius:3px}
+.write_div .chk_box input[type="checkbox"] + label, .bo_vc_w .chk_box input[type="checkbox"] + label {padding-left:20px}
+.write_div .chk_box input[type="checkbox"] + label span, .bo_vc_w .chk_box input[type="checkbox"] + label span {position:absolute;top:2px;left:0;width:15px;height:15px;display:block;margin:0;background:#fff;border:1px solid #d0d4df;border-radius:3px}
 .chk_box input[type="checkbox"]:checked + label {color:#000}
 .chk_box input[type="checkbox"]:checked + label span {background:url(./img/chk.png) no-repeat 50% 50% #3a8afd;border-color:#1471f6;border-radius:3px}
 .all_chk.chk_box input[type="checkbox"] + label span {top:0;left:0}
@@ -103,6 +105,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_li {}
 #bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
 #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
+#bo_gall .gall_con {position:relative}
 
 .gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10 {position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0}
 .gall_row .col-gn-0,.latest_row .col-gn-1 {width:100%}
@@ -147,7 +150,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_info .gall_date,
 #bo_gall .gall_info .gall_view {display:inline-block;margin-left:10px;color:#777}
 
-#bo_gall .gall_option {position:absolute;top:170px;left:10px}
+#bo_gall .gall_option {position:absolute;top:10px;right:10px}
 #bo_gall .gall_option strong {background:#fff;padding:5px 10px;border-radius:30px;-webkit-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2);
 -moz-box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2);
 box-shadow:2px 2px 3px 0px rgba(0,0,0,0.2)}

theme/basic/skin/board/gallery/view.skin.php

@@ -94,10 +94,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             echo "<div id=\"bo_v_img\">\n";
 
             for ($i=0; $i<=count($view['file']); $i++) {
-                if ($view['file'][$i]['view']) {
-                    //echo $view['file'][$i]['view'];
-                    echo get_view_thumbnail($view['file'][$i]['view']);
-                }
+                echo get_file_thumbnail($view['file'][$i]);
             }
 
             echo "</div>\n";

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

@@ -9,7 +9,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php for ($i=0; $i<count($list); $i++) {  ?>
-        <li>
+        <li class="basic_li">
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 

theme/basic/skin/latest/basic/style.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.lat {position:relative;margin-bottom:20px;overflow:hidden;background:#fff}
+.lat {position:relative;margin-bottom:20px;background:#fff}
 .lat .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .lat .lat_title a {position:relative;color:#000;display:inline-block}
 

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

@@ -23,7 +23,7 @@ $thumb_height = 150;
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
     ?>
-        <li>
+        <li class="galley_li">
             <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";

theme/basic/skin/latest/pic_block/style.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.pic_lt {position:relative;margin-bottom:20px;overflow:hidden;background:#fff}
+.pic_lt {position:relative;margin-bottom:20px;background:#fff}
 .pic_lt .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .pic_lt .lat_title a {color:#000;display:inline-block;position:relative}
 
@@ -10,6 +10,7 @@
 .pic_lt ul:after {display:block;visibility:hidden;clear:both;content:""}
 .pic_lt ul {margin: 0 -10px}
 .pic_lt li {float:left;width:25%;padding:0 10px}
+.pic_lt li.galley_li:nth-child(4n+1) {clear: both!important}
 .pic_lt li .lt_img {margin:5px 0;display:block}
 .pic_lt li .lt_img img {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}

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

@@ -4,8 +4,8 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
-$thumb_width = 210;
-$thumb_height = 150;
+$thumb_width = 297;
+$thumb_height = 212;
 ?>
 
 <div class="pic_li_lt">
@@ -13,18 +13,24 @@ $thumb_height = 150;
     <ul>
     <?php
     for ($i=0; $i<count($list); $i++) {
-    $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
+        
+        $img_link_html = '';
+        
+        if( $i === 0 ) {
+            $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
-    if($thumb['src']) {
-        $img = $thumb['src'];
-    } else {
-        $img = G5_IMG_URL.'/no_img.png';
-        $thumb['alt'] = '이미지가 없습니다.';
-    }
-    $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+            if($thumb['src']) {
+                $img = $thumb['src'];
+            } else {
+                $img = G5_IMG_URL.'/no_img.png';
+                $thumb['alt'] = '이미지가 없습니다.';
+            }
+            $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
+            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.$img_content.'</a>';
+        }
     ?>
         <li>
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
+            <?php echo $img_link_html; ?>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
  

theme/basic/skin/latest/pic_list/style.css

@@ -1,9 +1,10 @@
 @charset "utf-8";
 
 /* 새글 스킨 (latest) */
-.pic_li_lt {position:relative;width:33.3333%;float:left;padding:0 10px;overflow:hidden;background:#fff}
+.pic_li_lt {position:relative;width:33.3333%;float:left;padding:0 10px;background:#fff}
 .pic_li_lt .lat_title {display:block;line-height:45px;font-size:1.2em;color:#253dbe}
 .pic_li_lt .lat_title a {color:#000;display:inline-block;position:relative}
+.latest_top_wr .pic_li_lt:nth-child(3n+1) {clear: both!important}
 
 .pic_li_lt .lt_more {position:absolute;top:11px;right:10px;display:block;width:25px;line-height:25px;color:#aaa;border-radius:3px;text-align:center}
 .pic_li_lt .lt_more:hover {color:#777}

theme/basic/skin/member/basic/login.skin.php

@@ -40,7 +40,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 </div>
 
 <script>
-$(function(){
+jQuery(function($){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 비밀번호를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
@@ -50,7 +50,10 @@ $(function(){
 
 function flogin_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'login_sumit', [f, 'flogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>
 <!-- } 로그인 끝 -->

theme/basic/skin/outlogin/basic/outlogin.skin.1.php

@@ -40,14 +40,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$outlogin_skin_url.'/style.css">'
 </section>
 
 <script>
-$omi = $('#ol_id');
-$omp = $('#ol_pw');
-$omi_label = $('#ol_idlabel');
-$omi_label.addClass('ol_idlabel');
-$omp_label = $('#ol_pwlabel');
-$omp_label.addClass('ol_pwlabel');
+jQuery(function($) {
 
-$(function() {
+    var $omi = $('#ol_id'),
+        $omp = $('#ol_pw'),
+        $omi_label = $('#ol_idlabel'),
+        $omp_label = $('#ol_pwlabel');
+
+    $omi_label.addClass('ol_idlabel');
+    $omp_label.addClass('ol_pwlabel');
 
     $("#auto_login").click(function(){
         if ($(this).is(":checked")) {
@@ -59,7 +60,10 @@ $(function() {
 
 function fhead_submit(f)
 {
-    return true;
+    if( $( document.body ).triggerHandler( 'outlogin1', [f, 'foutlogin'] ) !== false ){
+        return true;
+    }
+    return false;
 }
 </script>
 <!-- } 로그인 전 아웃로그인 끝 -->