기능개선 및 라이센스 기타오류 수정

gnuboard · Sep 16, 2014 · 4c083b6 · 4c083b6
1 parent 916cd86
commit 4c083b6
Show file tree

Hide file tree

Showing 12 changed files with 242 additions and 221 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/adm/member_form.php b/adm/member_form.php
@@ -218,7 +218,7 @@
             <input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" class="frm_input readonly" size="3" maxlength="3"> -
             <label for="mb_zip2" class="sound_only">우편번호 뒷자리</label>
             <input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" class="frm_input readonly" size="3" maxlength="3">
-            <a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
+            <button type="button" class="btn_frmline" onclick="win_zip('fmember', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2', 'mb_addr3', 'mb_addr_jibeon');">주소 검색</button><br>
             <input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" class="frm_input readonly" size="60">
             <label for="mb_addr1">기본주소</label><br>
             <input type="text" name="mb_addr2" value="<?php echo $mb['mb_addr2'] ?>" id="mb_addr2" class="frm_input" size="60">

diff --git a/bbs/list.php b/bbs/list.php
@@ -195,16 +195,20 @@
 if ($sca || $stx) {
     $list_href = './board.php?bo_table='.$bo_table;
 
+    $patterns = array('#&amp;page=[0-9]*#', '#&amp;spt=[0-9\-]*#');
+
     //if ($prev_spt >= $min_spt)
     $prev_spt = $spt - $config['cf_search_part'];
     if (isset($min_spt) && $prev_spt >= $min_spt) {
-        $prev_part_href = './board.php?bo_table='.$bo_table.$qstr.'&amp;spt='.$prev_spt.'&amp;page=1';
+        $qstr1 = preg_replace($patterns, '', $qstr);
+        $prev_part_href = './board.php?bo_table='.$bo_table.$qstr1.'&amp;spt='.$prev_spt.'&amp;page=1';
         $write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_prev">이전검색</a>');
     }
 
     $next_spt = $spt + $config['cf_search_part'];
     if ($next_spt < 0) {
-        $next_part_href = './board.php?bo_table='.$bo_table.$qstr.'&amp;spt='.$next_spt.'&amp;page=1';
+        $qstr1 = preg_replace($patterns, '', $qstr);
+        $next_part_href = './board.php?bo_table='.$bo_table.$qstr1.'&amp;spt='.$next_spt.'&amp;page=1';
         $write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_end">다음검색</a>');
     }
 }

diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php
@@ -33,7 +33,7 @@
 $mb_lost_certify = sql_password($change_password);
 
 // 어떠한 회원정보도 포함되지 않은 일회용 난수를 생성하여 인증에 사용
-$mb_nonce = bin2hex(pack('V*', rand(), rand(), rand(), rand()));
+$mb_nonce = md5(pack('V*', rand(), rand(), rand(), rand()));
 
 // 임시비밀번호와 난수를 mb_lost_certify 필드에 저장
 $sql = " update {$g5['member_table']} set mb_lost_certify = '$mb_nonce $mb_lost_certify' where mb_id = '{$mb['mb_id']}' ";

diff --git a/bbs/sns_send.php b/bbs/sns_send.php
@@ -3,6 +3,8 @@
 
 $title    =  urlencode(str_replace('\"', '"',$_REQUEST['title']));
 $short_url = googl_short_url($_REQUEST['longurl']);
+if(!$short_url)
+    $short_url = urlencode($_REQUEST['longurl']);
 $title_url = $title.' : '.$short_url;
 
 switch($_REQUEST['sns']) {

diff --git a/js/common.js b/js/common.js
@@ -376,36 +376,17 @@ var win_homepage = function(href) {
 /**
  * 우편번호 창
  **/
-var win_zip = function(href) {
+var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_addr3, frm_jibeon) {
     if(typeof daum === 'undefined'){
         alert("다음 juso.js 파일이 로드되지 않았습니다.");
         return false;
     }
 
-    var url_to_array = function(url) {
-        var request = [];
-        var pairs = url.substring(url.indexOf('?') + 1).split('&');
-        for (var i = 0; i < pairs.length; i++) {
-            var pair = pairs[i].split('=');
-            request[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
-        }
-        return request;
-    }
-
-    var param = url_to_array(href),
-        frm_name = param['frm_name'],
-        frm_addr1 = param['frm_addr1'],
-        frm_addr2 = param['frm_addr2'],
-        frm_addr3 = param['frm_addr3'],
-        frm_zip1 = param['frm_zip1'],
-        frm_zip2 = param['frm_zip2'],
-        frm_jibeon = param['frm_jibeon'],
-        of = document[frm_name];
-
     new daum.Postcode({
         oncomplete: function(data) {
             // 팝업에서 검색결과 항목을 클릭했을때 실행할 코드를 작성하는 부분.
             // 우편번호와 주소 정보를 해당 필드에 넣고, 커서를 상세주소 필드로 이동한다.
+            var of = document[frm_name];
             of[frm_zip1].value = data.postcode1;
             of[frm_zip2].value = data.postcode2;
             of[frm_addr1].value = data.address1;
@@ -428,7 +409,7 @@ var win_zip = function(href) {
  * sms5 창
  **/
 var win_sms5 = function(href) {
-    var new_win = window.open(href, 'win_zip', 'width=474, height=560, scrollbars=1');
+    var new_win = window.open(href, 'win_sms5', 'width=474, height=560, scrollbars=1');
     new_win.focus();
 }
 
@@ -506,12 +487,6 @@ $(function(){
         return false;
     });
 
-    $(".win_zip_find").click(function(e) {
-        e.preventDefault();
-        win_zip(this.href);
-        return false;
-    });
-
     $(".win_password_lost").click(function() {
         win_password_lost(this.href);
         return false;

diff --git a/lib/common.lib.php b/lib/common.lib.php
@@ -54,21 +54,27 @@ function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
         return "";
 }
 
-// 페이징 코드의 <div><span> 태그 다음에 코드를 삽입
+// 페이징 코드의 <nav><span> 태그 다음에 코드를 삽입
 function page_insertbefore($paging_html, $insert_html)
 {
-    if ($paging_html) {
-        return preg_replace("/^(<div[^>]+><span[^>]+>)/", '$1'.$insert_html, $paging_html);
-    }
+    if(!$paging_html)
+        $paging_html = '<nav class="pg_wrap"><span class="pg"></span></nav>';
+
+    return preg_replace("/^(<nav[^>]+><span[^>]+>)/", '$1'.$insert_html.PHP_EOL, $paging_html);
 }
 
-// 페이징 코드의 </span></div> 태그 이전에 코드를 삽입
+// 페이징 코드의 </span></nav> 태그 이전에 코드를 삽입
 function page_insertafter($paging_html, $insert_html)
 {
-    if ($paging_html) {
-        //return preg_replace("/(<\/span><\/div>)$/", $insert_html.'$1', $paging_html);
-        return preg_replace("#(</span></div>)$#", $insert_html.'$1', $paging_html);
-    }
+    if(!$paging_html)
+        $paging_html = '<nav class="pg_wrap"><span class="pg"></span></nav>';
+
+    if(preg_match("#".PHP_EOL."</span></nav>#", $paging_html))
+        $php_eol = '';
+    else
+        $php_eol = PHP_EOL;
+
+    return preg_replace("#(</span></nav>)$#", $php_eol.$insert_html.'$1', $paging_html);
 }
 
 // 변수 또는 배열의 이름과 값을 얻어냄. print_r() 함수의 변형

diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php
@@ -146,7 +146,7 @@
                 -
                 <label for="reg_mb_zip2" class="sound_only">우편번호 뒷자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
                 <input type="text" name="mb_zip2" value="<?php echo $member['mb_zip2'] ?>" id="reg_mb_zip2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input <?php echo $config['cf_req_addr']?"required":""; ?>" size="3" maxlength="3">
-                <a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>
+                <button type="button" class="btn_frmline" onclick="win_zip('fregisterform', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2', 'mb_addr3', 'mb_addr_jibeon');">주소 검색</button><br>
                 <label for="reg_mb_addr1" class="sound_only">주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
                 <input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50"><br>
                 <label for="reg_mb_addr2" class="sound_only">상세주소</label>

diff --git a/mobile/skin/member/basic/register_result.skin.php b/mobile/skin/member/basic/register_result.skin.php
@@ -29,7 +29,7 @@
 
     <p>
         회원님의 비밀번호는 아무도 알 수 없는 암호화 코드로 저장되므로 안심하셔도 좋습니다.<br>
-        아이디, 비밀번호 분실시에는 회원가입시 입력하신 비밀번호 분실시 질문, 답변을 이용하여 찾을 수 있습니다.
+        아이디, 비밀번호 분실시에는 회원가입시 입력하신 이메일 주소를 이용하여 찾을 수 있습니다.
     </p>
 
     <p>

diff --git a/plugin/jquery-ui/datepicker.php b/plugin/jquery-ui/datepicker.php
@@ -1,11 +1,11 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-add_stylesheet('<link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />', 0);
+add_stylesheet('<link type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />', 0);
 add_stylesheet('<link type="text/css" href="'.G5_PLUGIN_URL.'/jquery-ui/style.css">', 0);
 ?>
 
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
+<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
 <script>
 jQuery(function($){
     $.datepicker.regional["ko"] = {

diff --git a/plugin/syndi/ping.php b/plugin/syndi/ping.php
@@ -1,19 +1,19 @@
-<?
+<?php
 include_once("./_common.php");
 
-if (!$write) 
+if (!$write)
     die("게시글이 없습니다.");
 
-if ($group['gr_use_access']) 
+if ($group['gr_use_access'])
     die("게시판그룹에서 접근사용을 해제하여 주십시오.");
 
-if ($board['bo_read_level'] > 1) 
+if ($board['bo_read_level'] > 1)
     die("비회원 읽기가 가능한 게시판만 신디케이션을 지원합니다.");
 
-if (strstr($write['wr_option'], 'secret')) 
+if (strstr($write['wr_option'], 'secret'))
     die("비밀글은 신디케이션을 지원하지 않습니다.");
 
-if (preg_match('#^('.$config['cf_syndi_except'].')$#', $bo_table)) 
+if (preg_match('#^('.$config['cf_syndi_except'].')$#', $bo_table))
     die("신디케이션에서 제외된 게시판입니다.");
 
 $title        = htmlspecialchars($write['wr_subject']);
@@ -32,9 +32,9 @@
 $content      = str_replace( $find, $replace, $write['wr_content'] );
 $summary      = str_replace( $find, $replace, strip_tags($write['wr_content']) );
 
-Header("Content-type: text/xml"); 
-header("Cache-Control: no-cache, must-revalidate"); 
-header("Pragma: no-cache"); 
+Header("Content-type: text/xml");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
 
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
 echo "<feed xmlns=\"http://webmastertool.naver.com\">\n";

diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
@@ -151,7 +151,7 @@
                 -
                 <label for="reg_mb_zip2" class="sound_only">우편번호 뒷자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
                 <input type="text" name="mb_zip2" value="<?php echo $member['mb_zip2'] ?>" id="reg_mb_zip2" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input <?php echo $config['cf_req_addr']?"required":""; ?>" size="3" maxlength="3">
-                <a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>
+                <button type="button" class="btn_frmline" onclick="win_zip('fregisterform', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2', 'mb_addr3', 'mb_addr_jibeon');">주소 검색</button><br>
                 <input type="text" name="mb_addr1" value="<?php echo $member['mb_addr1'] ?>" id="reg_mb_addr1" <?php echo $config['cf_req_addr']?"required":""; ?> class="frm_input frm_address <?php echo $config['cf_req_addr']?"required":""; ?>" size="50">
                 <label for="reg_mb_addr1">기본주소<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label><br>
                 <input type="text" name="mb_addr2" value="<?php echo $member['mb_addr2'] ?>" id="reg_mb_addr2" class="frm_input frm_address" size="50">