g5 merge 충돌수정

2014-01-03 14:35:35 +09:00
parent 5afc9eab34 b2251d9ea8
commit f26b0c838b
23 changed files with 101 additions and 61 deletions
--- a/adm/board_form.php
+++ b/adm/board_form.php
@ -154,6 +154,13 @@ $pg_anchor = '<ul class="anchor">
    <li><a href="#anc_bo_point">포인트 설정</a></li>
    <li><a href="#anc_bo_extra">여분필드</a></li>
 </ul>';
+
+$frm_submit = '<div class="btn_confirm01 btn_confirm">
+    <input type="submit" value="확인" class="btn_submit" accesskey="s">
+    <a href="./board_list.php?'.$qstr.'">목록</a>'.PHP_EOL;
+if ($w == 'u') $frm_submit .= '    <a href="./board_copy.php?bo_table='.$bo_table.'" id="board_copy" target="win_board_copy">게시판복사</a>
+    <a href="'.G5_BBS_URL.'/board.php?bo_table='.$board['bo_table'].'" class="btn_frmline">게시판 바로가기</a>'.PHP_EOL;
+$frm_submit .= '</div>';
 ?>

 <form name="fboardform" id="fboardform" action="./board_form_update.php" onsubmit="return fboardform_submit(this)" method="post" enctype="multipart/form-data">
@ -255,6 +262,8 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_bo_auth">
    <h2 class="h2_frm">게시판 권한 설정</h2>
    <?php echo $pg_anchor ?>
@ -394,6 +403,8 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_bo_function">
    <h2 class="h2_frm">게시판 기능 설정</h2>
    <?php echo $pg_anchor ?>
@ -787,6 +798,8 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_bo_design">
    <h2 class="h2_frm">게시판 디자인/양식</h2>
    <?php echo $pg_anchor ?>
@ -1128,6 +1141,8 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_bo_point">
    <h2 class="h2_frm">게시판 포인트 설정</h2>
    <?php echo $pg_anchor ?>
@ -1201,6 +1216,8 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_bo_extra">
    <h2 class="h2_frm">게시판 여분필드 설정</h2>
    <?php echo $pg_anchor ?>
@ -1236,11 +1253,7 @@ $pg_anchor = '<ul class="anchor">
    </div>
 </section>

-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-    <a href="./board_list.php?<?php echo $qstr ?>">목록</a>
-    <?php if ($w == 'u') { ?><a href="./board_copy.php?bo_table=<?php echo $bo_table ?>" id="board_copy" target="win_board_copy">게시판복사</a><?php } ?>
-</div>
+<?php echo $frm_submit; ?>

 </form>

--- a/adm/board_list_delete.php
+++ b/adm/board_list_delete.php
@ -1,28 +0,0 @@
-<?
-$sub_menu = "300100";
-include_once("./_common.php");
-
-check_demo();
-
-if ($is_admin != "super")
-    alert("게시판 삭제는 최고관리자만 가능합니다.");
-
-auth_check($auth[$sub_menu], "d");
-
-check_token();
-
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define("_BOARD_DELETE_", TRUE);
-
-for ($i=0; $i<count($chk); $i++) 
-{
-    // 실제 번호를 넘김
-    $k = $chk[$i];
-
-    // include 전에 $bo_table 값을 반드시 넘겨야 함
-    $tmp_bo_table = mysql_real_escape_string(trim($_POST['board_table'][$k]));
-    include ("./board_delete.inc.php");
-}
-
-goto_url("./board_list.php?$qstr");
-?>
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -147,6 +147,11 @@ $pg_anchor = '<ul class="anchor">
    <li><a href="#anc_cf_extra">여분필드</a></li>
 </ul>';

+$frm_submit = '<div class="btn_confirm01 btn_confirm">
+    <input type="submit" value="확인" class="btn_submit" accesskey="s">
+    <a href="'.G5_URL.'/">메인으로</a>
+</div>';
+
 if (!$config['cf_icode_server_ip'])   $config['cf_icode_server_ip'] = '211.172.232.124';
 if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';

@ -418,6 +423,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_board">
    <h2 class="h2_frm">게시판 기본 설정</h2>
    <?php echo $pg_anchor ?>
@ -498,6 +505,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_join">
    <h2 class="h2_frm">회원가입 설정</h2>
    <?php echo $pg_anchor ?>
@ -643,6 +652,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_cert">
    <h2 class="h2_frm">본인확인 설정</h2>
    <?php echo $pg_anchor ?>
@ -719,6 +730,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_mail">
    <h2 class="h2_frm">기본 메일 환경 설정</h2>
    <?php echo $pg_anchor ?>
@ -756,6 +769,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_article_mail">
    <h2 class="h2_frm">게시판 글 작성 시 메일 설정</h2>
    <?php echo $pg_anchor ?>
@ -808,6 +823,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_join_mail">
    <h2 class="h2_frm">회원가입 시 메일 설정</h2>
    <?php echo $pg_anchor ?>
@ -839,6 +856,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>

 <section id="anc_cf_vote_mail">
    <h2 class="h2_frm">투표 기타의견 작성 시 메일 설정</h2>
@ -864,6 +882,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_sns">
    <h2 class="h2_frm">소셜네트워크서비스(SNS : Social Network Service)</h2>
    <?php echo $pg_anchor ?>
@ -909,6 +929,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_lay">
    <h2 class="h2_frm">레이아웃 추가설정</h2>
    <?php echo $pg_anchor; ?>
@ -957,6 +979,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_sms">
    <h2 class="h2_frm">SMS</h2>
    <?php echo $pg_anchor ?>
@ -1037,6 +1061,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

+<?php echo $frm_submit; ?>
+
 <section id="anc_cf_extra">
    <h2 class="h2_frm">여분필드 기본 설정</h2>
    <?php echo $pg_anchor ?>
@ -1068,9 +1094,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
    </div>
 </section>

-<div class="btn_confirm01 btn_confirm">
-    <input type="submit" value="확인" class="btn_submit" accesskey="s">
-</div>
+<?php echo $frm_submit; ?>

 </form>

--- a/adm/member_form.php
+++ b/adm/member_form.php
@ -205,9 +205,10 @@ include_once('./admin.head.php');
        <td colspan="3" style="line-height:2em">
            <input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" title="우편번호 앞자리" class="frm_input readonly" size="3" maxlength="3"> -
            <input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" title="우편번호 뒷자리" 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_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
-            <input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="70"><br>
+            <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>
+            <input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="40"> <span id="mb_addr3"></span><br>
            <input type="text" name="mb_addr2" value="<?php echo $mb['mb_addr2'] ?>" id="mb_addr2" title="상세주소" class="frm_input" size="70">
+            <input type="hidden" name="mb_addr3" value="">
            <input type="hidden" name="mb_addr_jibeon" value="<?php echo $mb['mb_addr_jibeon']; ?>"><br>
            <span id="mb_addr_jibeon">지번주소 : <?php echo $mb['mb_addr_jibeon']; ?></span>
        </td>
--- a/adm/member_form_update.php
+++ b/adm/member_form_update.php
@ -29,6 +29,8 @@ if($_POST['mb_certify_case'] && $_POST['mb_certify']) {
    $mb_adult = 0;
 }

+$mb_addr2 = get_address2($_POST['mb_addr2'], $_POST['mb_addr3']);
+
 $sql_common = "  mb_name = '{$_POST['mb_name']}',
                 mb_nick = '{$_POST['mb_nick']}',
                 mb_email = '{$_POST['mb_email']}',
@ -40,7 +42,7 @@ $sql_common = "  mb_name = '{$_POST['mb_name']}',
                 mb_zip1 = '{$_POST['mb_zip1']}',
                 mb_zip2 = '{$_POST['mb_zip2']}',
                 mb_addr1 = '{$_POST['mb_addr1']}',
-                 mb_addr2 = '{$_POST['mb_addr2']}',
+                 mb_addr2 = '{$mb_addr2}',
                 mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}',
                 mb_birth = '{$_POST['mb_birth']}',
                 mb_sex = '{$_POST['mb_sex']}',