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

adm/sms_admin/history_send.php

@@ -116,7 +116,9 @@ if ($result)
             $row['bk_hp'] = get_hp($row['bk_hp'], 1);
 
             $log = array_shift($SMS->Log);
-            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'");
+            $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log);
+
+            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
         }
         $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
 

adm/sms_admin/history_view.php

@@ -143,13 +143,18 @@ function all_send()
     if( $write['wr_memo'] ){
         $tmp_wr_memo = @unserialize($write['wr_memo']);
         if( count($tmp_wr_memo) && is_array($tmp_wr_memo) ){
-        $arr_wr_memo = array_count_values( $tmp_wr_memo['hp'] );
+            if(function_exists('array_fill_keys')){
+                $tmp_wr_hp = array_replace($tmp_wr_memo['hp'],array_fill_keys(array_keys($tmp_wr_memo['hp'], null),''));
+            } else {
+                $tmp_wr_hp = $tmp_wr_memo['hp'];
+            }
+            $arr_wr_memo = @array_count_values( $tmp_wr_hp );
     ?>
     <h2>중복번호 <?php echo $tmp_wr_memo['total'];?>건</h2>
     <ul id="sent_overlap">
         <?php
         foreach( $arr_wr_memo as $key=>$v){
-        if( empty($v) ) continue;
+        if( empty($v) || $key == '' ) continue;
         ?>
         <li><b><?php echo $key;?></b> 중복 <?php echo $v;?>건</li>
         <?php } ?>

adm/sms_admin/sms_write_send.php

@@ -199,8 +199,9 @@ if ($result)
             $row['bk_hp'] = get_hp($row['bk_hp'], 1);
 
             $log = array_shift($SMS->Log);
+            $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log);
 
-            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'");
+            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
         }
         $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
 

bbs/formmail_send.php

@@ -20,6 +20,7 @@ if (!chk_captcha()) {
 }
 
 
+$file = array();
 for ($i=1; $i<=$attach; $i++) {
     if ($_FILES['file'.$i]['name'])
         $file[] = attach_file($_FILES['file'.$i]['name'], $_FILES['file'.$i]['tmp_name']);
@@ -41,6 +42,13 @@ else
 
 mailer($fnick, $fmail, $to, $subject, $mail_content, $type, $file);
 
+// 임시 첨부파일 삭제
+if(!empty($file)) {
+    foreach($file as $f) {
+        @unlink($f['path']);
+    }
+}
+
 //$html_title = $tmp_to . "님께 메일발송";
 $html_title = '메일 발송중';
 include_once(G5_PATH.'/head.sub.php');

bbs/search.php

@@ -72,6 +72,10 @@ if ($stx) {
         if (trim($s[$i]) == '') continue;
 
         $search_str = $s[$i];
+
+        // 인기검색어
+        insert_popular($field, $search_str);
+
         $str .= $op1;
         $str .= "(";
 
@@ -100,10 +104,6 @@ if ($stx) {
         $str .= ")";
 
         $op1 = " {$sop} ";
-
-        // 인기검색어
-        $sql = " insert into {$g5['popular_table']} set pp_word = '{$search_str}', pp_date = '".G5_TIME_YMD."', pp_ip = '{$_SERVER['REMOTE_ADDR']}' ";
-        sql_query($sql, FALSE);
     }
     $str .= ")";
 

common.php

@@ -218,14 +218,38 @@ if ($config['cf_editor'])
 else
     define('G5_EDITOR_LIB', G5_LIB_PATH."/editor.lib.php");
 
+//==============================================================================
+// 사용기기 설정
+// config.php G5_SET_DEVICE 설정에 따라 사용자 화면 제한됨
+// pc 설정 시 모바일 기기에서도 PC화면 보여짐
+// mobile 설정 시 PC에서도 모바일화면 보여짐
+// both 설정 시 접속 기기에 따른 화면 보여짐
+//------------------------------------------------------------------------------
+$is_mobile = false;
+$set_device = true;
+if(defined('G5_SET_DEVICE')) {
+    switch(G5_SET_DEVICE) {
+        case 'pc':
+            $is_mobile  = false;
+            $set_device = false;
+            break;
+        case 'mobile':
+            $is_mobile  = true;
+            $set_device = false;
+            break;
+        default:
+            break;
+    }
+}
+//==============================================================================
+
 //==============================================================================
 // Mobile 모바일 설정
 // 쿠키에 저장된 값이 모바일이라면 브라우저 상관없이 모바일로 실행
 // 그렇지 않다면 브라우저의 HTTP_USER_AGENT 에 따라 모바일 결정
 // G5_MOBILE_AGENT : config.php 에서 선언
 //------------------------------------------------------------------------------
-$is_mobile = false;
+if (G5_USE_MOBILE && $set_device) {
-if (G5_USE_MOBILE) {
     if ($_REQUEST['device']=='pc')
         $is_mobile = false;
     else if ($_REQUEST['device']=='mobile')
@@ -234,10 +258,13 @@ if (G5_USE_MOBILE) {
         $is_mobile = $_SESSION['ss_is_mobile'];
     else if (is_mobile())
         $is_mobile = true;
+} else {
+    $set_device = false;
 }
 
 $_SESSION['ss_is_mobile'] = $is_mobile;
 define('G5_IS_MOBILE', $is_mobile);
+define('G5_DEVICE_BUTTON_DISPLAY', $set_device);
 if (G5_IS_MOBILE) {
     include_once(G5_LIB_PATH.'/mobile.lib.php'); // 모바일 전용 라이브러리
     $g5['mobile_path'] = G5_PATH.'/'.$g5['mobile_dir'];

config.php

@@ -115,6 +115,14 @@ define('G5_PHPMAILER_PATH', G5_PLUGIN_PATH.'/'.G5_PHPMAILER_DIR);
 //==============================================================================
 
 
+//==============================================================================
+// 사용기기 설정
+// pc 설정 시 모바일 기기에서도 PC화면 보여짐
+// mobile 설정 시 PC에서도 모바일화면 보여짐
+// both 설정 시 접속 기기에 따른 화면 보여짐
+//------------------------------------------------------------------------------
+define('G5_SET_DEVICE', 'both');
+
 define('G5_USE_MOBILE', true); // 모바일 홈페이지를 사용하지 않을 경우 false 로 설정
 define('G5_USE_CACHE',  true); // 최신글등에 cache 기능 사용 여부
 

js/autosave.js

@@ -26,7 +26,7 @@ function autosave() {
                 type: "POST",
                 success: function(data){
                     if (data) {
-                        $("#autosave_count").html(data);    
+                        $("#autosave_count").html(data);
                     }
                 }
             });
@@ -50,14 +50,15 @@ $(function(){
                 //console.log( "Data: " + data);
                 $("#autosave_pop ul").empty();
                 if ($(data).find("list").find("item").length > 0) {
-                    $(data).find("list").find("item").each(function(i) { 
+                    $(data).find("list").find("item").each(function(i) {
                         var id = $(this).find("id").text();
                         var uid = $(this).find("uid").text();
                         var subject = $(this).find("subject").text();
                         var datetime = $(this).find("datetime").text();
-                        $("#autosave_pop ul").append('<li><a href="#none" class="autosave_load">'+subject+'</a><span>'+datetime+' <button type="button" class="autosave_del">삭제</button></span></li>');
+                        $("#autosave_pop ul")
-                        $.data(document.body, "autosave_id"+i, id);
+                            .append('<li><a href="#none" class="autosave_load">'+subject+'</a><span>'+datetime+' <button type="button" class="autosave_del">삭제</button></span></li>')
-                        $.data(document.body, "autosave_uid"+i, uid);
+                            .find("li:eq("+i+")")
+                            .data({ as_id: id, uid: uid });
                     });
                 }
             }, "xml");
@@ -69,9 +70,9 @@ $(function(){
 
     // 임시저장된 글 제목과 내용을 가져와서 제목과 내용 입력박스에 노출해 줌
     $(".autosave_load").live("click", function(){
-        var i = $(this).parents("li").index();
+        var $li = $(this).parents("li");
-        var as_id = $.data(document.body, "autosave_id"+i);
+        var as_id = $li.data("as_id");
-        var as_uid = $.data(document.body, "autosave_uid"+i);
+        var as_uid = $li.data("uid");
         $("#fwrite input[name='uid']").val(as_uid);
         $.get(g5_bbs_url+"/ajax.autosaveload.php", {"as_id":as_id}, function(data){
             var subject = $(data).find("item").find("subject").text();
@@ -83,7 +84,7 @@ $(function(){
                 ed_wr_content.putContents(content);
             } else if (g5_editor.indexOf("smarteditor2") != -1 && typeof(oEditors.getById['wr_content'])!="undefined" ) {
                 oEditors.getById["wr_content"].exec("SET_CONTENTS", [""]);
-                //oEditors.getById["wr_content"].exec("SET_IR", [""]); 
+                //oEditors.getById["wr_content"].exec("SET_IR", [""]);
                 oEditors.getById["wr_content"].exec("PASTE_HTML", [content]);
             } else {
                 $("#fwrite #wr_content").val(content);
@@ -93,14 +94,14 @@ $(function(){
     });
 
     $(".autosave_del").live("click", function(){
-        var i = $(this).parents("li").index();
+        var $li = $(this).parents("li");
-        var as_id = $.data(document.body, "autosave_id"+i);
+        var as_id = $li.data("as_id");
-        $.get(g5_bbs_url+"/ajax.autosavedel.php", {"as_id":as_id}, function(data){ 
+        $.get(g5_bbs_url+"/ajax.autosavedel.php", {"as_id":as_id}, function(data){
             if (data == -1) {
                 alert("임시 저장된글을 삭제중에 오류가 발생하였습니다.");
             } else {
-                $("#autosave_count").html(data);    
+                $("#autosave_count").html(data);
-                $("#autosave_pop ul > li").eq(i).remove();
+                $li.remove();
             }
         });
     });

lib/common.lib.php

@@ -616,8 +616,7 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op
         if ($search_str == "") continue;
 
         // 인기검색어
-        $sql = " insert into {$g5['popular_table']} set pp_word = '$search_str', pp_date = '".G5_TIME_YMD."', pp_ip = '{$_SERVER['REMOTE_ADDR']}' ";
+        insert_popular($field, $search_str);
-        sql_query($sql, FALSE);
 
         $str .= $op1;
         $str .= "(";
@@ -2813,4 +2812,15 @@ function get_icode_userinfo($id, $pass)
 
     return $userinfo;
 }
+
+// 인기검색어 입력
+function insert_popular($field, $str)
+{
+    global $g5;
+
+    if(!in_array('mb_id', $field)) {
+        $sql = " insert into {$g5['popular_table']} set pp_word = '{$str}', pp_date = '".G5_TIME_YMD."', pp_ip = '{$_SERVER['REMOTE_ADDR']}' ";
+        sql_query($sql, FALSE);
+    }
+}
 ?>

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

@@ -187,7 +187,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                     gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
                 </span>
                 <input type="file" name="mb_icon" id="reg_mb_icon" class="frm_input">
-                <?php if ($w == 'u' && file_exists($mb_icon)) { ?>
+                <?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
                 <img src="<?php echo $mb_icon_url ?>" alt="회원아이콘">
                 <input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
                 <label for="del_mb_icon">삭제</label>

mobile/tail.php

@@ -25,7 +25,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 </div>
 
 <?php
-if(G5_USE_MOBILE && G5_IS_MOBILE) {
+if(G5_DEVICE_BUTTON_DISPLAY && G5_IS_MOBILE) {
     $seq = 0;
     $p = parse_url(G5_URL);
     $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF'];

plugin/editor/smarteditor2/license.txt

@@ -0,0 +1,16 @@
+SmartEditor2 is web based Javascript HTML WYSIWYG Editor released as Open Source under LGPL
+Copyright (C) 2008-2014 NAVER Corp.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

tail.php

@@ -40,7 +40,7 @@ if (G5_IS_MOBILE) {
 </div>
 
 <?php
-if(G5_USE_MOBILE && !G5_IS_MOBILE) {
+if(G5_DEVICE_BUTTON_DISPLAY && !G5_IS_MOBILE) {
     $seq = 0;
     $p = parse_url(G5_URL);
     $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF'];