BugTrack/2420 AutoTicketLink - Improve regex and JSON encode

[pukiwiki/pukiwiki.git] / lib / mail.php

diff --git a/lib/mail.php b/lib/mail.php
index f970f4a..2645991 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -1,13 +1,82 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: mail.php,v 1.4 2005/05/22 03:20:52 henoheno Exp $
-// Copyright (C)
-//   2003-2005 PukiWiki Developers Team
+// mail.php
+// Copyright
+//   2003-2017 PukiWiki Development Team
 //   2003      Originally written by upk
 // License: GPL v2 or (at your option) any later version
 //
 // E-mail related functions
 
+// Send a mail to the administrator
+function pkwk_mail_notify($subject, $message, $footer = array())
+{
+       global $smtp_server, $smtp_auth, $notify_to, $notify_from, $notify_header;
+       static $_to, $_headers, $_after_pop;
+
+       // Init and lock
+       if (! isset($_to)) {
+               if (! PKWK_OPTIMISE) {
+                       // Validation check
+                       $func = 'pkwk_mail_notify(): ';
+                       $mail_regex   = '/[^@]+@[^@]{1,}\.[^@]{2,}/';
+                       if (! preg_match($mail_regex, $notify_to))
+                               die($func . 'Invalid $notify_to');
+                       if (! preg_match($mail_regex, $notify_from))
+                               die($func . 'Invalid $notify_from');
+                       if ($notify_header != '') {
+                               $header_regex = "/\A(?:\r\n|\r|\n)|\r\n\r\n/";
+                               if (preg_match($header_regex, $notify_header))
+                                       die($func . 'Invalid $notify_header');
+                               if (preg_match('/^From:/im', $notify_header))
+                                       die($func . 'Redundant \'From:\' in $notify_header');
+                       }
+               }
+
+               $_to      = $notify_to;
+               $_headers =
+                       'X-Mailer: PukiWiki/' . S_VERSION .
+                       ' PHP/' . phpversion() . "\r\n" .
+                       'From: ' . $notify_from;
+                       
+               // Additional header(s) by admin
+               if ($notify_header != '') $_headers .= "\r\n" . $notify_header;
+
+               $_after_pop = $smtp_auth;
+       }
+
+       if ($subject == '' || ($message == '' && empty($footer))) return FALSE;
+
+       // Subject:
+       if (isset($footer['PAGE'])) $subject = str_replace('$page', $footer['PAGE'], $subject);
+
+       // Footer
+       if (isset($footer['REMOTE_ADDR'])) $footer['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
+       if (isset($footer['USER_AGENT']))
+               $footer['USER_AGENT']  = '(' . UA_PROFILE . ') ' . UA_NAME . '/' . UA_VERS;
+       if (! empty($footer)) {
+               $_footer = '';
+               if ($message != '') $_footer = "\n" . str_repeat('-', 30) . "\n";
+               foreach($footer as $key => $value)
+                       $_footer .= $key . ': ' . $value . "\n";
+               $message .= $_footer;
+       }
+
+       // Wait POP/APOP auth completion
+       if ($_after_pop) {
+               $result = pop_before_smtp();
+               if ($result !== TRUE) die($result);
+       }
+
+       ini_set('SMTP', $smtp_server);
+       mb_language(LANG);
+       if ($_headers == '') {
+               return mb_send_mail($_to, $subject, $message);
+       } else {
+               return mb_send_mail($_to, $subject, $message, $_headers);
+       }
+}
+
 // APOP/POP Before SMTP
 function pop_before_smtp($pop_userid = '', $pop_passwd = '',
        $pop_server = 'localhost', $pop_port = 110)
@@ -83,4 +152,4 @@ function pop_before_smtp($pop_userid = '', $pop_passwd = '',
                return TRUE;    // Success
        }
 }
-?>
+