Merge branch 'g5'

2014-03-17 18:11:37 +09:00
parent a40c7d7775 2e4aaf2f3b
commit 71afee7fbf
5 changed files with 44 additions and 22 deletions
--- a/adm/board_list.php
+++ b/adm/board_list.php
@ -147,22 +147,22 @@ $colspan = 15;
        </td>
        <td>
            <label for="bo_subject_<?php echo $i; ?>" class="sound_only">게시판 제목</label>
-            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required frm_input bo_subject" size="10">
+            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required frm_input bo_subject full_input" size="10">
        </td>
-        <td>
-            <label for="" class="sound_only">읽기 포인트</label>
+        <td class="td_numsmall">
+            <label for="bo_read_point_<?php echo $i; ?>" class="sound_only">읽기 포인트</label>
            <input type="text" name="bo_read_point[<?php echo $i ?>]" value="<?php echo $row['bo_read_point'] ?>" id="bo_read_point_<?php echo $i; ?>" class="frm_input" size="2">
        </td>
-        <td>
-            <label for="" class="sound_only">쓰기 포인트</label>
+        <td class="td_numsmall">
+            <label for="bo_write_point_<?php echo $i; ?>" class="sound_only">쓰기 포인트</label>
            <input type="text" name="bo_write_point[<?php echo $i ?>]" value="<?php echo $row['bo_write_point'] ?>" id="bo_write_point_<?php echo $i; ?>" class="frm_input" size="2">
        </td>
-        <td>
-            <label for="" class="sound_only">댓글 포인트</label>
+        <td class="td_numsmall">
+            <label for="bo_comment_point_<?php echo $i; ?>" class="sound_only">댓글 포인트</label>
            <input type="text" name="bo_comment_point[<?php echo $i ?>]" value="<?php echo $row['bo_comment_point'] ?>" id="bo_comment_point_<?php echo $i; ?>" class="frm_input" size="2">
        </td>
-        <td>
-            <label for="" class="sound_only">다운 포인트</label>
+        <td class="td_numsmall">
+            <label for="bo_download_point_<?php echo $i; ?>" class="sound_only">다운 포인트</label>
            <input type="text" name="bo_download_point[<?php echo $i ?>]" value="<?php echo $row['bo_download_point'] ?>" id="bo_download_point_<?php echo $i; ?>" class="frm_input" size="2">
        </td>
        <td class="td_chk">
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@ -348,9 +348,6 @@ tfoot td {font-weight:bold;text-align:center}
 .mb_intercept_msg {color:#f59fe4}
 #point_mng {margin-top:50px}

-/* 게시판관리 목록 */
-#fboardlist .bo_subject {width:90%}
-
 /* 게시판추가/수정 */
 #anc_bo_extra .td_grpset label {width:auto}
 #anc_bo_extra .td_grpset input {margin:0}
@ -819,4 +816,4 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 #post_code #result ul {margin:0;padding:0;border-bottom:1px solid #dde4e9;background:#f0f5fc;list-style:none}
 #post_code #result li {padding:10px;border:1px solid #dde4e9;border-bottom:0}
 #post_code #result li div {margin:4px 0 0;color:#738D94}
-#post_code #result li div:before {content:"▶ "}
+#post_code #result li div:before {content:"▶ "}
--- a/adm/member_list.php
+++ b/adm/member_list.php
@ -64,7 +64,7 @@ include_once('./admin.head.php');
 $sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);

-$colspan = 15;
+$colspan = 16;
 ?>

 <div class="local_ov01 local_ov">
@ -126,7 +126,7 @@ $colspan = 15;
        </th>
        <th scope="col" rowspan="2" id="mb_list_id"><?php echo subject_sort_link('mb_id') ?>아이디</a></th>
        <th scope="col" id="mb_list_name"><?php echo subject_sort_link('mb_name') ?>이름</a></th>
-        <th scope="col" colspan="5" id="mb_list_cert"><?php echo subject_sort_link('mb_certify', '', 'desc') ?>본인확인</a></th>
+        <th scope="col" colspan="6" id="mb_list_cert"><?php echo subject_sort_link('mb_certify', '', 'desc') ?>본인확인</a></th>
        <th scope="col" id="mb_list_mobile">휴대폰</th>
        <th scope="col" id="mb_list_auth">상태/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th>
        <th scope="col" id="mb_list_lastcall"><?php echo subject_sort_link('mb_today_login', '', 'desc') ?>최종접속</a></th>
@ -135,9 +135,10 @@ $colspan = 15;
    </tr>
    <tr>
        <th scope="col" id="mb_list_nick"><?php echo subject_sort_link('mb_nick') ?>닉네임</a></th>
-        <th scope="col" id="mb_list_mailr"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
+        <th scope="col" id="mb_list_mailc"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
        <th scope="col" id="mb_list_open"><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보<br>공개</a></th>
-        <th scope="col" id="mb_list_mailc"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th>
+        <th scope="col" id="mb_list_mailr"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th>
+        <th scope="col" id="mb_list_sms"><?php echo subject_sort_link('mb_sms', '', 'desc') ?>SMS<br>수신</a></th>
        <th scope="col" id="mb_list_adultc"><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인<br>인증</a></th>
        <th scope="col" id="mb_list_deny"><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근<br>차단</a></th>
        <th scope="col" id="mb_list_tel">전화번호</th>
@ -217,7 +218,7 @@ $colspan = 15;
        </td>
        <td headers="mb_list_id" rowspan="2" class="td_name sv_use"><?php echo $mb_id ?></td>
        <td headers="mb_list_name" class="td_mbname"><?php echo $row['mb_name']; ?></td>
-        <td headers="mb_list_cert" colspan="5" class="td_mbcert">
+        <td headers="mb_list_cert" colspan="6" class="td_mbcert">
            <input type="radio" name="mb_certify[<?php echo $i; ?>]" value="ipin" id="mb_certify_ipin_<?php echo $i; ?>" <?php echo $row['mb_certify']=='ipin'?'checked':''; ?>>
            <label for="mb_certify_ipin_<?php echo $i; ?>">아이핀</label>
            <input type="radio" name="mb_certify[<?php echo $i; ?>]" value="hp" id="mb_certify_hp_<?php echo $i; ?>" <?php echo $row['mb_certify']=='hp'?'checked':''; ?>>
@ -238,9 +239,22 @@ $colspan = 15;
    <tr class="<?php echo $bg; ?>">
        <td headers="mb_list_nick" class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
        <td headers="mb_list_mailc" class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
-        <td headers="mb_list_mailr" class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
-        <td headers="mb_list_open" class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
-        <td headers="mb_list_adultc" class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
+        <td headers="mb_list_open" class="td_chk">
+            <label for="mb_open_<?php echo $i; ?>" class="sound_only"></label>
+            <input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1" id="mb_open_<?php echo $i; ?>">
+        </td>
+        <td headers="mb_list_mailr" class="td_chk">
+            <label for="mb_mailling_<?php echo $i; ?>" class="sound_only"></label>
+            <input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1" id="mb_mailling_<?php echo $i; ?>">
+        </td>
+        <td headers="mb_list_sms" class="td_chk">
+            <label for="mb_sms_<?php echo $i; ?>" class="sound_only"></label>
+            <input type="checkbox" name="mb_sms[<?php echo $i; ?>]" <?php echo $row['mb_sms']?'checked':''; ?> value="1" id="mb_sms_<?php echo $i; ?>">
+        </td>
+        <td headers="mb_list_adultc" class="td_chk">
+            <label for="mb_adult_<?php echo $i; ?>" class="sound_only"></label>
+            <input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1" id="mb_adult_<?php echo $i; ?>">
+        </td>
        <td headers="mb_list_deny" class="td_chk">
            <?php if(empty($row['mb_leave_date'])){ ?>
            <input type="checkbox" name="mb_intercept_date[<?php echo $i; ?>]" <?php echo $row['mb_intercept_date']?'checked':''; ?> value="<?php echo $intercept_date ?>" id="mb_intercept_date_<?php echo $i ?>" title="<?php echo $intercept_title ?>">
--- a/adm/member_list_update.php
+++ b/adm/member_list_update.php
@ -35,6 +35,7 @@ if ($_POST['act_button'] == "선택수정") {
                        set mb_level = '{$_POST['mb_level'][$k]}',
                            mb_intercept_date = '{$_POST['mb_intercept_date'][$k]}',
                            mb_mailling = '{$_POST['mb_mailling'][$k]}',
+                            mb_sms = '{$_POST['mb_sms'][$k]}',
                            mb_open = '{$_POST['mb_open'][$k]}',
                            mb_certify = '{$_POST['mb_certify'][$k]}',
                            mb_adult = '{$mb_adult}'
--- a/common.php
+++ b/common.php
@ -466,13 +466,23 @@ include_once(G5_BBS_PATH.'/visit_insert.inc.php');


 // common.php 파일을 수정할 필요가 없도록 확장합니다.
+$extend_file = array();
 $tmp = dir(G5_EXTEND_PATH);
 while ($entry = $tmp->read()) {
    // php 파일만 include 함
    if (preg_match("/(\.php)$/i", $entry))
-        include_once(G5_EXTEND_PATH.'/'.$entry);
+        $extend_file[] = $entry;
 }

+if(!empty($extend_file) && is_array($extend_file)) {
+    natsort($extend_file);
+
+    foreach($extend_file as $file) {
+        include_once(G5_EXTEND_PATH.'/'.$file);
+    }
+}
+unset($extend_file);
+
 ob_start();

 // 자바스크립트에서 go(-1) 함수를 쓰면 폼값이 사라질때 해당 폼의 상단에 사용하면