Merge branch 'renewal2' of github.com:gnuboard/g5 into renewal

adm/member_form.php

@@ -463,8 +463,13 @@ this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }">
 <script>
 function fmember_submit(f)
 {
-    if (!f.mb_icon.value.match(/\.gif$/i) && f.mb_icon.value) {
-        alert('아이콘은 gif 파일만 가능합니다.');
+    if (!f.mb_icon.value.match(/\.(gif|jpe?g|png)$/i) && f.mb_icon.value) {
+        alert('아이콘은 이미지 파일만 가능합니다.');
+        return false;
+    }
+
+    if (!f.mb_img.value.match(/\.(gif|jpe?g|png)$/i) && f.mb_img.value) {
+        alert('회원이미지는 이미지 파일만 가능합니다.');
         return false;
     }
 

adm/member_form_update.php

@@ -2,6 +2,7 @@
 $sub_menu = "200100";
 include_once("./_common.php");
 include_once(G5_LIB_PATH."/register.lib.php");
+include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 if ($w == 'u')
     check_demo();
@@ -120,62 +121,88 @@ else if ($w == 'u')
     if ($del_mb_icon)
         @unlink(G5_DATA_PATH.'/member/'.$mb_dir.'/'.$mb_id.'.gif');
 
+    $image_regex = "/(\.(gif|jpe?g|png))$/i";
+    $mb_icon_img = $mb_id.'.gif';
+
     // 아이콘 업로드
     if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'])) {
-        if (!preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
-            alert($_FILES['mb_icon']['name'] . '은(는) gif 파일이 아닙니다.');
+        if (!preg_match($image_regex, $_FILES['mb_icon']['name'])) {
+            alert($_FILES['mb_icon']['name'] . '은(는) 이미지 파일이 아닙니다.');
         }
 
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
-            @mkdir(G5_DATA_PATH.'/member/'.$mb_dir, G5_DIR_PERMISSION);
-            @chmod(G5_DATA_PATH.'/member/'.$mb_dir, G5_DIR_PERMISSION);
+        if (preg_match($image_regex, $_FILES['mb_icon']['name'])) {
+            $mb_icon_dir = G5_DATA_PATH.'/member/'.$mb_dir;
+            @mkdir($mb_icon_dir, G5_DIR_PERMISSION);
+            @chmod($mb_icon_dir, G5_DIR_PERMISSION);
 
-            $dest_path = G5_DATA_PATH.'/member/'.$mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_icon_dir.'/'.$mb_icon_img;
 
             move_uploaded_file($_FILES['mb_icon']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
-
+            
             if (file_exists($dest_path)) {
-                $size = getimagesize($dest_path);
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                $size = @getimagesize($dest_path);
                 if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height']) {
-                    @unlink($dest_path);
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_icon_dir, $mb_icon_dir, $config['cf_member_icon_width'], $config['cf_member_icon_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_icon_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
                 }
             }
         }
     }
     
     $mb_img_dir = G5_DATA_PATH.'/member_image/';
-    $mb_dir = substr($mb_id,0,2);
     if( !is_dir($mb_img_dir) ){
         @mkdir($mb_img_dir, G5_DIR_PERMISSION);
         @chmod($mb_img_dir, G5_DIR_PERMISSION);
     }
+    $mb_img_dir .= substr($mb_id,0,2);
 
     // 회원 이미지 삭제
     if ($del_mb_img)
-        @unlink($mb_img_dir.$mb_dir.'/'.$mb_id.'.gif');
+        @unlink($mb_img_dir.'/'.$mb_icon_img);
 
     // 아이콘 업로드
     if (isset($_FILES['mb_img']) && is_uploaded_file($_FILES['mb_img']['tmp_name'])) {
-        if (!preg_match("/(\.gif)$/i", $_FILES['mb_img']['name'])) {
-            alert($_FILES['mb_img']['name'] . '은(는) gif 파일이 아닙니다.');
+        if (!preg_match($image_regex, $_FILES['mb_img']['name'])) {
+            alert($_FILES['mb_img']['name'] . '은(는) 이미지 파일이 아닙니다.');
         }
         
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_img']['name'])) {
-            @mkdir($mb_img_dir.$mb_dir, G5_DIR_PERMISSION);
-            @chmod($mb_img_dir.$mb_dir, G5_DIR_PERMISSION);
+        if (preg_match($image_regex, $_FILES['mb_img']['name'])) {
+            @mkdir($mb_img_dir, G5_DIR_PERMISSION);
+            @chmod($mb_img_dir, G5_DIR_PERMISSION);
             
-            $dest_path = $mb_img_dir.$mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_img_dir.'/'.$mb_icon_img;
             
             move_uploaded_file($_FILES['mb_img']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
 
             if (file_exists($dest_path)) {
-                $size = getimagesize($dest_path);
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                $size = @getimagesize($dest_path);
                 if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height']) {
-                    @unlink($dest_path);
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_img_dir, $mb_img_dir, $config['cf_member_img_width'], $config['cf_member_img_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_img_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
                 }
             }
         }

adm/poll_form_update.php

@@ -10,6 +10,40 @@ auth_check($auth[$sub_menu], 'w');
 
 check_admin_token();
 
+$check_keys = array(
+'po_subject',
+'po_poll1',
+'po_poll2',
+'po_poll3',
+'po_poll4',
+'po_poll5',
+'po_poll6',
+'po_poll7',
+'po_poll8',
+'po_poll9',
+'po_cnt1',
+'po_cnt2',
+'po_cnt3',
+'po_cnt4',
+'po_cnt5',
+'po_cnt6',
+'po_cnt7',
+'po_cnt8',
+'po_cnt9',
+'po_etc',
+'po_level',
+'po_point',
+'po_id'
+);
+
+foreach( $_POST as $key=>$value ){
+    if( empty($value) ) continue;
+
+    if( in_array($key, $check_keys) ) {
+        $_POST[$key] = strip_tags($value);
+    }
+}
+
 if ($w == '')
 {
     $sql = " insert {$g5['poll_table']}

bbs/board.php

@@ -136,7 +136,7 @@ if (isset($wr_id) && $wr_id) {
         set_session($ss_name, TRUE);
     }
 
-    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
+    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
 } else {
     if ($member['mb_level'] < $board['bo_list_level']) {
         if ($member['mb_id'])
@@ -171,7 +171,7 @@ if (isset($wr_id) && $wr_id) {
 
     if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
 
-    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']) ;
+    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지';
 }
 
 include_once(G5_PATH.'/head.sub.php');

bbs/logout.php

@@ -19,8 +19,12 @@ if ($url) {
         $url = 'http:' . $url;
 
     $p = @parse_url(urldecode($url));
-    if ($p['scheme'] || $p['host']) {
-        alert('url에 도메인을 지정할 수 없습니다.');
+    /*
+        // OpenRediect 취약점관련, PHP 5.3 이하버전에서는 parse_url 버그가 있음 ( Safflower 님 제보 ) 아래 url 예제
+        // http://localhost/bbs/logout.php?url=http://sir.kr%23@/
+    */
+    if (preg_match('/^https?:\/\//i', $url) || $p['scheme'] || $p['host']) {
+        alert('url에 도메인을 지정할 수 없습니다.', G5_URL);
     }
 
     $link = $url;

bbs/memo.php

@@ -22,6 +22,10 @@ $sql = " select count(*) as cnt from {$g5['memo_table']} where me_{$kind}_mb_id
 $row = sql_fetch($sql);
 $total_count = number_format($row['cnt']);
 
+$total_page  = ceil($total_count / $config['cf_page_rows']);  // 전체 페이지 계산
+if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
+$from_record = ((int) $page - 1) * $config['cf_page_rows']; // 시작 열을 구함
+
 if ($kind == 'recv')
 {
     $kind_title = '받은';
@@ -41,7 +45,7 @@ $sql = " select a.*, b.mb_id, b.mb_nick, b.mb_email, b.mb_homepage
             from {$g5['memo_table']} a
             left join {$g5['member_table']} b on (a.me_{$unkind}_mb_id = b.mb_id)
             where a.me_{$kind}_mb_id = '{$member['mb_id']}'
-            order by a.me_id desc ";
+            order by a.me_id desc limit $from_record, {$config['cf_page_rows']} ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++)
 {
@@ -66,10 +70,12 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $list[$i]['name'] = $name;
     $list[$i]['send_datetime'] = $send_datetime;
     $list[$i]['read_datetime'] = $read_datetime;
-    $list[$i]['view_href'] = './memo_view.php?me_id='.$row['me_id'].'&amp;kind='.$kind;
+    $list[$i]['view_href'] = './memo_view.php?me_id='.$row['me_id'].'&amp;kind='.$kind.'&amp;page='.$page;
     $list[$i]['del_href'] = './memo_delete.php?me_id='.$row['me_id'].'&amp;token='.$token.'&amp;kind='.$kind;
 }
 
+$write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "./memo.php?kind=$kind".$qstr."&amp;page=");
+
 include_once($member_skin_path.'/memo.skin.php');
 
 include_once(G5_PATH.'/tail.sub.php');

bbs/memo_view.php

@@ -57,14 +57,22 @@ $sql = " select * from {$g5[memo_table]}
             order by me_id desc
             limit 1 ";
 $next = sql_fetch($sql);
-if ($next[me_id])
-    $next_link = './memo_view.php?kind='.$kind.'&me_id='.$next[me_id];
+if ($next['me_id'])
+    $next_link = './memo_view.php?kind='.$kind.'&me_id='.$next['me_id'];
 else
     //$next_link = 'javascript:alert(\'쪽지의 마지막입니다.\');';
     $next_link = '';
 
 $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
+$list_link = './memo.php?kind='.$kind;
+
+if(isset($page) && $page){
+    $prev_link .= '&page='.(int) $page;
+    $next_link .= '&page='.(int) $page;
+    $list_link .= '&page='.(int) $page;
+}
+
 include_once($member_skin_path.'/memo_view.skin.php');
 
 include_once(G5_PATH.'/tail.sub.php');

bbs/register_form_update.php

@@ -3,6 +3,7 @@ include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 include_once(G5_LIB_PATH.'/register.lib.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
+include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 // 리퍼러 체크
 referer_check();
@@ -362,13 +363,16 @@ $msg = "";
 
 // 아이콘 업로드
 $mb_icon = '';
+$image_regex = "/(\.(gif|jpe?g|png))$/i";
+$mb_icon_img = $mb_id.'.gif';
+
 if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'])) {
-    if (preg_match("/(\.gif)$/i", $_FILES['mb_icon']['name'])) {
+    if (preg_match($image_regex, $_FILES['mb_icon']['name'])) {
         // 아이콘 용량이 설정값보다 이하만 업로드 가능
         if ($_FILES['mb_icon']['size'] <= $config['cf_member_icon_size']) {
             @mkdir($mb_dir, G5_DIR_PERMISSION);
             @chmod($mb_dir, G5_DIR_PERMISSION);
-            $dest_path = $mb_dir.'/'.$mb_id.'.gif';
+            $dest_path = $mb_dir.'/'.$mb_icon_img;
             move_uploaded_file($_FILES['mb_icon']['tmp_name'], $dest_path);
             chmod($dest_path, G5_FILE_PERMISSION);
             if (file_exists($dest_path)) {
@@ -377,13 +381,24 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name']
                 // gif 파일에 악성코드를 심어 업로드 하는 경우를 방지
                 // 에러메세지는 출력하지 않는다.
                 //-----------------------------------------------------------------
-                $size = getimagesize($dest_path);
-                if ($size[2] != 1) // gif 파일이 아니면 올라간 이미지를 삭제한다.
-                    @unlink($dest_path);
-                else
-                // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
-                if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height'])
+                $size = @getimagesize($dest_path);
+                if (!($size[2] === 1 || $size[2] === 2 || $size[2] === 3)) { // jpg, gif, png 파일이 아니면 올라간 이미지를 삭제한다.
                     @unlink($dest_path);
+                } else if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height']) {
+                    $thumb = null;
+                    if($size[2] === 2 || $size[2] === 3) {
+                        //jpg 또는 png 파일 적용
+                        $thumb = thumbnail($mb_icon_img, $mb_dir, $mb_dir, $config['cf_member_icon_width'], $config['cf_member_icon_height'], true, true);
+                        if($thumb) {
+                            @unlink($dest_path);
+                            rename($mb_dir.'/'.$thumb, $dest_path);
+                        }
+                    }
+                    if( !$thumb ){
+                        // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                        @unlink($dest_path);
+                    }
+                }
                 //=================================================================\
             }
         } else {
@@ -391,7 +406,7 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name']
         }
 
     } else {
-        $msg .= $_FILES['mb_icon']['name'].'은(는) gif 파일이 아닙니다.';
+        $msg .= $_FILES['mb_icon']['name'].'은(는) 이미지 파일이 아닙니다.';
     }
 }
 
@@ -406,34 +421,46 @@ if( $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['
 
     // 아이콘 삭제
     if (isset($_POST['del_mb_img'])) {
-        @unlink($mb_dir.'/'.$mb_id.'.gif');
+        @unlink($mb_dir.'/'.$mb_icon_img);
     }
 
-    $msg = '';
-
     // 회원 프로필 이미지 업로드
     $mb_img = '';
     if (isset($_FILES['mb_img']) && is_uploaded_file($_FILES['mb_img']['tmp_name'])) {
-        if (preg_match("/(\.gif)$/i", $_FILES['mb_img']['name']) || preg_match("/(\.jpg)$/i", $_FILES['mb_img']['name'])) {
+
+        $msg = $msg ? $msg."\\r\\n" : '';
+
+        if (preg_match($image_regex, $_FILES['mb_img']['name'])) {
             // 아이콘 용량이 설정값보다 이하만 업로드 가능
-            if ($_FILES['mb_icon']['size'] <= $config['cf_member_img_size']) {
+            if ($_FILES['mb_img']['size'] <= $config['cf_member_img_size']) {
                 @mkdir($mb_dir, G5_DIR_PERMISSION);
                 @chmod($mb_dir, G5_DIR_PERMISSION);
-                $dest_path = $mb_dir.'/'.$mb_id.'.gif';
+                $dest_path = $mb_dir.'/'.$mb_icon_img;
                 move_uploaded_file($_FILES['mb_img']['tmp_name'], $dest_path);
                 chmod($dest_path, G5_FILE_PERMISSION);
                 if (file_exists($dest_path)) {
-                    $size = getimagesize($dest_path);
-                    if ( ! ($size[2] === 1 || $size[2] === 2) ) // gif 또는 jpg 파일이 아니면 올라간 이미지를 삭제한다.
-                        @unlink($dest_path);
-                    else
-                    // 이미지의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
-                    if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height'])
+                    $size = @getimagesize($dest_path);
+                    if (!($size[2] === 1 || $size[2] === 2 || $size[2] === 3)) { // gif jpg png 파일이 아니면 올라간 이미지를 삭제한다.
                         @unlink($dest_path);
+                    } else if ($size[0] > $config['cf_member_img_width'] || $size[1] > $config['cf_member_img_height']) {
+                        $thumb = null;
+                        if($size[2] === 2 || $size[2] === 3) {
+                            //jpg 또는 png 파일 적용
+                            $thumb = thumbnail($mb_icon_img, $mb_dir, $mb_dir, $config['cf_member_img_width'], $config['cf_member_img_height'], true, true);
+                            if($thumb) {
+                                @unlink($dest_path);
+                                rename($mb_dir.'/'.$thumb, $dest_path);
+                            }
+                        }
+                        if( !$thumb ){
+                            // 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
+                            @unlink($dest_path);
+                        }
+                    }
                     //=================================================================\
                 }
             } else {
-                $msg .= '회원아이콘을 '.number_format($config['cf_member_img_size']).'바이트 이하로 업로드 해주십시오.';
+                $msg .= '회원이미지을 '.number_format($config['cf_member_img_size']).'바이트 이하로 업로드 해주십시오.';
             }
 
         } else {

bbs/view.php

@@ -25,20 +25,20 @@ if (!$board['bo_use_list_view']) {
         $sql_search = " and " . $sql_search;
 
     // 윗글을 얻음
-    $sql = " select wr_id, wr_subject 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 ";
+    $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 (!$prev['wr_id'])     {
-        $sql = " select wr_id, wr_subject 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 ";
+        $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);
     }
 
     // 아래글을 얻음
-    $sql = " select wr_id, wr_subject 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 ";
+    $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 (!$next['wr_id']) {
-        $sql = " select wr_id, wr_subject from {$write_table} where wr_is_comment = 0 and wr_num > '{$write['wr_num']}' {$sql_search} order by wr_num, wr_reply limit 1 ";
+        $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);
     }
 }
@@ -48,6 +48,7 @@ $prev_href = '';
 if (isset($prev['wr_id']) && $prev['wr_id']) {
     $prev_wr_subject = get_text(cut_str($prev['wr_subject'], 255));
     $prev_href = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$prev['wr_id'].$qstr;
+    $prev_wr_date = $prev['wr_datetime'];
 }
 
 // 다음글 링크
@@ -55,6 +56,7 @@ $next_href = '';
 if (isset($next['wr_id']) && $next['wr_id']) {
     $next_wr_subject = get_text(cut_str($next['wr_subject'], 255));
     $next_href = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$next['wr_id'].$qstr;
+    $next_wr_date = $next['wr_datetime'];
 }
 
 // 쓰기 링크

bbs/write.php

@@ -386,7 +386,7 @@ else
 
 $captcha_html = '';
 $captcha_js   = '';
-$is_use_captcha = ((!empty($board['bo_use_captcha']) || $is_guest) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha) {
     $captcha_html = captcha_html();

bbs/write_update.php

@@ -188,7 +188,7 @@ if ($w == '' || $w == 'u') {
     alert('w 값이 제대로 넘어오지 않았습니다.');
 }
 
-$is_use_captcha = ((!empty($board['bo_use_captcha']) || $is_guest) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha && !chk_captcha()) {
     alert('자동등록방지 숫자가 틀렸습니다.');

config.php

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

css/default.css

@@ -423,6 +423,13 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 box-shadow: inset 1px 1px 2px #222542;
 }
 
+/* cheditor 이슈 */
+.cheditor-popup-window *, .cheditor-popup-window :after, .cheditor-popup-window :before {
+-webkit-box-sizing: content-box;
+-moz-box-sizing: content-box;
+box-sizing: content-box;
+}
+
 /* Mobile화면으로 */
 #device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
 

css/mobile.css

@@ -236,8 +236,8 @@ a.btn_admin:focus, a.btn_admin:hover {}
 
 /* 기본폼 */
 .form_01{margin:10px}
-.form_01 div{margin:5px 0;position:relative}
-.form_01 li{margin:5px 0;position:relative}
+.form_01 .write_div{margin:5px 0;position:relative}
+.form_01 li{margin:5px 0;position:relative;list-style:none}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
 .frm_input {height:40px;}

mobile/skin/board/basic/view_comment.skin.php

@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

mobile/skin/board/basic/write.skin.php

@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>

mobile/skin/board/gallery/view_comment.skin.php

@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

mobile/skin/board/gallery/write.skin.php

@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>

mobile/skin/member/basic/memo.skin.php

@@ -9,8 +9,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <h1 id="win_title"><?php echo $g5['title'] ?></h1>
 
     <ul class="win_ul">
-        <li><a href="./memo.php?kind=recv" class="selected">받은쪽지</a></li>
-        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
+        <li><a href="./memo.php?kind=recv" class="<?php if ($kind == 'recv') {  ?>selected<?php }  ?>">받은쪽지</a></li>
+        <li><a href="./memo.php?kind=send" class="<?php if ($kind == 'send') {  ?>selected<?php }  ?>">보낸쪽지</a></li>
         <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
     <div class="new_win_con">
@@ -32,6 +32,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
         </ul>
 
+        <!-- 페이지 -->
+        <?php echo $write_pages; ?>
+
         <p class="win_desc">
             쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
         </p>

mobile/skin/member/basic/memo_view.skin.php

@@ -50,7 +50,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php if($next_link) { ?>
             <a href="<?php echo $next_link ?>" class="btn_b03 btn">다음쪽지</a>
             <?php } ?>
-            <a href="./memo.php?kind=<?php echo $kind ?>" class="btn_b03 btn">목록보기</a>
+            <a href="<?php echo $list_link ?>" class="btn_b03 btn">목록보기</a>
             <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
         </div>
     </div>

mobile/skin/member/basic/register_form.skin.php

@@ -171,7 +171,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_icon" id="reg_mb_icon">
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
             <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
@@ -188,7 +188,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_img" id="reg_mb_img" >
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
             <img src="<?php echo $mb_img_url ?>" alt="회원아이콘">
@@ -418,14 +418,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != 'undefined') {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert('회원아이콘이 gif 파일이 아닙니다.');
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert('회원아이콘이 이미지 파일이 아닙니다.');
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert('본인을 추천할 수 없습니다.');

plugin/editor/cheditor5/editor.lib.php

@@ -15,7 +15,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
 
     $width  = isset($editor_width)  ? $editor_width  : "100%";
     $height = isset($editor_height) ? $editor_height : "250px";
-    if (defined(G5_PUNYCODE))
+    if (defined('G5_PUNYCODE'))
         $editor_url = G5_PUNYCODE.'/'.G5_EDITOR_DIR.'/'.$config['cf_editor'];
     else
         $editor_url = G5_EDITOR_URL.'/'.$config['cf_editor'];

plugin/htmlpurifier/extend.video.php

@@ -21,11 +21,24 @@ if( !class_exists('HTMLPurifier_Filter_Iframevideo') ){
 		 */
 		public function preFilter($html, $config, $context)
 		{
-			$html = preg_replace('#<iframe#i', '<img class="Iframevideo"', $html);
-			$html = preg_replace('#</iframe>#i', '</img>', $html);
+			if (strstr($html, '<iframe')) {
+				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/www\.youtube\.com\/embed\/([^"]*)[^>]*>(.*?)?\/iframe>/i', array($this, 'trust_url_match'), $html);
+				$html = preg_replace_callback('/<iframe.*?src="https?:\/\/player\.vimeo.com\/video\/([^"]*)[^>]*>(.*?)?\/iframe>/i', array($this, 'trust_url_match'), $html);
+				//$html = preg_replace('#<iframe#i', '<img class="Iframevideo"', $html);
+				//$html = preg_replace('#</iframe>#i', '</img>', $html);
+			}
 			return $html;
 		}
 
+		public function trust_url_match($matches)
+		{
+			$str = $matches[0];
+			if( $matches[1] ){
+				$str = preg_replace('#<iframe#i', '<img class="Iframevideo"', $str);
+				$str = preg_replace('#</iframe>#i', '</img>', $str);
+			}
+			return $str;
+		}
 		/**
 		 *
 		 * @param string $html
@@ -48,7 +61,7 @@ if( !class_exists('HTMLPurifier_Filter_Iframevideo') ){
 		{
 			// Domain Whitelist
 			$youTubeMatch = preg_match('#src="https?://www.youtube(-nocookie)?.com/#i', $matches[1]);
-			$vimeoMatch = preg_match('#src="http://player.vimeo.com/#i', $matches[1]);
+			$vimeoMatch = preg_match('#src="https?://player.vimeo.com/#i', $matches[1]);
 			if ($youTubeMatch || $vimeoMatch) {
 				$extra = ' frameborder="0"';
 				if ($youTubeMatch) {

plugin/social/Hybrid/Providers/Facebook.php

@@ -53,6 +53,7 @@ class Hybrid_Providers_Facebook extends Hybrid_Provider_Model_OAuth2 {
             "client_id" => $this->api->client_id,
             "redirect_uri" => $this->api->redirect_uri,
             "state" => $token,
+            "scope" => $this->scope,
             );
         
         Hybrid_Auth::redirect($this->api->authorizeUrl($parameters));

plugin/social/includes/functions.php

@@ -317,6 +317,7 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_facebook_appid'], "secret" => $config['cf_facebook_secret']),
                     "display"   =>  "popup",
                     "redirect_uri" => get_social_callbackurl('facebook'),
+                    "scope"   => array('email'), // optional
                     "trustForwarded" => false
                 );
 
@@ -326,6 +327,9 @@ function social_extends_get_keys($provider){
                     "keys" => array("id" => $config['cf_google_clientid'],
                     "secret" => $config['cf_google_secret']),
                     "redirect_uri" => get_social_callbackurl('google'),
+                    "scope"   => "https://www.googleapis.com/auth/plus.login ". // optional
+                                    "https://www.googleapis.com/auth/plus.me ". // optional
+                                    "https://www.googleapis.com/auth/plus.profile.emails.read", // optional
                     //"access_type"     => "offline",   // optional
                     //"approval_prompt" => "force",     // optional
                 );
@@ -469,6 +473,10 @@ function social_check_login_before($p_service=''){
             // then grab the user profile 
             $user_profile = $adapter->getUserProfile();
 
+            if( ! (isset($_SESSION['sl_userprofile']) && is_array($_SESSION['sl_userprofile'])) ){ 
+                $_SESSION['sl_userprofile'] = array(); 
+            }
+
             if( ! $is_member ){ 
                 $_SESSION['sl_userprofile'][$provider_name] = json_encode( $user_profile );
             }

plugin/social/register_member_update.php

@@ -24,20 +24,26 @@ $sm_id = $user_profile->sid;
 $mb_id = trim($_POST['mb_id']);
 $mb_password    = trim($_POST['mb_password']);
 $mb_password_re = trim($_POST['mb_password_re']);
-$mb_nick        = trim($_POST['mb_nick']);
+$mb_nick        = trim(strip_tags($_POST['mb_nick']));
 $mb_email       = trim($_POST['mb_email']);
-$mb_name        = clean_xss_tags(trim($_POST['mb_name']));
+$mb_name        = clean_xss_tags(trim(strip_tags($_POST['mb_name'])));
 $mb_email       = get_email_address($mb_email);
 
 // 이름, 닉네임에 utf-8 이외의 문자가 포함됐다면 오류
 // 서버환경에 따라 정상적으로 체크되지 않을 수 있음.
 $tmp_mb_name = iconv('UTF-8', 'UTF-8//IGNORE', $mb_name);
 if($tmp_mb_name != $mb_name) {
-    alert('이름을 올바르게 입력해 주십시오.');
+    $mb_name = $tmp_mb_name;
 }
 $tmp_mb_nick = iconv('UTF-8', 'UTF-8//IGNORE', $mb_nick);
 if($tmp_mb_nick != $mb_nick) {
-    alert('닉네임을 올바르게 입력해 주십시오.');
+    $mb_nick = $tmp_mb_nick;
+}
+
+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];
 }
 
 if( ! isset($mb_password) || ! $mb_password ){
@@ -76,6 +82,11 @@ if( defined('G5_SOCIAL_CERTIFY_MAIL') && G5_SOCIAL_CERTIFY_MAIL && $config['cf_u
     $mb_email_certify = '';
 }
 
+//회원 메일 동의
+$mb_mailling = (isset($_POST['mb_mailling']) && $_POST['mb_mailling']) ? 1 : 0;
+//회원 정보 공개
+$mb_open = (isset($_POST['mb_open']) && $_POST['mb_open']) ? 1 : 0;
+
 // 회원정보 입력
 $sql = " insert into {$g5['member_table']}
             set mb_id = '{$mb_id}',
@@ -90,9 +101,9 @@ $sql = " insert into {$g5['member_table']}
                 mb_ip = '{$_SERVER['REMOTE_ADDR']}',
                 mb_level = '{$config['cf_register_level']}',
                 mb_login_ip = '{$_SERVER['REMOTE_ADDR']}',
-                mb_mailling = '0',
+                mb_mailling = '{$mb_mailling}',
                 mb_sms = '0',
-                mb_open = '0',
+                mb_open = '{$mb_open}',
                 mb_open_date = '".G5_TIME_YMD."' ";
 
 $result = sql_query($sql, false);

skin/board/basic/style.css

@@ -348,7 +348,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }

skin/board/basic/view.skin.php

@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php

skin/board/basic/view_comment.skin.php

@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {

skin/board/basic/write.skin.php

@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -64,7 +64,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -82,23 +82,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -114,7 +114,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -131,15 +131,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -158,13 +158,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>

skin/board/gallery/style.css

@@ -362,7 +362,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_vc_sns input {margin:0 5px 0 0 }
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }

skin/board/gallery/view.skin.php

@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php

skin/board/gallery/view_comment.skin.php

@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {

skin/board/gallery/write.skin.php

@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -65,7 +65,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php } ?>
 
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -83,23 +83,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -115,7 +115,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -133,15 +133,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -160,13 +160,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>

skin/member/basic/memo.skin.php

@@ -32,6 +32,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             </ul>
         </div>
 
+        <!-- 페이지 -->
+        <?php echo $write_pages; ?>
+
         <p class="win_desc">
             쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
         </p>

skin/member/basic/memo_view.skin.php

@@ -54,7 +54,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <a href="<?php echo $next_link ?>" class="btn btn_b01">다음쪽지 <i class="fa fa-angle-right" aria-hidden="true"></i></a>
             <?php }  ?>
 
-            <a href="./memo.php?kind=<?php echo $kind ?>" class="btn btn_b01"><i class="fa fa-list" aria-hidden="true"></i> 목록</a>
+            <a href="<?php echo $list_link ?>" class="btn btn_b01"><i class="fa fa-list" aria-hidden="true"></i> 목록</a>
             <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
             <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn btn_b02">답장</a><?php }  ?>
         </div>

skin/member/basic/register_form.skin.php

@@ -177,7 +177,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
@@ -196,7 +196,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
@@ -417,14 +417,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert("회원아이콘이 gif 파일이 아닙니다.");
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert("본인을 추천할 수 없습니다.");

theme/basic/css/default.css

@@ -428,6 +428,13 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 box-shadow: inset 1px 1px 2px #222542;
 }
 
+/* cheditor 이슈 */
+.cheditor-popup-window *, .cheditor-popup-window :after, .cheditor-popup-window :before {
+-webkit-box-sizing: content-box;
+-moz-box-sizing: content-box;
+box-sizing: content-box;
+}
+
 /* Mobile화면으로 */
 #device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
 

theme/basic/css/mobile.css

@@ -236,8 +236,8 @@ a.btn_admin:focus, a.btn_admin:hover {}
 
 /* 기본폼 */
 .form_01{margin:10px}
-.form_01 div{margin:5px 0;position:relative}
-.form_01 li{margin:5px 0;position:relative}
+.form_01 .write_div{margin:5px 0;position:relative}
+.form_01 li{margin:5px 0;position:relative;list-style:none}
 .form_01 textarea, .frm_input {border:1px solid #ccc;background:#fff;color:#000;vertical-align:middle;border-radius:3px;padding:5px;}
 .form_01 textarea {width:100%;height:100px}
 .frm_input {height:40px;}

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

@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

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

@@ -49,11 +49,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
-        <div class="bo_w_select">
+        <div class="bo_w_select write_div">
             <label for="ca_name" class="sound_only">분류<strong>필수</strong></label>
             <select id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>

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

@@ -84,7 +84,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
+        <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off" class="bo_vc_w">
         <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
         <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
         <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -246,7 +246,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
     function comment_box(comment_id, work)
     {
-        var el_id;
+        var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
         // 댓글 아이디가 넘어오면 답변, 수정
         if (comment_id)
         {
@@ -263,11 +266,13 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             if (save_before)
             {
                 document.getElementById(save_before).style.display = 'none';
-                document.getElementById(save_before).innerHTML = '';
             }
 
             document.getElementById(el_id).style.display = '';
-            document.getElementById(el_id).innerHTML = save_html;
+            document.getElementById(el_id).appendChild(respond);
+            //입력값 초기화
+            document.getElementById('wr_content').value = '';
+
             // 댓글 수정
             if (work == 'cu')
             {

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

@@ -49,7 +49,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     echo $option_hidden;
     ?>
-    <div class="form_01">
+    <div class="form_01 write_div">
         <h2 class="sound_only"><?php echo $g5['title'] ?></h2>
 
         <?php if ($is_category) { ?>
@@ -63,46 +63,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?> 
         
         <?php if ($is_name) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
             <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input full_input required" maxlength="20" placeholder="이름">
         </div>
         <?php } ?>
 
         <?php if ($is_password) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_password" class="sound_only">비밀번호<strong>필수</strong></label>
             <input type="password" name="wr_password" id="wr_password" <?php echo $password_required ?> class="frm_input full_input <?php echo $password_required ?>" maxlength="20" placeholder="비밀번호">
         </div>
         <?php } ?>
 
         <?php if ($is_email) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
             <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input  email" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 
         <?php if ($is_homepage) { ?>
-        <div>
+        <div class="write_div">
             <label for="wr_homepage" class="sound_only">홈페이지</label>
             <input type="url" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input " placeholder="홈페이지">
         </div>
         <?php } ?>
 
         <?php if ($option) { ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">옵션</span>
             <?php echo $option ?>
         </div>
         <?php } ?>
 
-        <div class="bo_w_tit">
+        <div class="bo_w_tit write_div">
             <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" placeholder="제목">
         </div>
 
-        <div>
+        <div class="write_div">
             <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
             <?php if($write_min || $write_max) { ?>
             <!-- 최소/최대 글자 수 사용 시 -->
@@ -117,7 +117,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
         <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-        <div class="bo_w_link">
+        <div class="bo_w_link write_div">
             <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i> <span class="sound_only">링크 #<?php echo $i ?></span></label>
             <input type="url" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input wr_link">
         </div>
@@ -125,8 +125,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         
         <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-        <div class="bo_w_flie">
-            <div class="file_wr">
+        <div class="bo_w_flie write_div">
+            <div class="file_wr write_div">
                 <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only">파일 #<?php echo $i+1 ?></span></label>
                 <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
             </div>
@@ -144,7 +144,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php } ?>
 
         <?php if ($is_use_captcha) { //자동등록방지 ?>
-        <div>
+        <div class="write_div">
             <span class="sound_only">자동등록방지</span>
             <?php echo $captcha_html ?>
             
@@ -153,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
     </div>
 
-    <div class="btn_top top">
+    <div class="btn_top top write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
     </div>

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

@@ -9,8 +9,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <h1 id="win_title"><?php echo $g5['title'] ?></h1>
 
     <ul class="win_ul">
-        <li><a href="./memo.php?kind=recv" class="selected">받은쪽지</a></li>
-        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
+        <li><a href="./memo.php?kind=recv" class="<?php if ($kind == 'recv') {  ?>selected<?php }  ?>">받은쪽지</a></li>
+        <li><a href="./memo.php?kind=send" class="<?php if ($kind == 'send') {  ?>selected<?php }  ?>">보낸쪽지</a></li>
         <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
     <div class="new_win_con">
@@ -32,6 +32,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
         </ul>
 
+        <!-- 페이지 -->
+        <?php echo $write_pages; ?>
+
         <p class="win_desc">
             쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
         </p>

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

@@ -50,7 +50,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php if($next_link) { ?>
             <a href="<?php echo $next_link ?>" class="btn_b03 btn">다음쪽지</a>
             <?php } ?>
-            <a href="./memo.php?kind=<?php echo $kind ?>" class="btn_b03 btn">목록보기</a>
+            <a href="<?php echo $list_link ?>" class="btn_b03 btn">목록보기</a>
             <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
         </div>
     </div>

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

@@ -171,7 +171,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_icon" id="reg_mb_icon">
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
             <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
@@ -188,7 +188,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <input type="file" name="mb_img" id="reg_mb_img" >
             <span class="frm_info">
                 이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
             </span>
             <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
             <img src="<?php echo $mb_img_url ?>" alt="회원아이콘">
@@ -416,16 +416,26 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         }
         <?php } ?>
 
-        if (typeof f.mb_icon != 'undefined') {
+        if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert('회원아이콘이 gif 파일이 아닙니다.');
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert('본인을 추천할 수 없습니다.');

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

@@ -348,7 +348,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }

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

@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php

theme/basic/skin/board/basic/view_comment.skin.php

@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {

theme/basic/skin/board/basic/write.skin.php

@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -64,7 +64,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -82,23 +82,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -114,7 +114,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -131,15 +131,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -158,13 +158,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>

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

@@ -362,7 +362,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_vc_sns input {margin:0 5px 0 0 }
 
 /*글쓰기*/
-#bo_w div{margin:10px 0;position:relative;}
+#bo_w .write_div{margin:10px 0;position:relative}
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%  }

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

@@ -186,8 +186,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <?php if ($prev_href || $next_href) { ?>
         <ul class="bo_v_nb">
-            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>">이전글제목입니다.</a> <span class="nb_date">17.07.14</span></li><?php } ?>
-            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>">다음글제목입니다.</a>  <span class="nb_date">17.07.14</span></li><?php } ?>
+            <?php if ($prev_href) { ?><li class="btn_prv"><span class="nb_tit"><i class="fa fa-caret-up" aria-hidden="true"></i> 이전글</span><a href="<?php echo $prev_href ?>"><?php echo $prev_wr_subject;?></a> <span class="nb_date"><?php echo str_replace('-', '.', substr($prev_wr_date, '2', '8')); ?></span></li><?php } ?>
+            <?php if ($next_href) { ?><li class="btn_next"><span class="nb_tit"><i class="fa fa-caret-down" aria-hidden="true"></i> 다음글</span><a href="<?php echo $next_href ?>"><?php echo $next_wr_subject;?></a>  <span class="nb_date"><?php echo str_replace('-', '.', substr($next_wr_date, '2', '8')); ?></span></li><?php } ?>
         </ul>
         <?php } ?>
         <?php

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

@@ -88,7 +88,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 <!-- 댓글 쓰기 시작 { -->
 <aside id="bo_vc_w" class="bo_vc_w">
     <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+    <form name="fviewcomment" id="fviewcomment" action="<?php echo $comment_action_url; ?>" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
     <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -107,10 +107,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
     <script>
     $(document).on("keyup change", "textarea#wr_content[maxlength]", function() {
-        var sdiv = $(this).val()
-        var mx = parseInt($(this).atdiv("maxlength"))
-        if (sdiv.length > mx) {
-            $(this).val(sdiv.subsdiv(0, mx));
+        var str = $(this).val()
+        var mx = parseInt($(this).attr("maxlength"))
+        if (str.length > mx) {
+            $(this).val(str.substr(0, mx));
             return false;
         }
     });
@@ -245,7 +245,10 @@ function fviewcomment_submit(f)
 
 function comment_box(comment_id, work)
 {
-    var el_id;
+    var el_id,
+        form_el = 'fviewcomment',
+        respond = document.getElementById(form_el);
+
     // 댓글 아이디가 넘어오면 답변, 수정
     if (comment_id)
     {
@@ -262,11 +265,13 @@ function comment_box(comment_id, work)
         if (save_before)
         {
             document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
         }
 
         document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
+        document.getElementById(el_id).appendChild(respond);
+        //입력값 초기화
+        document.getElementById('wr_content').value = '';
+        
         // 댓글 수정
         if (work == 'cu')
         {

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

@@ -55,7 +55,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     ?>
 
     <?php if ($is_category) { ?>
-    <div class="bo_w_select">
+    <div class="bo_w_select write_div">
         <label for="ca_name"  class="sound_only">분류<strong>필수</strong></label>
         <select name="ca_name" id="ca_name" required>
             <option value="">분류를 선택하세요</option>
@@ -65,7 +65,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php } ?>
 
 
-    <div class="bo_w_info">
+    <div class="bo_w_info write_div">
     <?php if ($is_name) { ?>
         <label for="wr_name" class="sound_only">이름<strong>필수</strong></label>
         <input type="text" name="wr_name" value="<?php echo $name ?>" id="wr_name" required class="frm_input required" placeholder="이름">
@@ -83,23 +83,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
 
     <?php if ($is_homepage) { ?>
-    <div>
+    <div class="write_div">
         <label for="wr_homepage" class="sound_only">홈페이지</label>
         <input type="text" name="wr_homepage" value="<?php echo $homepage ?>" id="wr_homepage" class="frm_input full_input" size="50" placeholder="홈페이지">
     </div>
     <?php } ?>
 
     <?php if ($option) { ?>
-    <div>
+    <div class="write_div">
         <span class="sound_only">옵션</span>
         <?php echo $option ?>
     </div>
     <?php } ?>
 
-    <div class="bo_w_tit">
+    <div class="bo_w_tit write_div">
         <label for="wr_subject" class="sound_only">제목<strong>필수</strong></label>
         
-        <div id="autosave_wrapper">
+        <div id="autosave_wrapper write_div">
             <input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input full_input required" size="50" maxlength="255" placeholder="제목">
             <?php if ($is_member) { // 임시 저장된 글 기능 ?>
             <script src="<?php echo G5_JS_URL; ?>/autosave.js"></script>
@@ -115,7 +115,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         
     </div>
 
-    <div>
+    <div class="write_div">
         <label for="wr_content" class="sound_only">내용<strong>필수</strong></label>
         <div class="wr_content <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
             <?php if($write_min || $write_max) { ?>
@@ -133,15 +133,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
-    <div class="bo_w_link">
+    <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
         <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 
     <?php for ($i=0; $is_file && $i<$file_count; $i++) { ?>
-    <div class="bo_w_flie">
-        <div class="file_wr">
+    <div class="bo_w_flie write_div">
+        <div class="file_wr write_div">
             <label for="bf_file_<?php echo $i+1 ?>" class="lb_icon"><i class="fa fa-download" aria-hidden="true"></i><span class="sound_only"> 파일 #<?php echo $i+1 ?></span></label>
             <input type="file" name="bf_file[]" id="bf_file_<?php echo $i+1 ?>" title="파일첨부 <?php echo $i+1 ?> : 용량 <?php echo $upload_max_filesize ?> 이하만 업로드 가능" class="frm_file ">
         </div>
@@ -160,13 +160,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
 
     <?php if ($is_use_captcha) { //자동등록방지  ?>
-    <div>
+    <div class="write_div">
         <?php echo $captcha_html ?>
     </div>
     <?php } ?>
 
 
-    <div class="btn_confirm">
+    <div class="btn_confirm write_div">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel btn">취소</a>
         <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit btn">
     </div>

theme/basic/skin/member/basic/memo.skin.php

@@ -32,6 +32,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             </ul>
         </div>
 
+        <!-- 페이지 -->
+        <?php echo $write_pages; ?>
+
         <p class="win_desc">
             쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
         </p>

theme/basic/skin/member/basic/memo_view.skin.php

@@ -54,7 +54,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <a href="<?php echo $next_link ?>" class="btn btn_b01">다음쪽지 <i class="fa fa-angle-right" aria-hidden="true"></i></a>
             <?php }  ?>
 
-            <a href="./memo.php?kind=<?php echo $kind ?>" class="btn btn_b01"><i class="fa fa-list" aria-hidden="true"></i> 목록</a>
+            <a href="<?php echo $list_link ?>" class="btn btn_b01"><i class="fa fa-list" aria-hidden="true"></i> 목록</a>
             <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
             <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn btn_b02">답장</a><?php }  ?>
         </div>

theme/basic/skin/member/basic/register_form.skin.php

@@ -177,7 +177,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_icon_width'] ?>픽셀, 세로 <?php echo $config['cf_member_icon_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
@@ -196,7 +196,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                                 
                 <span class="frm_info">
                     이미지 크기는 가로 <?php echo $config['cf_member_img_width'] ?>픽셀, 세로 <?php echo $config['cf_member_img_height'] ?>픽셀 이하로 해주세요.<br>
-                    gif 또는 jpg만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
+                    gif, jpg, png파일만 가능하며 용량 <?php echo number_format($config['cf_member_img_size']) ?>바이트 이하만 등록됩니다.
                 </span>
 
                 <?php if ($w == 'u' && file_exists($mb_img_path)) {  ?>
@@ -417,14 +417,24 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
         if (typeof f.mb_icon != "undefined") {
             if (f.mb_icon.value) {
-                if (!f.mb_icon.value.toLowerCase().match(/.(gif)$/i)) {
-                    alert("회원아이콘이 gif 파일이 아닙니다.");
+                if (!f.mb_icon.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원아이콘이 이미지 파일이 아닙니다.");
                     f.mb_icon.focus();
                     return false;
                 }
             }
         }
 
+        if (typeof f.mb_img != "undefined") {
+            if (f.mb_img.value) {
+                if (!f.mb_img.value.toLowerCase().match(/.(gif|jpe?g|png)$/i)) {
+                    alert("회원이미지가 이미지 파일이 아닙니다.");
+                    f.mb_img.focus();
+                    return false;
+                }
+            }
+        }
+
         if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
             if (f.mb_id.value == f.mb_recommend.value) {
                 alert("본인을 추천할 수 없습니다.");