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

adm/member_form.php

@@ -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>

adm/shop_admin/itemform.php

@@ -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 "<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 "<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>";
         }
         ?>

bbs/password_lost.php

@@ -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');
 

bbs/password_lost2.php

@@ -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) {

shop/orderform.php

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

shop/settle_kcp.inc.php

@@ -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