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

2017-12-04 16:52:47 +09:00
parent 91af15ab81 5a424d5977
commit b410204ed7
13 changed files with 79 additions and 43 deletions
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@ -176,7 +176,7 @@ function get_theme_config_value($dir, $key='*')
    $tconfig = array();

    $theme_config_file = G5_PATH.'/'.G5_THEME_DIR.'/'.$dir.'/theme.config.php';
-    if(is_file) {
+    if(is_file($theme_config_file)) {
        include($theme_config_file);

        if($key == '*') {
--- a/adm/sendmail_test.php
+++ b/adm/sendmail_test.php
@ -13,26 +13,37 @@ $g5['title'] = '메일 테스트';
 include_once('./admin.head.php');

 if (isset($_POST['email'])) {
+    $_POST['email'] = strip_tags($_POST['email']);
    $email = explode(',', $_POST['email']);
-    for ($i=0; $i<count($email); $i++)
-        mailer($config['cf_admin_email_name'], $config['cf_admin_email'], trim($email[$i]), '[메일검사] 제목', '<span style="font-size:9pt;">[메일검사] 내용<p>이 내용이 제대로 보인다면 보내는 메일 서버에는 이상이 없는것입니다.<p>'.G5_TIME_YMDHIS.'<p>이 메일 주소로는 회신되지 않습니다.</span>', 1);

-    echo '<section>';
-    echo '<h2>결과메세지</h2>';
-    echo '<div class="local_desc01 local_desc"><p>';
-    echo '다음 '.count($email).'개의 메일 주소로 테스트 메일 발송이 완료되었습니다.';
-    echo '</p></div>';
-    echo '<ul>';
-    for ($i=0;$i<count($email);$i++) {
-        echo '<li>'.$email[$i].'</li>';
+    $real_email = array();
+
+    for ($i=0; $i<count($email); $i++){
+
+        if (!preg_match("/([0-9a-zA-Z_-]+)@([0-9a-zA-Z_-]+)\.([0-9a-zA-Z_-]+)/", $email[$i])) continue;
+        
+        $real_email[] = $email[$i];
+        mailer($config['cf_admin_email_name'], $config['cf_admin_email'], trim($email[$i]), '[메일검사] 제목', '<span style="font-size:9pt;">[메일검사] 내용<p>이 내용이 제대로 보인다면 보내는 메일 서버에는 이상이 없는것입니다.<p>'.G5_TIME_YMDHIS.'<p>이 메일 주소로는 회신되지 않습니다.</span>', 1);
+    }
+
+    if( $real_email ){
+        echo '<section>';
+        echo '<h2>결과메세지</h2>';
+        echo '<div class="local_desc01 local_desc"><p>';
+        echo '다음 '.count($real_email).'개의 메일 주소로 테스트 메일 발송이 완료되었습니다.';
+        echo '</p></div>';
+        echo '<ul>';
+        for ($i=0;$i<count($real_email);$i++) {
+            echo '<li>'.$real_email[$i].'</li>';
+        }
+        echo '</ul>';
+        echo '<div class="local_desc02 local_desc"><p>';
+        echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.<br>';
+        echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.<br>';
+        echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.<br>';
+        echo '</p></div>';
+        echo '</section>';
    }
-    echo '</ul>';
-    echo '<div class="local_desc02 local_desc"><p>';
-    echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.<br>';
-    echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.<br>';
-    echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.<br>';
-    echo '</p></div>';
-    echo '</section>';
 }
 ?>

--- a/bbs/group.php
+++ b/bbs/group.php
@ -28,9 +28,9 @@ include_once(G5_LIB_PATH.'/latest.lib.php');
 <?php
 //  최신글
 $sql = " select bo_table, bo_subject
-            from {$g5[board_table]}
+            from {$g5['board_table']}
            where gr_id = '{$gr_id}'
-              and bo_list_level <= '{$member[mb_level]}'
+              and bo_list_level <= '{$member['mb_level']}'
              and bo_device <> 'mobile' ";
 if(!$is_admin)
    $sql .= " and bo_use_cert = '' ";
--- a/common.php
+++ b/common.php
@ -139,7 +139,7 @@ if (file_exists($dbconfig_file)) {

    sql_set_charset('utf8', $connect_db);
    if(defined('G5_MYSQL_SET_MODE') && G5_MYSQL_SET_MODE) sql_query("SET SESSION sql_mode = ''");
-    if (defined(G5_TIMEZONE)) sql_query(" set time_zone = '".G5_TIMEZONE."'");
+    if (defined('G5_TIMEZONE')) sql_query(" set time_zone = '".G5_TIMEZONE."'");
 } else {
 ?>

@ -485,7 +485,7 @@ if(isset($config['cf_theme']) && trim($config['cf_theme'])) {


 // 테마 설정 로드
-if(is_file(G5_THEME_PATH.'/theme.config.php'))
+if(defined('G5_THEME_PATH') && is_file(G5_THEME_PATH.'/theme.config.php'))
    include_once(G5_THEME_PATH.'/theme.config.php');


--- a/g4_import_run.php
+++ b/g4_import_run.php
@ -382,6 +382,14 @@ document.onkeydown = noRefresh ;
            foreach($row as $key=>$val) {
                if(!in_array($key, $columns))
                    continue;
+                
+                if($key === 'bo_notice'){
+                    $val = str_replace("\n", ",", $val);
+
+                    if( substr($val, -1)  === ',' ){
+                        $val = substr($val, 0, -1);
+                    }
+                }

                $sql_common .= $comma . " $key = '".addslashes($val)."' ";

--- a/mobile/skin/popular/basic/popular.skin.php
+++ b/mobile/skin/popular/basic/popular.skin.php
@ -9,9 +9,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
    <div>
        <h2>인기검색어</h2>
        <ul>
-        <?php for ($i=0; $i<count($list); $i++) { ?>
+        <?php
+        if( isset($list) && is_array($list) ){
+            for ($i=0; $i<count($list); $i++) {
+        ?>
            <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
-        <?php } ?>
+            <?php
+            }   //end for
+        }   //end if
+        ?>
        </ul>
    </div>
 </aside>
--- a/plugin/editor/smarteditor2/photo_uploader/popup/index.html
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/index.html
@ -48,8 +48,8 @@
    </div>
 </div>

-<script src="./js/jquery-1.8.3.min.js"></script>
-<script src="./js/jquery-ui.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js"></script>
 <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
 <script src="./js/jquery.iframe-transport.js"></script>

--- a/plugin/editor/smarteditor2/photo_uploader/popup/js/jquery-1.8.3.min.js
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/js/jquery-1.8.3.min.js
--- a/plugin/editor/smarteditor2/photo_uploader/popup/js/jquery-ui.min.js
+++ b/plugin/editor/smarteditor2/photo_uploader/popup/js/jquery-ui.min.js
--- a/skin/popular/basic/popular.skin.php
+++ b/skin/popular/basic/popular.skin.php
@ -10,9 +10,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
    <div>
        <h2>인기검색어</h2>
        <ul>
-        <?php for ($i=0; $i<count($list); $i++) {  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
-        <?php }  ?>
+        <?php
+        if( isset($list) && is_array($list) ){
+            for ($i=0; $i<count($list); $i++) {
+            ?>
+                <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
+            <?php
+            }   //end for
+        }   //end if
+        ?>
        </ul>
    </div>
 </section>
--- a/theme/basic/group.php
+++ b/theme/basic/group.php
@ -19,9 +19,9 @@ include_once(G5_LIB_PATH.'/latest.lib.php');
 <?php
 //  최신글
 $sql = " select bo_table, bo_subject
-            from {$g5[board_table]}
+            from {$g5['board_table']}
            where gr_id = '{$gr_id}'
-              and bo_list_level <= '{$member[mb_level]}'
+              and bo_list_level <= '{$member['mb_level']}'
              and bo_device <> 'mobile' ";
 if(!$is_admin)
    $sql .= " and bo_use_cert = '' ";
--- a/theme/basic/mobile/skin/popular/basic/popular.skin.php
+++ b/theme/basic/mobile/skin/popular/basic/popular.skin.php
@ -9,9 +9,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
    <div>
        <h2>인기검색어</h2>
        <ul>
-        <?php for ($i=0; $i<count($list); $i++) { ?>
+        <?php
+        if( isset($list) && is_array($list) ){
+            for ($i=0; $i<count($list); $i++) {
+        ?>
            <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
-        <?php } ?>
+            <?php
+            }   //end for
+        }   //end if
+        ?>
        </ul>
    </div>
 </aside>
--- a/theme/basic/skin/popular/basic/popular.skin.php
+++ b/theme/basic/skin/popular/basic/popular.skin.php
@ -10,9 +10,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
    <div>
        <h2>인기검색어</h2>
        <ul>
-        <?php for ($i=0; $i<count($list); $i++) {  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
-        <?php }  ?>
+        <?php
+        if( isset($list) && is_array($list) ){
+            for ($i=0; $i<count($list); $i++) {
+            ?>
+                <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
+            <?php
+            }   //end for
+        }   //end if
+        ?>
        </ul>
    </div>
 </section>