firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4s 머지 후 충돌 코드 수정

Browse Source
This commit is contained in:
chicpro
2013-04-26 16:06:30 +09:00
parent da91511e5f da3c09523c
commit 9fece6bcd3
16 changed files with 180 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
adm/admin.head.php
View File

@ -1,4 +1,4 @@
<?
<?php
if (!defined('_GNUBOARD_')) exit;
$begin_time = get_microtime();
@ -68,27 +68,25 @@ function imageview(id, w, h)
<header id="hd">
<div id="hd_wrap">
<h1><?=$config['cf_title']?></h1>
<div id="logo"><a href="<?=G4_ADMIN_URL?>"><img src="<?=G4_ADMIN_URL?>/img/logo.jpg" alt="<?=$config['cf_title']?> 관리자 처음으로"></a></div>
<h1><?php echo $config['cf_title'] ?></h1>
<div id="logo"><a href="<?php echo G4_ADMIN_URL ?>"><img src="<?php echo G4_ADMIN_URL ?>/img/logo.jpg" alt="<?php echo $config['cf_title'] ?> 관리자 처음으로"></a></div>
<div id="mb_nb">
<ul>
<li>
<a href="<?=G4_ADMIN_URL?>/member_form.php?w=u&amp;mb_id=<?=$member['mb_id']?>">
<img src="<?=G4_ADMIN_URL?>/img/snb_modify.jpg" alt="" width="28" height="28">
<a href="<?php echo G4_ADMIN_URL ?>/member_form.php?w=u&amp;mb_id=<?php echo $member['mb_id'] ?>">
<img src="<?php echo G4_ADMIN_URL ?>/img/snb_modify.jpg" alt="" width="28" height="28">
관리자 정보수정
</a>
</li>
<li>
<a href="<?=G4_URL?>/">
<img src="<?=G4_ADMIN_URL?>/img/snb_home.jpg" alt="" width="28" height="28">
<a href="<?php echo G4_URL ?>/">
<img src="<?php echo G4_ADMIN_URL ?>/img/snb_home.jpg" alt="" width="28" height="28">
홈페이지 메인
</a>
</li>
<li>
<a href="<?=G4_BBS_URL?>/logout.php">
<img src="<?=G4_ADMIN_URL?>/img/snb_logout.jpg" alt="로그아웃" width="28" height="28">
<a href="<?php echo G4_BBS_URL ?>/logout.php">
<img src="<?php echo G4_ADMIN_URL ?>/img/snb_logout.jpg" alt="로그아웃" width="28" height="28">
로그아웃
</a>
</li>
@ -98,7 +96,7 @@ function imageview(id, w, h)
<nav id="gnb">
<h2>관리자 주메뉴</h2>
<script>$('#gnb').addClass('gnb_js');</script>
<?
<?php
$gnb_str = "<ul id=\"gnb_ul\">";
foreach($amenu as $key=>$value) {
$href1 = $href2 = '';
@ -155,20 +153,20 @@ function imageview(id, w, h)
</li>
<? // ### 쇼핑몰 사용일 때만 끝 ?>
<li>
<a href="<?=G4_ADMIN_URL?>/member_list.php">
<img src="<?=G4_ADMIN_URL?>/img/qnb_mb.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL ?>/member_list.php">
<img src="<?php echo G4_ADMIN_URL ?>/img/qnb_mb.jpg" alt="" width="40" height="40">
회원
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/board_list.php">
<img src="<?=G4_ADMIN_URL?>/img/qnb_board.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL ?>/board_list.php">
<img src="<?php echo G4_ADMIN_URL ?>/img/qnb_board.jpg" alt="" width="40" height="40">
게시판
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/visit_list.php">
<img src="<?=G4_ADMIN_URL?>/img/qnb_log.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL ?>/visit_list.php">
<img src="<?php echo G4_ADMIN_URL ?>/img/qnb_log.jpg" alt="" width="40" height="40">
접속자
</a>
</li>
@ -180,4 +178,4 @@ function imageview(id, w, h)
<button class="no_text_resize" onclick="font_default('container');">기본</button>
<button class="no_text_resize" onclick="font_resize('container', 'increase');">크게</button>
</div>
<h1><?=$g4['title']?></h1>
<h1><?php echo $g4['title'] ?></h1>

8
adm/board_form.php
View File

@ -46,7 +46,7 @@ if (!isset($board['bo_mobile_content_head'])) {
}
if (!isset($board['bo_use_cert'])) {
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('none','cert','adult') NOT NULL DEFAULT 'none' AFTER `bo_use_email` ", false);
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT 'none' AFTER `bo_use_email` ", false);
}
$required = "";
@ -554,9 +554,9 @@ $pg_anchor = '<ul class="anchor">
<td>
<?php echo help("본인확인 여부에 따라 게시물을 조회 할 수 있도록 합니다."); ?>
<select id="bo_use_cert" name="bo_use_cert">
<?php
echo option_selected("none", $board['bo_use_cert'], "사용안함");
if ($config['cf_kcpcert_use'] != 'none') {
<?php
echo option_selected("", $board['bo_use_cert'], "사용안함");
if ($config['cf_kcpcert_use'] != '') {
echo option_selected("cert", $board['bo_use_cert'], "본인확인된 회원전체");
echo option_selected("adult", $board['bo_use_cert'], "본인확인된 성인회원만");
}

4
adm/config_form.php
View File

@ -37,7 +37,7 @@ if(!isset($config['cf_kcpcert_site_cd'])) {
if(!isset($config['cf_kcpcert_use'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_kcpcert_use` ENUM('none','test','service') NOT NULL DEFAULT 'none' AFTER `cf_memo_send_point` ", TRUE);
ADD `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT 'none' AFTER `cf_memo_send_point` ", TRUE);
}
if(!isset($config['cf_mobile_pages'])) {
@ -548,7 +548,7 @@ $pg_anchor = '<ul class="anchor">
<td>
<?php echo help('KCP 사이트코드가 없으면 테스트만 가능합니다.') ?>
<select name="cf_kcpcert_use" id="cf_kcpcert_use">
<?php echo option_selected("none", $config['cf_kcpcert_use'], "사용안함"); ?>
<?php echo option_selected("", $config['cf_kcpcert_use'], "사용안함"); ?>
<?php echo option_selected("test", $config['cf_kcpcert_use'], "테스트"); ?>
<?php echo option_selected("service", $config['cf_kcpcert_use'], "실서비스"); ?>
</select>

86
adm/member_form_update.php
View File

@ -1,6 +1,7 @@
<?php
$sub_menu = "200100";
include_once('./_common.php');
include_once("./_common.php");
include_once(G4_LIB_PATH."/register.lib.php");
if ($w == 'u')
check_demo();
@ -13,60 +14,47 @@ if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('패스워드가 다릅니다.');
}
$mb_id = mysql_real_escape_string(trim($_POST['mb_id']));
$mb_id = escape_trim($_POST['mb_id']);
// 핸드폰번호 체크
$mb_hp = $_POST['mb_hp'];
if($mb_hp) {
$mb_hp = preg_replace("/[^0-9]/", "", $mb_hp);
$hp_len = strlen($mb_hp);
if($hp_len == 10) {
$mb_hp = preg_replace("/([0-9]{3})([0-9]{3})([0-9]{4})/", "\\1-\\2-\\3", $mb_hp);
} else if($hp_len == 11) {
$mb_hp = preg_replace("/([0-9]{3})([0-9]{4})([0-9]{4})/", "\\1-\\2-\\3", $mb_hp);
} else {
alert('핸드폰번호를 올바르게 입력해 주십시오.');
}
// 중복체크
$sql = " select count(*) as cnt from {$g4['member_table']} where mb_hp = '$mb_hp' and mb_id <> '$mb_id' ";
$row = sql_fetch($sql);
if($row['cnt'])
alert('다른 회원이 사용 중인 핸드폰번호입니다.');
$result = exist_mb_hp($mb_hp, $mb_id);
if ($result)
alert($result);
}
$sql_common = " mb_name = '{$_POST['mb_name']}',
mb_nick = '{$_POST['mb_nick']}',
mb_email = '{$_POST['mb_email']}',
mb_homepage = '{$_POST['mb_homepage']}',
mb_tel = '{$_POST['mb_tel']}',
mb_hp = '$mb_hp',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',
mb_addr2 = '{$_POST['mb_addr2']}',
mb_birth = '{$_POST['mb_birth']}',
mb_sex = '{$_POST['mb_sex']}',
mb_signature = '{$_POST['mb_signature']}',
mb_leave_date = '{$_POST['mb_leave_date']}',
mb_intercept_date='{$_POST['mb_intercept_date']}',
mb_memo = '{$_POST['mb_memo']}',
mb_mailling = '{$_POST['mb_mailling']}',
mb_sms = '{$_POST['mb_sms']}',
mb_open = '{$_POST['mb_open']}',
mb_profile = '{$_POST['mb_profile']}',
mb_level = '{$_POST['mb_level']}',
mb_1 = '{$_POST['mb_1']}',
mb_2 = '{$_POST['mb_2']}',
mb_3 = '{$_POST['mb_3']}',
mb_4 = '{$_POST['mb_4']}',
mb_5 = '{$_POST['mb_5']}',
mb_6 = '{$_POST['mb_6']}',
mb_7 = '{$_POST['mb_7']}',
mb_8 = '{$_POST['mb_8']}',
mb_9 = '{$_POST['mb_9']}',
mb_10 = '{$_POST['mb_10']}' ";
$sql_common = " mb_name = '{$_POST['mb_name']}',
mb_nick = '{$_POST['mb_nick']}',
mb_email = '{$_POST['mb_email']}',
mb_homepage = '{$_POST['mb_homepage']}',
mb_tel = '{$_POST['mb_tel']}',
mb_hp = '$mb_hp',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',
mb_addr2 = '{$_POST['mb_addr2']}',
mb_birth = '{$_POST['mb_birth']}',
mb_sex = '{$_POST['mb_sex']}',
mb_signature = '{$_POST['mb_signature']}',
mb_leave_date = '{$_POST['mb_leave_date']}',
mb_intercept_date='{$_POST['mb_intercept_date']}',
mb_memo = '{$_POST['mb_memo']}',
mb_mailling = '{$_POST['mb_mailling']}',
mb_sms = '{$_POST['mb_sms']}',
mb_open = '{$_POST['mb_open']}',
mb_profile = '{$_POST['mb_profile']}',
mb_level = '{$_POST['mb_level']}',
mb_1 = '{$_POST['mb_1']}',
mb_2 = '{$_POST['mb_2']}',
mb_3 = '{$_POST['mb_3']}',
mb_4 = '{$_POST['mb_4']}',
mb_5 = '{$_POST['mb_5']}',
mb_6 = '{$_POST['mb_6']}',
mb_7 = '{$_POST['mb_7']}',
mb_8 = '{$_POST['mb_8']}',
mb_9 = '{$_POST['mb_9']}',
mb_10 = '{$_POST['mb_10']}' ";
if ($w == '')
{