From 6900423a0c158f142d6f8451b03a269f53022add Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 22 Mar 2021 15:05:27 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=94=EB=93=9C=20JSON?= =?UTF-8?q?=20=EB=AA=A8=EB=93=88=20=EC=82=AC=EC=9A=A9=EC=8B=9C=20EUC-KR=20?= =?UTF-8?q?=EB=A1=9C=20=EB=AC=B8=EC=9E=90=EC=97=B4=EC=9D=84=20=EB=B3=80?= =?UTF-8?q?=ED=99=98=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/sms5/sms5.lib.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/plugin/sms5/sms5.lib.php b/plugin/sms5/sms5.lib.php index e9a22330d..1165fa82b 100644 --- a/plugin/sms5/sms5.lib.php +++ b/plugin/sms5/sms5.lib.php @@ -162,10 +162,15 @@ if($config['cf_sms_type'] == 'LMS') { var $Log = array(); function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) { - // EUC-KR로 변환 - $strCaller = iconv_euckr($strCaller); - $strSubject = iconv_euckr($strSubject); - $strData = iconv_euckr($strData); + global $config; + + // 아이코드 JSON 모듈은 UTF-8 을 사용하며, sms 또는 lms 는 euc-kr 로 사용한다. + if(! (isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'])){ + // EUC-KR로 변환 + $strCaller = iconv_euckr($strCaller); + $strSubject = iconv_euckr($strSubject); + $strData = iconv_euckr($strData); + } return parent::Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount); } From 78dcd927b881f2e91208f6648677bf63eecf115f Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 2 Apr 2021 11:40:50 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=84=A4=EB=AA=85?= =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/delete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/delete.php b/bbs/delete.php index 94f5ff665..d3bb6b438 100644 --- a/bbs/delete.php +++ b/bbs/delete.php @@ -111,7 +111,7 @@ while ($row = sql_fetch_array($result)) } } -// 게시글 삭제 +// 게시글과 댓글 삭제 sql_query(" delete from $write_table where wr_parent = '{$write['wr_id']}' "); // 최근게시물 삭제 From c10f1960750444782a31c895df05511941c6f86c Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 5 Apr 2021 15:51:49 +0900 Subject: [PATCH 3/5] =?UTF-8?q?php=205.3=20=EB=B2=84=EC=A0=84=20=EC=9D=B4?= =?UTF-8?q?=ED=95=98=EC=97=90=EC=84=9C=20=EB=A9=94=EC=9D=BC=EC=9D=84=20?= =?UTF-8?q?=EB=B3=B4=EB=82=BC=EC=88=98=20=EC=97=86=EB=8A=94=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20HOOK=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mailer.lib.php | 61 ++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/lib/mailer.lib.php b/lib/mailer.lib.php index 229ed97d9..10a0fcc46 100644 --- a/lib/mailer.lib.php +++ b/lib/mailer.lib.php @@ -18,35 +18,48 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc= $result = run_replace('mailer', $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc); - if( isset($result['return']) ){ + if( is_array($result) && isset($result['return']) ){ return $result['return']; } - $mail = new PHPMailer(); // defaults to using php "mail()" - if (defined('G5_SMTP') && G5_SMTP) { - $mail->IsSMTP(); // telling the class to use SMTP - $mail->Host = G5_SMTP; // SMTP server - if(defined('G5_SMTP_PORT') && G5_SMTP_PORT) - $mail->Port = G5_SMTP_PORT; - } - $mail->CharSet = 'UTF-8'; - $mail->From = $fmail; - $mail->FromName = $fname; - $mail->Subject = $subject; - $mail->AltBody = ""; // optional, comment out and test - $mail->msgHTML($content); - $mail->addAddress($to); - if ($cc) - $mail->addCC($cc); - if ($bcc) - $mail->addBCC($bcc); - //print_r2($file); exit; - if ($file != "") { - foreach ($file as $f) { - $mail->addAttachment($f['path'], $f['name']); + $mail_send_result = false; + + try { + $mail = new PHPMailer(); // defaults to using php "mail()" + if (defined('G5_SMTP') && G5_SMTP) { + $mail->IsSMTP(); // telling the class to use SMTP + $mail->Host = G5_SMTP; // SMTP server + if(defined('G5_SMTP_PORT') && G5_SMTP_PORT) + $mail->Port = G5_SMTP_PORT; } + $mail->CharSet = 'UTF-8'; + $mail->From = $fmail; + $mail->FromName = $fname; + $mail->Subject = $subject; + $mail->AltBody = ""; // optional, comment out and test + $mail->msgHTML($content); + $mail->addAddress($to); + if ($cc) + $mail->addCC($cc); + if ($bcc) + $mail->addBCC($bcc); + //print_r2($file); exit; + if ($file != "") { + foreach ($file as $f) { + $mail->addAttachment($f['path'], $f['name']); + } + } + + $mail = run_replace('mail_options', $mail, $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc); + + $mail_send_result = $mail->send(); + + } catch (Exception $e) { } - return $mail->send(); + + run_event('mail_send_result', $mail_send_result, $mail, $to, $cc, $bcc); + + return $mail_send_result; } // 파일을 첨부함 From 595bfbaf113162a8e220099f35cbb71361116215 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 5 Apr 2021 16:54:17 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=85=EB=A1=9C=EB=93=9C=20HOOK=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/editor/cheditor5/imageUpload/upload.php | 2 ++ plugin/editor/smarteditor2/photo_uploader/popup/php/index.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugin/editor/cheditor5/imageUpload/upload.php b/plugin/editor/cheditor5/imageUpload/upload.php index 0c345ed86..0d675e91b 100644 --- a/plugin/editor/cheditor5/imageUpload/upload.php +++ b/plugin/editor/cheditor5/imageUpload/upload.php @@ -69,6 +69,8 @@ if( !$is_editor_upload ){ exit; } +run_event('cheditor_photo_upload', $data_dir, $data_url); + //---------------------------------------------------------------------------- // // diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php index 510ac0f24..65d69c051 100644 --- a/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php +++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/index.php @@ -40,6 +40,8 @@ if( isset($_GET['_nonce']) && ft_nonce_is_valid( $_GET['_nonce'] , 'smarteditor' } if( $is_editor_upload ) { + + run_event('smarteditor_photo_upload', $data_dir, $data_url); require('UploadHandler.php'); $options = array( From 591f07dd0e6bb197738d3485458368434d200314 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 5 Apr 2021 16:57:33 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.5.3=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index 95a9bc288..fa3c92ec9 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.5.2'); +define('G5_GNUBOARD_VER', '5.4.5.3'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);