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

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

Browse Source
This commit is contained in:
thisgun
2019-12-27 16:05:56 +09:00
parent b5152b62e8 a5e5531471
commit 4b0969d244
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/uri.lib.php
View File

@ -120,8 +120,10 @@ function short_url_clean($string_url, $add_qry=''){
$return_url = ''; $return_url = '';
parse_str($url['query'], $vars); parse_str($url['query'], $vars);
/*
// 예) Array ( [scheme] => http [host] => sir.kr [path] => /bbs/board.php [query] => wr_id=1110870&bo_table=cm_free&cpage=1 [fragment] => c_1110946 ) // 예) Array ( [scheme] => http [host] => sir.kr [path] => /bbs/board.php [query] => wr_id=1110870&bo_table=cm_free&cpage=1 [fragment] => c_1110946 )
//while(list($k,$v) = each($vars)) $page_name .= "/".$v; foreach($vars as $k => $v) { $page_name .= "/".$v; }
*/
if( $page_name === 'write' ){ if( $page_name === 'write' ){
$vars['action'] = 'write'; $vars['action'] = 'write';
@ -174,7 +176,7 @@ function short_url_clean($string_url, $add_qry=''){
$add_param .= $add_param ? '&'.$add_qry : '?'.$add_qry; $add_param .= $add_param ? '&'.$add_qry : '?'.$add_qry;
} }
while(list($k,$v) = each($s)) $return_url .= '/'.$v; foreach($s as $k => $v) { $return_url .= '/'.$v; }
return $host.$return_url.$add_param.$fragment; return $host.$return_url.$add_param.$fragment;
} }

6
skin/member/basic/register_form.skin.php
View File

@ -98,15 +98,17 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<?php } ?> <?php } ?>
<li> <li>
<label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label> <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong>
<?php if ($config['cf_use_email_certify']) { ?> <?php if ($config['cf_use_email_certify']) { ?>
<button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button> <button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
<span class="tooltip">이미지 크기는 가 <span class="tooltip">
<?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?> <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
<?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?> <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
</span> </span>
<?php } ?> <?php } ?>
</label>
<input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>"> <input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
<input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail"> <input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail">

7
theme/basic/skin/member/basic/register_form.skin.php
View File

@ -98,15 +98,16 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<?php } ?> <?php } ?>
<li> <li>
<label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label> <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong>
<?php if ($config['cf_use_email_certify']) { ?> <?php if ($config['cf_use_email_certify']) { ?>
<button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button> <button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
<span class="tooltip">이미지 크기는 가 <span class="tooltip">
<?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?> <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
<?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?> <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
</span> </span>
<?php } ?> <?php } ?>
</label>
<input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>"> <input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
<input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail"> <input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail">