Merge branch 'master' of github.com:gnuboard/g5

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']}' ");
 
 // 최근게시물 삭제

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

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;
 }
 
 // 파일을 첨부함

plugin/editor/cheditor5/imageUpload/upload.php

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

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(