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

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

Browse Source
This commit is contained in:
chicpro
2013-01-31 10:12:51 +09:00
parent 2fe630e1d5 6c531cb6b4
commit b6ac78319a
9 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/member_form.php
View File

@ -134,7 +134,7 @@ include_once('./admin.head.php');
<td colspan="3">
<input type="text" id="mb_zip1" name="mb_zip1" maxlength="3" readonly value="<?=$mb['mb_zip1']?>" title="우편번호 앞자리" size="3"> -
<input type="text" id="mb_zip2" name="mb_zip2" maxlength="3" readonly value="<?=$mb['mb_zip2']?>" title="우편번호 뒷자리" size="3">
<a href="javascript:;" onclick="win_zip('fmember', 'mb_zip1', 'mb_zip2', 'mb_addr1', 'mb_addr2');">우편번호 검색</a><br>
<a href="<?=G4_BBS_URL.'/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2'?>" class="win_zip_find">우편번호 검색</a><br>
<input type="text" id="mb_addr1" name="mb_addr1" readonly value='<?=$mb['mb_addr1']?>' title="행정기본주소" size="50"><br>
<input type="text" id="mb_addr2" name="mb_addr2" value='<?=$mb['mb_addr2']?>' title="상세주소" size="50"> 상세주소 입력
</td>

17
adm/shop_admin/configform.php
View File

@ -226,6 +226,7 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
<table>
<caption>결제정보</caption>
<tbody>
<tr>
<th scope="row"><label for="de_bank_account">은행계좌번호</label></th>
<td colspan="3">
@ -440,10 +441,12 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
<th scope="row"><label for="">체크아웃 버튼키</label></th>
<td colspan="3"><input type="text" id="de_checkout_button_key" name="de_checkout_button_key" value="<?=$default['de_checkout_button_key']; ?>" size="50" /></td>
</tr>
</tbody>
</table>
<table>
<caption>배송정보</caption>
<tbody>
<tr>
<th scope="row"><label for="de_send_cost_case">배송비유형</label></th>
<td colspan="4">
@ -507,12 +510,12 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
<th scope="row"><label for="de_change_content">교환/반품</label></th>
<td colspan="4"><?=editor_html('de_change_content', $default[de_change_content]);?></td>
</tr>
</tbody>
</table>
<table>
<caption>기타정보</caption>
<tbody>
<tr>
<th scope="row">관련상품출력</th>
<td colspan="4">
@ -653,7 +656,7 @@ include_once (G4_ADMIN_PATH."/admin.head.php");
<input type="text" id="de_register" name="de_register" value="<?=$default[de_register]?>" size="30" required itemid="프로그램 등록번호" name="프로그램 등록번호">
</td>
</tr>
</tbody>
</table>
@ -711,6 +714,7 @@ function byte_check(el_cont, el_byte)
<table>
<caption>SMS 내용설정</caption>
<tbody>
<tr>
<?
$sms_title = array (1=>"회원가입시", "주문서작성시", "입금확인시", "상품배송시");
@ -721,7 +725,7 @@ $sms_daesang = array (1=>"고객님께 발송", "관리자께 발송", "고객
<table>
<tr><td align=center><b><?=$sms_title[$i]?></b></td></tr>
<tr><td align=center><font color=#777777>(<?=$sms_daesang[$i]?>)</font></td></tr>
</table><br>
</table>
<table width=165 height=191 cellpadding=0 cellspacing=0 background='./img/sms_back.gif'>
<tr>
<td align=center><textarea cols='16' rows='6' id='de_sms_cont<?=$i?>' name='de_sms_cont<?=$i?>' wrap=virtual ONKEYUP="byte_check('de_sms_cont<?=$i?>', 'byte<?=$i?>');" style='OVERFLOW: hidden; border:solid 0; width: 100px; background-color:#C4FFFF; FONT-SIZE: 9pt; font-family:굴림체;'><?=$default["de_sms_cont".$i]?></textarea></td>
@ -735,11 +739,12 @@ $sms_daesang = array (1=>"고객님께 발송", "관리자께 발송", "고객
</script>
<? } ?>
</tr>
</table><br>
</tbody>
</table>
<table>
<caption>SMS 환경설정</caption>
<tbody>
<tr>
<th scope="row"><label for="de_sms_use">SMS 사용</label></th>
<td colspan="4">

10
adm/shop_admin/itemform.php
View File

@ -415,8 +415,8 @@ if ($ii) {
$img_url = G4_DATA_URL."/item/$it_id/{$it[$idx]}";
if (file_exists($img) && is_file($img)) {
$size = getimagesize($img);
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('img$i', $size[0], $size[1]);\"><input type="checkbox" id="it_img" name="it_img"{$i}_del value='1'>삭제";
echo "<span id="img"{$i} style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$img_url' border=1></div>";
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('img$i', $size[0], $size[1]);\"><input type=\"checkbox\" id=\"it_img\" name=\"it_img{$i}_del\" value=\"1\">삭제";
echo "<span id=\"img{$i}\" style=\"left:0; top:0; z-index:+1; display:none; position:absolute;\"><img src=\"$img_url\" border=1></div>";
}
?>
</td>
@ -628,7 +628,7 @@ if ($ii) {
$comma = "";
$sql = " select b.ev_id, b.ev_subject
from $g4[yc4_event_item_table] a
left join $g4[yc4_event_table] b on (a.ev_id="b".ev_id)
left join $g4[yc4_event_table] b on (a.ev_id=b.ev_id)
where a.it_id = '$it_id'
order by b.ev_id desc ";
$result = sql_query($sql);
@ -730,7 +730,7 @@ if ($ii) {
$himg_str = "";
$himg = G4_DATA_PATH."/item/{$it[it_id]}_h";
if (file_exists($himg)) {
echo "<input type="checkbox" id="it_himg_del" name="it_himg_del" value='1'>삭제";
echo "<input type=\"checkbox\" id=\"it_himg_del\" name=\"it_himg_del\" value=\"1\">삭제";
$himg_str = "<img src='$himg' border=0>";
}
?>
@ -747,7 +747,7 @@ if ($ii) {
$timg_str = "";
$timg = G4_DATA_PATH."/item/{$it[it_id]}_t";
if (file_exists($timg)) {
echo "<input type="checkbox" id="it_timg_del" name="it_timg_del" value='1'>삭제";
echo "<input type=\"checkbox\" id=\"it_timg_del\" name=\"it_timg_del\" value=\"1\">삭제";
$timg_str = "<img src='$timg' border=0>";
}
?>

7
bbs/password_lost.php
View File

@ -1,6 +1,6 @@
<?
define('G4_CAPTCHA', 1);
include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_member) {
alert("이미 로그인중입니다.");
@ -10,9 +10,10 @@ $g4['title'] = '회원아이디/패스워드 찾기';
include_once(G4_PATH.'/head.sub.php');
if ($g4['https_url'])
$action_url = "{$g4['https_url']}/{$g4['bbs']}/password_lost2.php";
//$action_url = "{$g4['https_url']}/{$g4['bbs']}/password_lost2.php";
$action_url = G4_BBS_URL."/password_lost2.php";
else
$action_url = "{$g4['bbs_url']}/password_lost2.php";
$action_url = G4_BBS_URL."/password_lost2.php";
include_once($member_skin_path.'/password_lost.skin.php');

2
bbs/password_lost2.php
View File

@ -1,6 +1,6 @@
<?
define('G4_CAPTCHA', 1);
include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G4_PATH.'/lib/mailer.lib.php');
if ($is_member) {

10
css/default.css
View File

@ -303,6 +303,16 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
.sch_datetime {display:inline-block;margin-right:15px;color:#999}
.sch_word {font-weight:bold} /* 검색어 강조 */
/* 우편번호 검색 */
#post_code fieldset {margin:0 auto 10px;padding:15px 10px;width:87%;text-align:center}
#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%}
#post_code dt {margin-bottom:15px;color:#109ff1}
#post_code dd {margin:0;padding:0}
#post_code ul {margin:0;padding:0;list-style:none}
#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #eee;color:#000;text-decoration:none}
#post_code p {margin:0 auto 30px;width:90%}
.post_code {display:inline-block;width:50px;color:#999}
/* 게시판 쓰기 */
#bo_w caption {padding:0;height:0;overflow:hidden}

1
shop/orderform.php
View File

@ -3,6 +3,7 @@ include_once('./_common.php');
set_session('ss_direct', $sw_direct);
$uq_id = get_session('ss_uniqid');
if($sw_direct != 1)

6
shop/settle_kcp.inc.php
View File

@ -3,6 +3,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$test = "";
<<<<<<< HEAD
$default['de_card_test'] = 1;
$default['de_escrow_use'] = 1;
=======
>>>>>>> a811b2f9cff6268823ba4ef76b9e57769cf04bc6
if ($default['de_card_test']) {
if ($default['de_escrow_use'] == 1) {
// 에스크로결제 테스트
@ -21,6 +26,7 @@ else {
$default['de_kcp_mid'] = "SR".$default['de_kcp_mid'];
}
if (strtolower($g4['charset']) == 'utf-8')
$g_conf_js_url = "https://pay.kcp.co.kr/plugin/payplus{$test}_un.js";
else

8
skin/member/neo/zip.skin.php
View File

@ -12,10 +12,10 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type="hidden" name="frm_addr1" value="<?=$frm_addr1?>">
<input type="hidden" name="frm_addr2" value="<?=$frm_addr2?>">
<fieldset>
<fieldset class="cbg">
<label for="addr1">동/읍/면/리 검색</label>
<input type="text" id="addr1" name="addr1" class="fieldset_input" value="<?=$addr1?>" required minlength=2>
<input type="submit" class="fieldset_submit" value="검색">
<input type="text" id="addr1" name="addr1" class="fs_input" value="<?=$addr1?>" required minlength=2>
<input type="submit" class="fs_submit" value="검색">
</fieldset>
<!-- 검색결과 여기서부터 -->
@ -26,7 +26,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($search_count > 0) { ?>
<dl>
<dl class="cbg">
<dt>총 <?=$search_count?>건 가나다순 정렬</dt>
<dd>
<ul>