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

This commit is contained in:
projectSylas
2021-12-21 04:59:20 +00:00
21 changed files with 47 additions and 23 deletions

View File

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

View File

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

View File

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