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

bbs/memo_view.php

@@ -63,8 +63,6 @@ else
 
 $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
-$member_skin_path = G4_PATH.'/skin/member/'.$config['cf_member_skin'];
-
 include_once($member_skin_path.'/memo_view.skin.php');
 
 include_once(G4_PATH.'/tail.sub.php');

common.php

@@ -385,6 +385,7 @@ if ($is_admin != 'super') {
 $board_skin_path    = G4_SKIN_PATH.'/board/'.$board['bo_skin'];
 $board_skin_url     = G4_SKIN_URL.'/board/'.$board['bo_skin'];
 $member_skin_path   = G4_SKIN_PATH.'/member/'.$config['cf_member_skin'];
+$member_skin_url    = G4_SKIN_URL.'/member/'.$config['cf_member_skin'];
 $new_skin_path      = G4_SKIN_PATH.'/new/'.$config['cf_new_skin'];
 $search_skin_path   = G4_SKIN_PATH.'/search/'.$config['cf_search_skin'];
 $connect_skin_path  = G4_SKIN_PATH.'/connect/'.$config['cf_connect_skin'];

css/default.css

@@ -112,9 +112,9 @@ table a {color:#000;text-decoration:none}
 
 /* 폼 테이블 */
 .frm_tbl {}
-.frm_tbl caption {padding-top:10px;color:#999;font-weight:bold}
+.frm_tbl caption {padding-top:10px;font-size:1.2em;font-weight:bold}
-.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;text-align:left}
+.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #f7f7f2;border-bottom:1px solid #f7f7f2;text-align:left}
-.frm_tbl td {padding:7px 10px}
+.frm_tbl td {padding:7px 10px;border-color:#f7f7f2}
 .frm_tbl textarea,
 .frm_input {padding:2px 2px 3px;border:1px solid #d7d7d7;background:#fff;vertical-align:middle}
 .frm_tbl textarea:focus,
@@ -122,9 +122,10 @@ table a {color:#000;text-decoration:none}
 .frm_tbl textarea {width:90%}
 .frm_address {display:block;margin-top:5px}
 .frm_file {display:block;margin-bottom:5px}
-.frm_info {display:block;padding:5px 0 0;color:#595959;line-height:1.3em}
 .frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}
-.frm_tbl #captcha input {margin-left:5px}
+.frm_tbl #captcha input {margin-left:5px;text-align:center}
+
+.frm_info {display:block;padding:5px 0 0;color:#777;line-height:1.3em}
 
 /* ///// 테이블 항목별 정의 ///// */
 .td_chk {width:40px;text-align:center}
@@ -169,6 +170,17 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
 .fregister_agree label {display:inline-block;margin-right:5px}
 #fregister p {text-align:center}
 
+/* 회원가입 입력 */
+#fregisterform .cbg {margin-bottom:15px;padding:20px}
+#fregisterform textarea {height:50px}
+
+/* 회원가입 완료 */
+#reg_result {margin-bottom:20px;padding:70px 50px 40px}
+#reg_result_logo {margin-bottom:30px;text-align:center}
+#reg_result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
+#reg_result_email span {display:inline-block;width:150px}
+#reg_result_email strong {color:#109ff1;font-size:1.2em}
+
 /* 아웃로그인 스킨 */
 .ol {position:relative;margin-bottom:10px;padding:14px}
 .ol h2 {width:0;height:0;overflow:hidden}

lib/shop.lib.php

@@ -24,7 +24,7 @@ function get_uniqid()
     sql_query(" LOCK TABLE {$g4['yc4_uniqid_table']} WRITE ");
     while (1) {
         // 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움)
-        $key = date('YmdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
+        $key = date('ymdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
 
         $result = sql_query(" insert into {$g4['yc4_uniqid_table']} values ('$key') ", false);
         if ($result) break; // 쿼리가 정상이면 빠진다.

skin/member/neo/register_form.skin.php

@@ -16,6 +16,7 @@ var member_skin_path = "<?=$member_skin_path?>";
 <input type="hidden" name="mb_nick" value="<?=$member['mb_nick']?>">
 <? } ?>
 
+<div class="cbg">
     <table class="frm_tbl">
     <caption>사이트 이용정보 입력</caption>
     <tr>
@@ -35,7 +36,9 @@ var member_skin_path = "<?=$member_skin_path?>";
         <td><input type="password" id="reg_mb_password_re" name="mb_password_re" class="frm_input minlength_3 <?=$required?>" maxlength="20" <?=$required?>></td>
     </tr>
     </table>
+</div>
 
+<div class="cbg">
     <table class="frm_tbl">
     <caption>개인정보 입력</caption>
     <tr>
@@ -65,7 +68,6 @@ var member_skin_path = "<?=$member_skin_path?>";
         <td>
             <input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
             <input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" size="50" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?>>
-        <span id="msg_mb_email"></span>
             <? if ($config['cf_use_email_certify']) { ?>
             <span class="frm_info">
                 <? if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
@@ -78,7 +80,7 @@ var member_skin_path = "<?=$member_skin_path?>";
     <? if ($config['cf_use_homepage']) { ?>
     <tr>
         <th scope="row"><label for="reg_mb_homepage">홈페이지<? if ($config['cf_req_homepage']){?><strong class="sound_only">필수</strong><?}?></label></th>
-    <td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
+        <td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" size="50" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
     </tr>
     <? } ?>
 
@@ -115,7 +117,9 @@ var member_skin_path = "<?=$member_skin_path?>";
     </tr>
     <? } ?>
     </table>
+</div>
 
+<div class="cbg">
     <table class="frm_tbl">
     <caption>기타 개인설정</caption>
     <? if ($config['cf_use_signature']) { ?>
@@ -204,6 +208,7 @@ var member_skin_path = "<?=$member_skin_path?>";
         <td><?=$captcha_html?></td>
     </tr>
     </table>
+</div>
 
 <div class="btn_confirm">
     <input type="submit" class="btn_submit" value="<?=$w==''?'회원가입':'정보수정';?>" accesskey="s">

skin/member/neo/register_result.skin.php

@@ -2,9 +2,9 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
-<div id="reg_result">
+<div id="reg_result" class="cbg">
 
-    <div class="reg_result_deco"><img src="<?=$g4['path']?>/img/reg_result_deco.jpg" alt=""></div>
+    <div id="reg_result_logo"><img src="<?=$member_skin_url?>img/reg_result_logo.jpg" alt=""></div>
 
     <p>
         <strong><?=$mb['mb_name']?></strong>님의 회원가입을 진심으로 축하합니다.<br>
@@ -32,12 +32,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     </p>
 
     <p>
-        회원 탈퇴는 언제든지 가능하며 일정기간이 지난 후, 회원님의 소중한 정보는 삭제하고 있습니다.<br>
+        회원 탈퇴는 언제든지 가능하며 일정기간이 지난 후, 회원님의 정보는 삭제하고 있습니다.<br>
         감사합니다.
     </p>
 
-    <div class="btn_confirm">
-        <a href="<?=$g4['url']?>/" class="btn_cancel">메인으로</a>
 </div>
 
+<div class="btn_confirm">
+    <a href="<?=$g4['url']?>/" class="btn01">메인으로</a>
 </div>