diff --git a/adm/config_form.php b/adm/config_form.php index eafa0ebb0..6535f2272 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -209,7 +209,7 @@ $frm_submit = '
if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124'; if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; -if ($config['cf_icode_id'] && $config['cf_icode_pw']) { +if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); } ?> diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php index 017b5a333..858cfb313 100644 --- a/adm/sms_admin/config.php +++ b/adm/sms_admin/config.php @@ -9,7 +9,7 @@ $g5['title'] = "SMS 기본설정"; if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124'; if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; -if ($config['cf_icode_id'] && $config['cf_icode_pw']) +if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); } diff --git a/install/install_db.php b/install/install_db.php index f7fbf935f..d32745f86 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -53,10 +53,12 @@ if (!$select_db) { $mysql_set_mode = 'false'; @mysql_query('set names utf8'); -if(version_compare(mysql_get_server_info(), '5.6.6', '>=') == 1) { +$row = mysql_fetch_assoc(mysql_query(" SELECT @@sql_mode as mode ")); +if($row['mode']) { @mysql_query("SET SESSION sql_mode = ''"); $mysql_set_mode = 'true'; } +unset($row); ?>
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 15ad429fc..a40cb99e4 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -59,15 +59,19 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ if($tname) { if($edt) { + // 오리지날 이미지 + $ori = G5_URL.$data_path; + // 썸네일 이미지 $src = G5_URL.str_replace($filename, $tname, $data_path); } else { + $ori = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename; $src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname; } } else { return false; } - $thumb = array("src"=>$src, "alt"=>$alt); + $thumb = array("src"=>$src, "ori"=>$ori, "alt"=>$alt); return $thumb; } diff --git a/plugin/kcpcert/lib/ct_cli_lib.php b/plugin/kcpcert/lib/ct_cli_lib.php index cdd5d8177..77c629bd3 100644 --- a/plugin/kcpcert/lib/ct_cli_lib.php +++ b/plugin/kcpcert/lib/ct_cli_lib.php @@ -93,7 +93,9 @@ class C_CT_CLI while ( list(,$i) = each($arg) ) { - $exec_cmd .= " " . escapeshellarg( $i ); + // 일부서버의 경우 빈값일때 '' 결과가 넘어오지 않는 버그가 있다. kagla 150820 + //$exec_cmd .= " " . escapeshellarg( $i ); + $exec_cmd .= " " . ( escapeshellarg($i) ? escapeshellarg($i) : "''" ); } $rt = exec( $exec_cmd );