Merge remote-tracking branch 'origin/master' into inicert

shop/inicis/libs/sha256.inc.php

@@ -73,7 +73,9 @@ if (!class_exists('nanoSha2'))
         var     $platform;
 
         // Php 4 - 6 compatable constructor
-        function nanoSha2($toUpper = false) {
+        // PHP Deprecated:  Methods with the same name as their class will not be constructors in a future version of PHP
+        // function nanoSha2($toUpper = false) {
+        function __construct($toUpper = false) {
             // Determine if the caller wants upper case or not.
             $this->toUpper = is_bool($toUpper)
                            ? $toUpper

shop/settle_inicis.inc.php

@@ -102,6 +102,7 @@ $BANK_CODE = array(
     '88' => '신한은행',
     '89' => '케이뱅크',
     '90' => '카카오뱅크',
+    '92' => '토스뱅크',
     'D1' => '동양종합금융증권',
     'D2' => '현대증권',
     'D3' => '미래에셋증권',

shop/settle_naverpay.inc.php

@@ -1,5 +1,6 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+if (!defined('G5_SHOP_DIRECT_NAVERPAY') || !G5_SHOP_DIRECT_NAVERPAY) return;
 
 if(!$is_admin && !$default['de_card_test'] && $default['de_naverpay_test']) {
     if($default['de_naverpay_mb_id'] && ($is_guest || $member['mb_id'] != $default['de_naverpay_mb_id']))