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

Conflicts: adm/config_form_update.php
2013-02-27 15:34:35 +09:00
parent d90e14bd32 aa1bdc7e78
commit 2ae14ee5f8
9 changed files with 117 additions and 33 deletions
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -10,9 +10,9 @@ if ($is_admin != 'super')
    alert('최고관리자만 접근 가능합니다.');

 if (!isset($config['cf_include_index'])) {
-    sql_query(" ALTER TABLE `{$g4['config_table']}` 
-                    ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`,  
-                    ADD `cf_include_head` VARCHAR(255) NOT NULL AFTER `cf_include_index`, 
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`,
+                    ADD `cf_include_head` VARCHAR(255) NOT NULL AFTER `cf_include_index`,
                    ADD `cf_include_tail` VARCHAR(255) NOT NULL AFTER `cf_include_head`,
                    ADD `cf_add_script` TEXT NOT NULL AFTER `cf_include_tail` ", true);
 }
@ -25,6 +25,11 @@ if (!isset($config['cf_mobile_new_skin'])) {
                    ADD `cf_mobile_member_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_connect_skin` ", true);
 }

+if(!isset($config['cf_adult_check'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_adult_check` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_memo_send_point` ", TRUE);
+}
+
 $g4['title'] = '환경설정';
 include_once ('./admin.head.php');

@ -413,6 +418,10 @@ $pg_anchor = "
        <th scope="row"><label for="cf_register_point">회원가입시 포인트</label></th>
        <td><input type="text" id="cf_register_point" name="cf_register_point" class="frm_input" value="<?=$config['cf_register_point']?>" size="5"> 점</td>
    </tr>
+    <tr>
+        <th scope='row' id="th310"><label for='cf_adult_check'>성인인증 사용</label></th>
+        <td colspan="3"><input type="checkbox" id="cf_adult_check" name="cf_adult_check" value="1" <?=$config['cf_adult_check']?'checked':'';?>> 사용</td>
+    </tr>
    <tr>
        <th scope='row' id="th310"><label for='cf_leave_day'>회원탈퇴후 삭제일</label></th>
        <td colspan="3"><input type="text" id="cf_leave_day" name="cf_leave_day" class="frm_input" value="<?=$config['cf_leave_day']?>" size="2"> 일 후 자동 삭제</td>
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@ -99,10 +99,14 @@ $sql = " update {$g4['config_table']}
                 cf_privacy = '{$_POST['cf_privacy']}',
                 cf_open_modify = '{$_POST['cf_open_modify']}',
                 cf_memo_send_point = '{$_POST['cf_memo_send_point']}',
+<<<<<<< HEAD
                 cf_mobile_new_skin = '{$_POST['cf_mobile_new_skin']}',
                 cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
                 cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
                 cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
+=======
+                 cf_adult_check = '{$_POST['cf_adult_check']}',
+>>>>>>> aa1bdc7e789bc4b81151546f1180d34939329093
                 cf_1_subj = '{$_POST['cf_1_subj']}',
                 cf_2_subj = '{$_POST['cf_2_subj']}',
                 cf_3_subj = '{$_POST['cf_3_subj']}',
--- a/adm/member_form.php
+++ b/adm/member_form.php
@ -80,6 +80,12 @@ if ($mb['mb_open']) {
    $open_no_checked = 'checked="checked"';
 }

+if(!isset($mb['mb_adult'])) {
+    sql_query(" ALTER TABLE `{$g4['member_table']}`
+                    ADD `mb_adult` ENUM('Y', 'N') NOT NULL DEFAULT 'N' AFTER `mb_birth`,
+                    ADD `mb_hp_certify` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `mb_lost_certify` ", FALSE);
+}
+
 if ($mb['mb_intercept_date']) $g4['title'] = "차단된 ";
 else $g4['title'] .= "";
 $g4['title'] .= '회원 '.$html_title;
--- a/css/mobile.css
+++ b/css/mobile.css
@ -2,7 +2,7 @@

 /* 초기화 */
 html {overflow-y:scroll}
-body {margin:0;padding:0;background:#fff;font-size:0.875em}
+body {margin:0;padding:0;background:#fff;font-size:1em}
 html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {color:#2a4959;font-size:1em}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
@ -44,7 +44,7 @@ pre {overflow-x:scroll;font-size:1.1em}
 .gnb_1depth a {display:block;padding:10px 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}

 /* 배포시에는 필요없는 부분 */
-#sirgle_title {height:100px;color:#fff;font-size:3em}
+#sirgle_title {padding:0 10px;height:100px;color:#fff;font-size:2em}
 #sirgle_title_span {display:block;position:relative;top:33px;left:0}

 /* 중간 레이아웃 */
@ -58,6 +58,22 @@ pre {overflow-x:scroll;font-size:1.1em}
 /* 하단 레이아웃 */
 #ft img {display:none}

+/* 버튼 */
+.btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
+.btn01:focus,
+.btn01:hover {text-decoration:none !important}
+.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333 !important;background:#333 !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
+.btn02:focus,
+.btn02:hover {text-decoration:none !important}
+.btn_confirm {text-align:center} /* 서식단계 진행 */
+.btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
+.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
+.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
+.btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
+.btn_win a:focus,
+.btn_win a:hover {text-decoration:none}
+
 /* 광고 레이아웃 */
 .ad200200 {display:none}
 .ad72890 {display:none}
@ -86,34 +102,73 @@ sup {display:none !important}
 */

 /* 게시판 목록 */
-#bo_list table {width:100%}
-#bo_list th {padding:12px 0 8px;background:#565e60;color:#fff}
-#bo_list caption {display:none}
+.bo_list table {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
+
+.bo_list th {padding:12px 0 8px;background:#565e60;color:#fff}
+.bo_list th a {color:#fff;text-decoration:none}
+
+.bo_list td {border-bottom:1px solid #ddd}
+.bo_list td a {display:block;padding:10px 5px;color:#000;text-decoration:none}
+
+.bo_list img {margin-right:4px}
+.bo_list img:nth-last-of-type(1) {margin-right:0}
+
+/* 관리자일 때 생략 */
+#bo_list_admin th:nth-of-type(1) {display:none}
+#bo_list_admin th:nth-of-type(4) {display:none}
+#bo_list_admin th:nth-of-type(6) {width:20%}
+#bo_list_admin th:nth-of-type(6) {display:none}
+#bo_list_admin th:nth-of-type(7) {display:none}
+#bo_list_admin td:nth-of-type(1) {display:none}
+#bo_list_admin td:nth-of-type(2) {text-align:center}
+#bo_list_admin td:nth-of-type(4) {display:none}
+#bo_list_admin td:nth-of-type(5) {text-align:center}
+#bo_list_admin td:nth-of-type(6) {display:none}
+#bo_list_admin td:nth-of-type(7) {display:none}
+
+/* 관리자가 아닐 때 생략 */
 #bo_list th:nth-of-type(1) {display:none}
-#bo_list td:nth-of-type(1) {display:none}
 #bo_list th:nth-of-type(3) {display:none}
-#bo_list td:nth-of-type(3) {display:none}
 #bo_list th:nth-of-type(4) {width:20%}
-#bo_list td:nth-of-type(4) {text-align:center}
 #bo_list th:nth-of-type(5) {display:none}
-#bo_list td:nth-of-type(5) {display:none}
 #bo_list th:nth-of-type(6) {display:none}
-#bo_list td:nth-of-type(6) {display:none}
-/*
-#bo_list table {margin:0 auto;width:100%}
-#bo_list caption {display:none}
-#bo_list thead {display:none}
-#bo_list tr {border:1px solid #ccc}
-#bo_list tr:nth-of-type(odd) {background:#eee}
-#bo_list td {display:block;position:relative;padding:5px 0 5px 20%}
-#bo_list td::before {position:absolute;top:5px;left:0}
 #bo_list td:nth-of-type(1) {display:none}
-#bo_list td:nth-of-type(1):before {content:"번호"}
-#bo_list td:nth-of-type(2):before {content:"제목"}
 #bo_list td:nth-of-type(3) {display:none}
-#bo_list td:nth-of-type(3):before {content:"글쓴이"}
-#bo_list td:nth-of-type(4):before {content:"날짜"}
-#bo_list td:nth-of-type(5):before {content:"조회"}
-#bo_list a {color:#000;text-decoration:none}
-.bo_cate_link {font-weight:bold}
-*/
+#bo_list td:nth-of-type(4) {text-align:center}
+#bo_list td:nth-of-type(5) {display:none}
+#bo_list td:nth-of-type(6) {display:none}
+
+.bo_fx {margin-bottom:5px;zoom:1}
+.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
+.bo_fx ul {margin:0;padding:0;list-style:none}
+#bo_list_total {float:left;padding-top:5px}
+.btn_bo_user {float:right;margin:0;padding:0;list-style:none}
+.btn_bo_user li {float:left;margin-left:5px}
+.btn_bo_adm {float:left}
+.btn_bo_adm li {float:left;margin-right:5px}
+.btn_bo_adm input {padding:0 10px;height:25px;border:1px solid #e8180c !important;background:#e8180c;color:#fff;text-decoration:none;vertical-align:middle;cursor:pointer}
+.bo_notice td {background:#f7f7f2}
+.bo_notice td a {font-weight:bold}
+.td_num strong {color:#000}
+.bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */
+.bo_current {color:#e8180c}
+.td_subject img {margin-left:3px}
+.cnt_cmt {font-weight:bold}
+
+#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
+#bo_sch legend {width:1px;height:1px;overflow:hidden}
+
+/* pagination */
+.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
+.pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px}
+.pg a:focus,
+.pg a:hover,
+.pg a:active {text-decoration:none}
+.pg_page,
+.pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle}
+.pg_page {background:#f9f9f9;text-decoration:none}
+.pg_start,
+.pg_prev {border-right:1px solid #cfded8}
+.pg_end,
+.pg_next {border-left:1px solid #cfded8}
+.pg_current {background:#333;color:#fff;font-weight:bold}
--- a/head.php
+++ b/head.php
@ -9,6 +9,11 @@ include_once(G4_LIB_PATH.'/visit.lib.php');
 include_once(G4_LIB_PATH.'/connect.lib.php');
 include_once(G4_LIB_PATH.'/popular.lib.php');

+if (G4_IS_MOBILE) {
+    include_once(G4_MOBILE_PATH.'/head.php');
+    return;
+}
+
 // 상단 파일 경로 지정 : 이 코드는 가능한 삭제하지 마십시오.
 if ($config['cf_include_head']) {
    if (!@include_once($config['cf_include_head'])) {
@ -16,8 +21,6 @@ if ($config['cf_include_head']) {
    }
    return; // 이 코드의 아래는 실행을 하지 않습니다.
 }
-
-//print_r2(get_defined_constants());
 ?>

 <header id="hd">
--- a/head.sub.php
+++ b/head.sub.php
@ -36,7 +36,7 @@ header("Pragma: no-cache"); // HTTP/1.0
 <!-- <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> -->
 <title><?=$g4_head_title?></title>
 <? if (defined('G4_IS_ADMIN')) { ?>
-<link rel="stylesheet" href="<?=G4_CSS_URL?>/admin.css?=<?=date("md")?>">
+<link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=(G4_IS_MOBILE?'admin_mobile':'admin')?>.css?=<?=date("md")?>">
 <? } else { ?>
 <link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=(G4_IS_MOBILE?'mobile':'default')?>.css?=<?=date("md")?>">
 <?}?>
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@ -260,6 +260,7 @@ CREATE TABLE IF NOT EXISTS `g4s_config` (
  `cf_privacy` text NOT NULL,
  `cf_open_modify` int(11) NOT NULL default '0',
  `cf_memo_send_point` int(11) NOT NULL default '0',
+  `cf_adult_check` tinyint(4) NOT NULL default '0',
  `cf_1_subj` varchar(255) NOT NULL default '',
  `cf_2_subj` varchar(255) NOT NULL default '',
  `cf_3_subj` varchar(255) NOT NULL default '',
@ -391,6 +392,7 @@ CREATE TABLE IF NOT EXISTS `g4s_member` (
  `mb_jumin` varchar(255) NOT NULL default '',
  `mb_sex` char(1) NOT NULL default '',
  `mb_birth` varchar(255) NOT NULL default '',
+  `mb_adult` enum('Y','N') NOT NULL default 'N',
  `mb_tel` varchar(255) NOT NULL default '',
  `mb_hp` varchar(255) NOT NULL default '',
  `mb_zip1` char(3) NOT NULL default '',
--- a/skin/latest/basic/latest.skin.php
+++ b/skin/latest/basic/latest.skin.php
@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 ?>

 <div class="lt">
-    <a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>" onclick="return false" class="lt_title"><strong><?=$bo_subject?></strong></a>
+    <strong class="lt_title"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>" onclick="return false"><?=$bo_subject?></a></strong>
    <ul>
    <? for ($i=0; $i<count($list); $i++) { ?>
        <li>
--- a/tail.php
+++ b/tail.php
@ -1,6 +1,11 @@
 <?
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

+if (G4_IS_MOBILE) {
+    include_once(G4_MOBILE_PATH.'/tail.php');
+    return;
+}
+
 // 하단 파일 경로 지정 : 이 코드는 가능한 삭제하지 마십시오.
 if ($config['cf_include_tail']) {
    if (!@include_once($config['cf_include_tail'])) {