From 1d3edaf62e4e76bd3f4db81715cfbe956c2c304a Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 4 Aug 2015 10:41:16 +0900 Subject: [PATCH 1/5] =?UTF-8?q?parse=5Furl=20=ED=95=A8=EC=88=98=EC=97=90?= =?UTF-8?q?=20=EB=B0=9C=EC=83=9D=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EB=8C=80=EC=9D=91=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/logout.php | 6 +++--- common.php | 2 +- lib/common.lib.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bbs/logout.php b/bbs/logout.php index 7aa5f34b9..3bcb99cef 100644 --- a/bbs/logout.php +++ b/bbs/logout.php @@ -2,8 +2,8 @@ include_once('./_common.php'); // 이호경님 제안 코드 -session_unset(); // 모든 세션변수를 언레지스터 시켜줌 -session_destroy(); // 세션해제함 +session_unset(); // 모든 세션변수를 언레지스터 시켜줌 +session_destroy(); // 세션해제함 // 자동로그인 해제 -------------------------------- set_cookie('ck_mb_id', '', 0); @@ -11,7 +11,7 @@ set_cookie('ck_auto', '', 0); // 자동로그인 해제 end -------------------------------- if ($url) { - $p = parse_url($url); + $p = @parse_url($url); if ($p['scheme'] || $p['host']) { alert('url에 도메인을 지정할 수 없습니다.'); } diff --git a/common.php b/common.php index 2d7afe328..89fa4f8da 100644 --- a/common.php +++ b/common.php @@ -319,7 +319,7 @@ if (isset($_REQUEST['url'])) { $url = ''; $urlencode = urlencode($_SERVER['REQUEST_URI']); if (G5_DOMAIN) { - $p = parse_url(G5_DOMAIN); + $p = @parse_url(G5_DOMAIN); $urlencode = G5_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode)); } } diff --git a/lib/common.lib.php b/lib/common.lib.php index c5baf7d4e..51561d7b0 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2066,7 +2066,7 @@ function delete_editor_thumbnail($contents) for($i=0; $i Date: Tue, 18 Aug 2015 10:02:49 +0900 Subject: [PATCH 2/5] =?UTF-8?q?SMS=20=EC=82=AC=EC=9A=A9=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 2 +- adm/sms_admin/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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']); } From e1ef69a0c48d689cebc9db70929597b81f910f3e Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 18 Aug 2015 15:11:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?sql=5Fmode=20=EC=B2=B4=ED=81=AC=20=ED=9B=84?= =?UTF-8?q?=20=EB=8C=80=EC=9D=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); ?>
From 58902f97c4eb8a9d1275b465743be99d3d8255c3 Mon Sep 17 00:00:00 2001 From: kagla Date: Thu, 20 Aug 2015 18:33:36 +0900 Subject: [PATCH 4/5] =?UTF-8?q?escapeshellarg=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9D=BC=EB=B6=80=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EB=B9=88=EA=B0=92=EC=9D=BC?= =?UTF-8?q?=EB=95=8C=20''=20=EA=B2=B0=EA=B3=BC=EA=B0=80=20=EB=84=98?= =?UTF-8?q?=EC=96=B4=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=EA=B0=80=20=EC=9E=88=EC=8A=B5=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcpcert/lib/ct_cli_lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ); From 36e88a6a2dffea9580ef975110968f534596cc68 Mon Sep 17 00:00:00 2001 From: kagla Date: Fri, 21 Aug 2015 17:44:21 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=EC=9D=98=20?= =?UTF-8?q?=EC=98=A4=EB=A6=AC=EC=A7=80=EB=84=90=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20ori=20=EB=A1=9C=20?= =?UTF-8?q?=EB=84=98=EA=B8=B0=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; }