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

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-13 18:35:48 +09:00
parent 6f1a1fe673 0a65cb82c4
commit a857025b28
9 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/board_list.php
View File

@ -167,7 +167,6 @@ $colspan = 15;
<input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value"> <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value">
<?php if ($is_admin == 'super') { ?> <?php if ($is_admin == 'super') { ?>
<input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value"> <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
<a href="./board_form.php">게시판추가</a>
<?php } ?> <?php } ?>
</div> </div>

13
adm/member_list.php
View File

@ -131,9 +131,9 @@ $colspan = 15;
<th scope="col"><?php echo subject_sort_link('mb_nick') ?>별명</a></th> <th scope="col"><?php echo subject_sort_link('mb_nick') ?>별명</a></th>
<th scope="col">상태/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th> <th scope="col">상태/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th>
<th scope="col">전화번호</th> <th scope="col">전화번호</th>
<th scope="col"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th> <th scope="col"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th>
<th scope="col"><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보<br>공개</a></th> <th scope="col"><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보<br>공개</a></th>
<th scope="col"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_hp_certify', '', 'desc') ?>본인<br>확인</a></th> <th scope="col"><?php echo subject_sort_link('mb_hp_certify', '', 'desc') ?>본인<br>확인</a></th>
<th scope="col"><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인<br>인증</a></th> <th scope="col"><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근<br>차단</a></th> <th scope="col"><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근<br>차단</a></th>
@ -211,14 +211,14 @@ $colspan = 15;
<?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?> <?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?>
</td> </td>
<td><?php echo $row['mb_tel']; ?></td> <td><?php echo $row['mb_tel']; ?></td>
<td class="td_chk"><?php echo $row['mb_mailling']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk"><?php echo $row['mb_open']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td 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 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 class="td_chk"><?php echo $row['mb_hp_certify']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td> <td class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
<td class="td_chk"><?php echo $row['mb_adult']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td> <td class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_hp_certify[<?php echo $i; ?>]" <?php echo $row['mb_hp_certify']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
<td class="td_chk"> <td class="td_chk">
<?php if(empty($row['mb_leave_date'])){ ?> <?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 ?>"> <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 ?>">
<?php } ?> <?php } ?>
</td> </td>
<td><?php echo substr($row['mb_datetime'],2,8); ?></td> <td><?php echo substr($row['mb_datetime'],2,8); ?></td>
@ -235,7 +235,6 @@ $colspan = 15;
<div class="btn_list"> <div class="btn_list">
<input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value"> <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value"> <input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
<?php if ($is_admin == 'super') { ?><a href="./member_form.php">회원추가</a><?php } ?>
</div> </div>
</form> </form>

6
adm/member_list_update.php
View File

@ -28,7 +28,11 @@ if ($_POST['act_button'] == "선택수정") {
} else { } else {
$sql = " update {$g4['member_table']} $sql = " update {$g4['member_table']}
set mb_level = '{$_POST['mb_level'][$k]}', set mb_level = '{$_POST['mb_level'][$k]}',
mb_intercept_date = '{$_POST['mb_intercept_date'][$k]}' mb_intercept_date = '{$_POST['mb_intercept_date'][$k]}',
mb_mailling = '{$_POST['mb_mailling'][$k]}',
mb_open = '{$_POST['mb_open'][$k]}',
mb_hp_certify = '{$_POST['mb_hp_certify'][$k]}',
mb_adult = '{$_POST['mb_adult'][$k]}'
where mb_id = '{$_POST['mb_id'][$k]}' "; where mb_id = '{$_POST['mb_id'][$k]}' ";
sql_query($sql); sql_query($sql);
} }

2
bbs/board.php
View File

@ -134,7 +134,7 @@ if (isset($wr_id) && $wr_id) {
if ($member['mb_id']) if ($member['mb_id'])
alert('목록을 볼 권한이 없습니다.', G4_URL); alert('목록을 볼 권한이 없습니다.', G4_URL);
else else
alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;'.$qstr)); alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.($qstr?'&amp;':'')));
} }
if (!isset($page) || (isset($page) && $page == 0)) $page = 1; if (!isset($page) || (isset($page) && $page == 0)) $page = 1;

24
common.php
View File

@ -173,14 +173,16 @@ define('G4_HTTPS_BBS_URL', https_url(G4_BBS_DIR, true));
// G4_MOBILE_AGENT : config.php 에서 선언 // G4_MOBILE_AGENT : config.php 에서 선언
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
$is_mobile = false; $is_mobile = false;
if ($_REQUEST['device']=='pc') if (G4_USE_MOBILE) {
$is_mobile = false; if ($_REQUEST['device']=='pc')
else if ($_REQUEST['device']=='mobile') $is_mobile = false;
$is_mobile = true; else if ($_REQUEST['device']=='mobile')
else if (isset($_SESSION['ss_is_mobile'])) $is_mobile = true;
$is_mobile = $_SESSION['ss_is_mobile']; else if (isset($_SESSION['ss_is_mobile']))
else if (is_mobile()) $is_mobile = $_SESSION['ss_is_mobile'];
$is_mobile = true; else if (is_mobile())
$is_mobile = true;
}
$_SESSION['ss_is_mobile'] = $is_mobile; $_SESSION['ss_is_mobile'] = $is_mobile;
define('G4_IS_MOBILE', $is_mobile); define('G4_IS_MOBILE', $is_mobile);
@ -288,7 +290,11 @@ if (isset($_REQUEST['url'])) {
$urlencode = urlencode($url); $urlencode = urlencode($url);
} else { } else {
$url = ''; $url = '';
$urlencode = urlencode(escape_trim($_SERVER['REQUEST_URI'])); $urlencode = urlencode($_SERVER['REQUEST_URI']);
if (G4_DOMAIN) {
$p = parse_url(G4_DOMAIN);
$urlencode = G4_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode));
}
} }
if (isset($_REQUEST['gr_id'])) { if (isset($_REQUEST['gr_id'])) {

0
extend/.htaccess
View File

8
lib/common.lib.php
View File

@ -1987,8 +1987,16 @@ function hyphen_hp_number($hp)
function login_url($url='') function login_url($url='')
{ {
if (!$url) $url = G4_URL; if (!$url) $url = G4_URL;
<<<<<<< HEAD
//$p = parse_url($url); //$p = parse_url($url);
//return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI']))); //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
=======
/*
$p = parse_url($url);
echo urlencode($_SERVER['REQUEST_URI']);
return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
*/
>>>>>>> g4s
return $url; return $url;
} }

4
plugin/gcaptcha/fonts/.htaccess
View File

@ -1,4 +0,0 @@
<Files ~ "*">
Order allow,deny
Deny from all
</Files>

2
plugin/kcp/kcpcert_result.php
View File

@ -150,7 +150,7 @@ if( $cert_enc_use == "Y" )
$adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME)); $adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME));
$adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0; $adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0;
$sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult where mb_id = '{$member['mb_id']}' "; $sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult, mb_birth = '$birth_day', mb_sex = '$sex_code' where mb_id = '{$member['mb_id']}' ";
sql_query($sql); sql_query($sql);
} }
else if( $res_cd != "0000" ) else if( $res_cd != "0000" )