firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

버전 5.4.5.3 수정

Browse Source
This commit is contained in:
thisgun
2021-04-05 17:02:24 +09:00
parent 17e9f13275 591f07dd0e
commit d3d0403892
6 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/delete.php
View File

@ -111,7 +111,7 @@ while ($row = sql_fetch_array($result))
} }
} }
// 게시글 삭제 // 게시글과 댓글 삭제
sql_query(" delete from $write_table where wr_parent = '{$write['wr_id']}' "); sql_query(" delete from $write_table where wr_parent = '{$write['wr_id']}' ");
// 최근게시물 삭제 // 최근게시물 삭제

4
config.php
View File

@ -5,8 +5,8 @@
********************/ ********************/
define('G5_VERSION', '그누보드5'); define('G5_VERSION', '그누보드5');
define('G5_GNUBOARD_VER', '5.4.5.2'); define('G5_GNUBOARD_VER', '5.4.5.3');
define('G5_YOUNGCART_VER', '5.4.5.2'); define('G5_YOUNGCART_VER', '5.4.5.3');
// 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
define('_GNUBOARD_', true); define('_GNUBOARD_', true);

17
lib/mailer.lib.php
View File

@ -18,10 +18,13 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc=
$result = run_replace('mailer', $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc); $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']; return $result['return'];
} }
$mail_send_result = false;
try {
$mail = new PHPMailer(); // defaults to using php "mail()" $mail = new PHPMailer(); // defaults to using php "mail()"
if (defined('G5_SMTP') && G5_SMTP) { if (defined('G5_SMTP') && G5_SMTP) {
$mail->IsSMTP(); // telling the class to use SMTP $mail->IsSMTP(); // telling the class to use SMTP
@ -46,7 +49,17 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc=
$mail->addAttachment($f['path'], $f['name']); $mail->addAttachment($f['path'], $f['name']);
} }
} }
return $mail->send();
$mail = run_replace('mail_options', $mail, $fname, $fmail, $to, $subject, $content, $type, $file, $cc, $bcc);
$mail_send_result = $mail->send();
} catch (Exception $e) {
}
run_event('mail_send_result', $mail_send_result, $mail, $to, $cc, $bcc);
return $mail_send_result;
} }
// 파일을 첨부함 // 파일을 첨부함

2
plugin/editor/cheditor5/imageUpload/upload.php
View File

@ -69,6 +69,8 @@ if( !$is_editor_upload ){
exit; exit;
} }
run_event('cheditor_photo_upload', $data_dir, $data_url);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// //
// //

2
plugin/editor/smarteditor2/photo_uploader/popup/php/index.php
View File

@ -41,6 +41,8 @@ if( isset($_GET['_nonce']) && ft_nonce_is_valid( $_GET['_nonce'] , 'smarteditor'
if( $is_editor_upload ) { if( $is_editor_upload ) {
run_event('smarteditor_photo_upload', $data_dir, $data_url);
require('UploadHandler.php'); require('UploadHandler.php');
$options = array( $options = array(
'upload_dir' => $data_dir, 'upload_dir' => $data_dir,

5
plugin/sms5/sms5.lib.php
View File

@ -162,10 +162,15 @@ if($config['cf_sms_type'] == 'LMS') {
var $Log = array(); var $Log = array();
function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) { function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) {
global $config;
// 아이코드 JSON 모듈은 UTF-8 을 사용하며, sms 또는 lms 는 euc-kr 로 사용한다.
if(! (isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'])){
// EUC-KR로 변환 // EUC-KR로 변환
$strCaller = iconv_euckr($strCaller); $strCaller = iconv_euckr($strCaller);
$strSubject = iconv_euckr($strSubject); $strSubject = iconv_euckr($strSubject);
$strData = iconv_euckr($strData); $strData = iconv_euckr($strData);
}
return parent::Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount); return parent::Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount);
} }