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

Conflicts:
	shop/settle_kcp.inc.php

bbs/register.php

@@ -9,10 +9,10 @@ if ($is_member) {
 // 세션을 지웁니다.
 set_session("ss_mb_reg", "");
 
-if ($g4['https_url']) {
-    $register_action_url = $g4['https_url'].'/'.$g4['bbs'].'/register_form.php';
+if (G4_HTTPS_URL) {
+    $register_action_url = G4_HTTPS_URL.'/bbs/register_form.php';
 } else {
-    $register_action_url = $g4['bbs_url'].'/register_form.php';
+    $register_action_url = G4_BBS_URL.'/register_form.php';
 }
 
 $g4['title'] = '회원가입약관';

bbs/scrap_popin.php

@@ -21,7 +21,7 @@ HEREDOC;
 
 echo <<<HEREDOC
 <script>
-    if (window.name != 'scrap') {
+    if (window.name != 'win_scrap') {
         alert('올바른 방법으로 사용해 주십시오.');
         window.close();
     }