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

lib/common.lib.php

@@ -3337,7 +3337,8 @@ function check_url_host($url, $msg='', $return_url=G5_URL, $is_redirect=false)
     if(!$msg)
         $msg = 'url에 타 도메인을 지정할 수 없습니다.';
 
-    $p = @parse_url($url);
+    $url = urldecode($url);
+    $p = @parse_url(trim($url));
     $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
     $is_host_check = false;
     

lib/shop.lib.php

@@ -2464,9 +2464,9 @@ function shop_is_taxsave($od, $is_view_receipt=false){
 	if( $od['od_settle_case'] == '무통장' ){
 		$od_pay_type = 'account';
 	} else if ( $od['od_settle_case'] == '계좌이체' ) {
-		$od_pay_type = 'vbank';
-	} else if ( $od['od_settle_case'] == '가상계좌' ) {
 		$od_pay_type = 'transfer';
+	} else if ( $od['od_settle_case'] == '가상계좌' ) {
+		$od_pay_type = 'vbank';
 	}
 	
 	if( $od_pay_type ) {

lib/uri.lib.php

@@ -193,7 +193,7 @@ function correct_goto_url($url){
 	return $url;
 }
 
-function generate_seo_title($string, $wordLimit=G5_SEO_TITEL_WORD_CUT){
+function generate_seo_title($string, $wordLimit=G5_SEO_TITLE_WORD_CUT){
     $separator = '-';
     
     if($wordLimit != 0){