[Web] Update phpmailer, always use correct path for vars.inc.php
This commit is contained in:
		
							
								
								
									
										11
									
								
								data/web/inc/lib/composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										11
									
								
								data/web/inc/lib/composer.lock
									
									
									
										generated
									
									
									
								
							| @@ -8,19 +8,20 @@ | |||||||
|     "packages": [ |     "packages": [ | ||||||
|         { |         { | ||||||
|             "name": "phpmailer/phpmailer", |             "name": "phpmailer/phpmailer", | ||||||
|             "version": "v5.2.23", |             "version": "v5.2.25", | ||||||
|             "source": { |             "source": { | ||||||
|                 "type": "git", |                 "type": "git", | ||||||
|                 "url": "https://github.com/PHPMailer/PHPMailer.git", |                 "url": "https://github.com/PHPMailer/PHPMailer.git", | ||||||
|                 "reference": "7115df4a6f76281109ebe352900c42403b728bb4" |                 "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915" | ||||||
|             }, |             }, | ||||||
|             "dist": { |             "dist": { | ||||||
|                 "type": "zip", |                 "type": "zip", | ||||||
|                 "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/7115df4a6f76281109ebe352900c42403b728bb4", |                 "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2baf20b01690fba8cf720c1ebcf9b988eda50915", | ||||||
|                 "reference": "7115df4a6f76281109ebe352900c42403b728bb4", |                 "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915", | ||||||
|                 "shasum": "" |                 "shasum": "" | ||||||
|             }, |             }, | ||||||
|             "require": { |             "require": { | ||||||
|  |                 "ext-ctype": "*", | ||||||
|                 "php": ">=5.0.0" |                 "php": ">=5.0.0" | ||||||
|             }, |             }, | ||||||
|             "require-dev": { |             "require-dev": { | ||||||
| @@ -80,7 +81,7 @@ | |||||||
|                 } |                 } | ||||||
|             ], |             ], | ||||||
|             "description": "PHPMailer is a full-featured email creation and transfer class for PHP", |             "description": "PHPMailer is a full-featured email creation and transfer class for PHP", | ||||||
|             "time": "2017-03-15T19:32:56+00:00" |             "time": "2017-08-28T11:12:07+00:00" | ||||||
|         }, |         }, | ||||||
|         { |         { | ||||||
|             "name": "robthree/twofactorauth", |             "name": "robthree/twofactorauth", | ||||||
|   | |||||||
							
								
								
									
										13
									
								
								data/web/inc/lib/vendor/composer/installed.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								data/web/inc/lib/vendor/composer/installed.json
									
									
									
									
										vendored
									
									
								
							| @@ -91,20 +91,21 @@ | |||||||
|     }, |     }, | ||||||
|     { |     { | ||||||
|         "name": "phpmailer/phpmailer", |         "name": "phpmailer/phpmailer", | ||||||
|         "version": "v5.2.23", |         "version": "v5.2.25", | ||||||
|         "version_normalized": "5.2.23.0", |         "version_normalized": "5.2.25.0", | ||||||
|         "source": { |         "source": { | ||||||
|             "type": "git", |             "type": "git", | ||||||
|             "url": "https://github.com/PHPMailer/PHPMailer.git", |             "url": "https://github.com/PHPMailer/PHPMailer.git", | ||||||
|             "reference": "7115df4a6f76281109ebe352900c42403b728bb4" |             "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915" | ||||||
|         }, |         }, | ||||||
|         "dist": { |         "dist": { | ||||||
|             "type": "zip", |             "type": "zip", | ||||||
|             "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/7115df4a6f76281109ebe352900c42403b728bb4", |             "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2baf20b01690fba8cf720c1ebcf9b988eda50915", | ||||||
|             "reference": "7115df4a6f76281109ebe352900c42403b728bb4", |             "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915", | ||||||
|             "shasum": "" |             "shasum": "" | ||||||
|         }, |         }, | ||||||
|         "require": { |         "require": { | ||||||
|  |             "ext-ctype": "*", | ||||||
|             "php": ">=5.0.0" |             "php": ">=5.0.0" | ||||||
|         }, |         }, | ||||||
|         "require-dev": { |         "require-dev": { | ||||||
| @@ -130,7 +131,7 @@ | |||||||
|         "suggest": { |         "suggest": { | ||||||
|             "league/oauth2-google": "Needed for Google XOAUTH2 authentication" |             "league/oauth2-google": "Needed for Google XOAUTH2 authentication" | ||||||
|         }, |         }, | ||||||
|         "time": "2017-03-15T19:32:56+00:00", |         "time": "2017-08-28T11:12:07+00:00", | ||||||
|         "type": "library", |         "type": "library", | ||||||
|         "installation-source": "dist", |         "installation-source": "dist", | ||||||
|         "autoload": { |         "autoload": { | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/.github/ISSUE_TEMPLATE.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/.github/ISSUE_TEMPLATE.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | Non-security issues and pull requests are no longer being accepted for the legacy PHPMailer 5.2 branch. Migrate to PHPMailer 6.0 (or later) and report your issue there. | ||||||
							
								
								
									
										1
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/.github/PULL_REQUEST_TEMPLATE.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/.github/PULL_REQUEST_TEMPLATE.md
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | Non-security issues and pull requests are no longer being accepted for the legacy PHPMailer 5.2 branch. Migrate to PHPMailer 6.0 (or later) and report your issue there. | ||||||
| @@ -1 +1 @@ | |||||||
| 5.2.23 | 5.2.25 | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ class PHPMailer | |||||||
|      * The PHPMailer Version number. |      * The PHPMailer Version number. | ||||||
|      * @var string |      * @var string | ||||||
|      */ |      */ | ||||||
|     public $Version = '5.2.23'; |     public $Version = '5.2.25'; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Email priority. |      * Email priority. | ||||||
| @@ -440,9 +440,9 @@ class PHPMailer | |||||||
|      * |      * | ||||||
|      * Parameters: |      * Parameters: | ||||||
|      *   boolean $result        result of the send action |      *   boolean $result        result of the send action | ||||||
|      *   string  $to            email address of the recipient |      *   array   $to            email addresses of the recipients | ||||||
|      *   string  $cc            cc email addresses |      *   array   $cc            cc email addresses | ||||||
|      *   string  $bcc           bcc email addresses |      *   array   $bcc           bcc email addresses | ||||||
|      *   string  $subject       the subject |      *   string  $subject       the subject | ||||||
|      *   string  $body          the email body |      *   string  $body          the email body | ||||||
|      *   string  $from          email address of sender |      *   string  $from          email address of sender | ||||||
| @@ -1622,8 +1622,13 @@ class PHPMailer | |||||||
|  |  | ||||||
|         foreach ($hosts as $hostentry) { |         foreach ($hosts as $hostentry) { | ||||||
|             $hostinfo = array(); |             $hostinfo = array(); | ||||||
|             if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { |             if (!preg_match( | ||||||
|  |                 '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/', | ||||||
|  |                 trim($hostentry), | ||||||
|  |                 $hostinfo | ||||||
|  |             )) { | ||||||
|                 // Not a valid host entry |                 // Not a valid host entry | ||||||
|  |                 $this->edebug('Ignoring invalid host: ' . $hostentry); | ||||||
|                 continue; |                 continue; | ||||||
|             } |             } | ||||||
|             // $hostinfo[2]: optional ssl or tls prefix |             // $hostinfo[2]: optional ssl or tls prefix | ||||||
| @@ -1742,6 +1747,7 @@ class PHPMailer | |||||||
|             'dk' => 'da', |             'dk' => 'da', | ||||||
|             'no' => 'nb', |             'no' => 'nb', | ||||||
|             'se' => 'sv', |             'se' => 'sv', | ||||||
|  |             'sr' => 'rs' | ||||||
|         ); |         ); | ||||||
|  |  | ||||||
|         if (isset($renamed_langcodes[$langcode])) { |         if (isset($renamed_langcodes[$langcode])) { | ||||||
| @@ -2024,10 +2030,7 @@ class PHPMailer | |||||||
|     { |     { | ||||||
|         $result = ''; |         $result = ''; | ||||||
|  |  | ||||||
|         if ($this->MessageDate == '') { |         $result .= $this->headerLine('Date', $this->MessageDate == '' ? self::rfcDate() : $this->MessageDate); | ||||||
|             $this->MessageDate = self::rfcDate(); |  | ||||||
|         } |  | ||||||
|         $result .= $this->headerLine('Date', $this->MessageDate); |  | ||||||
|  |  | ||||||
|         // To be created automatically by mail() |         // To be created automatically by mail() | ||||||
|         if ($this->SingleTo) { |         if ($this->SingleTo) { | ||||||
| @@ -4033,7 +4036,7 @@ class phpmailerException extends Exception | |||||||
|      */ |      */ | ||||||
|     public function errorMessage() |     public function errorMessage() | ||||||
|     { |     { | ||||||
|         $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n"; |         $errorMsg = '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n"; | ||||||
|         return $errorMsg; |         return $errorMsg; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -34,7 +34,7 @@ class POP3 | |||||||
|      * @var string |      * @var string | ||||||
|      * @access public |      * @access public | ||||||
|      */ |      */ | ||||||
|     public $Version = '5.2.23'; |     public $Version = '5.2.25'; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Default POP3 port number. |      * Default POP3 port number. | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ class SMTP | |||||||
|      * The PHPMailer SMTP version number. |      * The PHPMailer SMTP version number. | ||||||
|      * @var string |      * @var string | ||||||
|      */ |      */ | ||||||
|     const VERSION = '5.2.23'; |     const VERSION = '5.2.25'; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * SMTP line break constant. |      * SMTP line break constant. | ||||||
| @@ -81,7 +81,7 @@ class SMTP | |||||||
|      * @deprecated Use the `VERSION` constant instead |      * @deprecated Use the `VERSION` constant instead | ||||||
|      * @see SMTP::VERSION |      * @see SMTP::VERSION | ||||||
|      */ |      */ | ||||||
|     public $Version = '5.2.23'; |     public $Version = '5.2.25'; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * SMTP server port number. |      * SMTP server port number. | ||||||
| @@ -151,9 +151,8 @@ class SMTP | |||||||
|     public $Timelimit = 300; |     public $Timelimit = 300; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * @var array patterns to extract smtp transaction id from smtp reply |      * @var array Patterns to extract an SMTP transaction id from reply to a DATA command. | ||||||
|      * Only first capture group will be use, use non-capturing group to deal with it |      * The first capture group in each regex will be used as the ID. | ||||||
|      * Extend this class to override this property to fulfil your needs. |  | ||||||
|      */ |      */ | ||||||
|     protected $smtp_transaction_id_patterns = array( |     protected $smtp_transaction_id_patterns = array( | ||||||
|         'exim' => '/[0-9]{3} OK id=(.*)/', |         'exim' => '/[0-9]{3} OK id=(.*)/', | ||||||
| @@ -161,6 +160,12 @@ class SMTP | |||||||
|         'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' |         'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @var string The last transaction ID issued in response to a DATA command, | ||||||
|  |      * if one was detected | ||||||
|  |      */ | ||||||
|  |     protected $last_smtp_transaction_id; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * The socket for the server connection. |      * The socket for the server connection. | ||||||
|      * @var resource |      * @var resource | ||||||
| @@ -227,7 +232,7 @@ class SMTP | |||||||
|                 break; |                 break; | ||||||
|             case 'html': |             case 'html': | ||||||
|                 //Cleans up output a bit for a better looking, HTML-safe output |                 //Cleans up output a bit for a better looking, HTML-safe output | ||||||
|                 echo htmlentities( |                 echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities( | ||||||
|                     preg_replace('/[\r\n]+/', '', $str), |                     preg_replace('/[\r\n]+/', '', $str), | ||||||
|                     ENT_QUOTES, |                     ENT_QUOTES, | ||||||
|                     'UTF-8' |                     'UTF-8' | ||||||
| @@ -709,6 +714,7 @@ class SMTP | |||||||
|         $savetimelimit = $this->Timelimit; |         $savetimelimit = $this->Timelimit; | ||||||
|         $this->Timelimit = $this->Timelimit * 2; |         $this->Timelimit = $this->Timelimit * 2; | ||||||
|         $result = $this->sendCommand('DATA END', '.', 250); |         $result = $this->sendCommand('DATA END', '.', 250); | ||||||
|  |         $this->recordLastTransactionID(); | ||||||
|         //Restore timelimit |         //Restore timelimit | ||||||
|         $this->Timelimit = $savetimelimit; |         $this->Timelimit = $savetimelimit; | ||||||
|         return $result; |         return $result; | ||||||
| @@ -989,7 +995,10 @@ class SMTP | |||||||
|     public function client_send($data) |     public function client_send($data) | ||||||
|     { |     { | ||||||
|         $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT); |         $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT); | ||||||
|         return fwrite($this->smtp_conn, $data); |         set_error_handler(array($this, 'errorHandler')); | ||||||
|  |         $result = fwrite($this->smtp_conn, $data); | ||||||
|  |         restore_error_handler(); | ||||||
|  |         return $result; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
| @@ -1089,8 +1098,10 @@ class SMTP | |||||||
|             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL); |             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL); | ||||||
|             $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL); |             $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL); | ||||||
|             $data .= $str; |             $data .= $str; | ||||||
|             // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen |             // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled), | ||||||
|             if ((isset($str[3]) and $str[3] == ' ')) { |             // or 4th character is a space, we are done reading, break the loop, | ||||||
|  |             // string array access is a micro-optimisation over strlen | ||||||
|  |             if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) { | ||||||
|                 break; |                 break; | ||||||
|             } |             } | ||||||
|             // Timed-out? Log and break |             // Timed-out? Log and break | ||||||
| @@ -1226,26 +1237,40 @@ class SMTP | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Will return the ID of the last smtp transaction based on a list of patterns provided |      * Extract and return the ID of the last SMTP transaction based on | ||||||
|      * in SMTP::$smtp_transaction_id_patterns. |      * a list of patterns provided in SMTP::$smtp_transaction_id_patterns. | ||||||
|  |      * Relies on the host providing the ID in response to a DATA command. | ||||||
|      * If no reply has been received yet, it will return null. |      * If no reply has been received yet, it will return null. | ||||||
|      * If no pattern has been matched, it will return false. |      * If no pattern was matched, it will return false. | ||||||
|      * @return bool|null|string |      * @return bool|null|string | ||||||
|      */ |      */ | ||||||
|     public function getLastTransactionID() |     protected function recordLastTransactionID() | ||||||
|     { |     { | ||||||
|         $reply = $this->getLastReply(); |         $reply = $this->getLastReply(); | ||||||
|  |  | ||||||
|         if (empty($reply)) { |         if (empty($reply)) { | ||||||
|             return null; |             $this->last_smtp_transaction_id = null; | ||||||
|         } |         } else { | ||||||
|  |             $this->last_smtp_transaction_id = false; | ||||||
|             foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { |             foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { | ||||||
|                 if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) { |                 if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) { | ||||||
|                 return $matches[1]; |                     $this->last_smtp_transaction_id = $matches[1]; | ||||||
|  |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         return false; |         return $this->last_smtp_transaction_id; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Get the queue/transaction ID of the last SMTP transaction | ||||||
|  |      * If no reply has been received yet, it will return null. | ||||||
|  |      * If no pattern was matched, it will return false. | ||||||
|  |      * @return bool|null|string | ||||||
|  |      * @see recordLastTransactionID() | ||||||
|  |      */ | ||||||
|  |     public function getLastTransactionID() | ||||||
|  |     { | ||||||
|  |         return $this->last_smtp_transaction_id; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -20,6 +20,7 @@ | |||||||
|         } |         } | ||||||
|     ], |     ], | ||||||
|     "require": { |     "require": { | ||||||
|  |         "ext-ctype": "*", | ||||||
|         "php": ">=5.0.0" |         "php": ">=5.0.0" | ||||||
|     }, |     }, | ||||||
|     "require-dev": { |     "require-dev": { | ||||||
|   | |||||||
| @@ -58,46 +58,53 @@ class phpmailerAppException extends phpmailerException | |||||||
| $example_code .= "\n\nclass phpmailerAppException extends phpmailerException {}"; | $example_code .= "\n\nclass phpmailerAppException extends phpmailerException {}"; | ||||||
| $example_code .= "\n\ntry {"; | $example_code .= "\n\ntry {"; | ||||||
|  |  | ||||||
|  | // Convert a string to its JavaScript representation. | ||||||
|  | function JSString($s) { | ||||||
|  |   static $from = array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'); | ||||||
|  |   static $to = array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\\"'); | ||||||
|  |   return is_null($s)? 'null': '"' . str_replace($from, $to, "$s") . '"'; | ||||||
|  | } | ||||||
|  |  | ||||||
| try { | try { | ||||||
|     if (isset($_POST["submit"]) && $_POST['submit'] == "Submit") { |     if (isset($_POST["submit"]) && $_POST['submit'] == "Submit") { | ||||||
|         $to = $_POST['To_Email']; |         $to = $to_email; | ||||||
|         if (!PHPMailer::validateAddress($to)) { |         if (!PHPMailer::validateAddress($to)) { | ||||||
|             throw new phpmailerAppException("Email address " . $to . " is invalid -- aborting!"); |             throw new phpmailerAppException("Email address " . $to . " is invalid -- aborting!"); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         $example_code .= "\n\$to = '{$_POST['To_Email']}';"; |         $example_code .= "\n\$to = '" . addslashes($to_email) . "';"; | ||||||
|         $example_code .= "\nif(!PHPMailer::validateAddress(\$to)) {"; |         $example_code .= "\nif(!PHPMailer::validateAddress(\$to)) {"; | ||||||
|         $example_code .= "\n  throw new phpmailerAppException(\"Email address \" . " . |         $example_code .= "\n  throw new phpmailerAppException(\"Email address \" . " . | ||||||
|             "\$to . \" is invalid -- aborting!\");"; |             "\$to . \" is invalid -- aborting!\");"; | ||||||
|         $example_code .= "\n}"; |         $example_code .= "\n}"; | ||||||
|  |  | ||||||
|         switch ($_POST['test_type']) { |         switch ($test_type) { | ||||||
|             case 'smtp': |             case 'smtp': | ||||||
|                 $mail->isSMTP(); // telling the class to use SMTP |                 $mail->isSMTP(); // telling the class to use SMTP | ||||||
|                 $mail->SMTPDebug = (integer)$_POST['smtp_debug']; |                 $mail->SMTPDebug = (integer)$smtp_debug; | ||||||
|                 $mail->Host = $_POST['smtp_server']; // SMTP server |                 $mail->Host = $smtp_server; // SMTP server | ||||||
|                 $mail->Port = (integer)$_POST['smtp_port']; // set the SMTP port |                 $mail->Port = (integer)$smtp_port; // set the SMTP port | ||||||
|                 if ($_POST['smtp_secure']) { |                 if ($smtp_secure) { | ||||||
|                     $mail->SMTPSecure = strtolower($_POST['smtp_secure']); |                     $mail->SMTPSecure = strtolower($smtp_secure); | ||||||
|                 } |                 } | ||||||
|                 $mail->SMTPAuth = array_key_exists('smtp_authenticate', $_POST); // enable SMTP authentication? |                 $mail->SMTPAuth = array_key_exists('smtp_authenticate', $_POST); // enable SMTP authentication? | ||||||
|                 if (array_key_exists('smtp_authenticate', $_POST)) { |                 if (array_key_exists('smtp_authenticate', $_POST)) { | ||||||
|                     $mail->Username = $_POST['authenticate_username']; // SMTP account username |                     $mail->Username = $authenticate_username; // SMTP account username | ||||||
|                     $mail->Password = $_POST['authenticate_password']; // SMTP account password |                     $mail->Password = $authenticate_password; // SMTP account password | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 $example_code .= "\n\$mail->isSMTP();"; |                 $example_code .= "\n\$mail->isSMTP();"; | ||||||
|                 $example_code .= "\n\$mail->SMTPDebug  = " . $_POST['smtp_debug'] . ";"; |                 $example_code .= "\n\$mail->SMTPDebug  = " . (integer) $smtp_debug . ";"; | ||||||
|                 $example_code .= "\n\$mail->Host       = \"" . $_POST['smtp_server'] . "\";"; |                 $example_code .= "\n\$mail->Host       = \"" . addslashes($smtp_server) . "\";"; | ||||||
|                 $example_code .= "\n\$mail->Port       = \"" . $_POST['smtp_port'] . "\";"; |                 $example_code .= "\n\$mail->Port       = \"" . addslashes($smtp_port) . "\";"; | ||||||
|                 $example_code .= "\n\$mail->SMTPSecure = \"" . strtolower($_POST['smtp_secure']) . "\";"; |                 $example_code .= "\n\$mail->SMTPSecure = \"" . addslashes(strtolower($smtp_secure)) . "\";"; | ||||||
|                 $example_code .= "\n\$mail->SMTPAuth   = " . (array_key_exists( |                 $example_code .= "\n\$mail->SMTPAuth   = " . (array_key_exists( | ||||||
|                     'smtp_authenticate', |                     'smtp_authenticate', | ||||||
|                     $_POST |                     $_POST | ||||||
|                 ) ? 'true' : 'false') . ";"; |                 ) ? 'true' : 'false') . ";"; | ||||||
|                 if (array_key_exists('smtp_authenticate', $_POST)) { |                 if (array_key_exists('smtp_authenticate', $_POST)) { | ||||||
|                     $example_code .= "\n\$mail->Username   = \"" . $_POST['authenticate_username'] . "\";"; |                     $example_code .= "\n\$mail->Username   = \"" . addslashes($authenticate_username) . "\";"; | ||||||
|                     $example_code .= "\n\$mail->Password   = \"" . $_POST['authenticate_password'] . "\";"; |                     $example_code .= "\n\$mail->Password   = \"" . addslashes($authenticate_password) . "\";"; | ||||||
|                 } |                 } | ||||||
|                 break; |                 break; | ||||||
|             case 'mail': |             case 'mail': | ||||||
| @@ -118,59 +125,59 @@ try { | |||||||
|  |  | ||||||
|         try { |         try { | ||||||
|             if ($_POST['From_Name'] != '') { |             if ($_POST['From_Name'] != '') { | ||||||
|                 $mail->addReplyTo($_POST['From_Email'], $_POST['From_Name']); |                 $mail->addReplyTo($from_email, $from_name); | ||||||
|                 $mail->setFrom($_POST['From_Email'], $_POST['From_Name']); |                 $mail->setFrom($from_email, $from_name); | ||||||
|  |  | ||||||
|                 $example_code .= "\n\$mail->addReplyTo(\"" . |                 $example_code .= "\n\$mail->addReplyTo(\"" . | ||||||
|                     $_POST['From_Email'] . "\", \"" . $_POST['From_Name'] . "\");"; |                     addslashes($from_email) . "\", \"" . addslashes($from_name) . "\");"; | ||||||
|                 $example_code .= "\n\$mail->setFrom(\"" . |                 $example_code .= "\n\$mail->setFrom(\"" . | ||||||
|                     $_POST['From_Email'] . "\", \"" . $_POST['From_Name'] . "\");"; |                     addslashes($from_email) . "\", \"" . addslashes($from_name) . "\");"; | ||||||
|             } else { |             } else { | ||||||
|                 $mail->addReplyTo($_POST['From_Email']); |                 $mail->addReplyTo($from_email); | ||||||
|                 $mail->setFrom($_POST['From_Email'], $_POST['From_Email']); |                 $mail->setFrom($from_email, $from_email); | ||||||
|  |  | ||||||
|                 $example_code .= "\n\$mail->addReplyTo(\"" . $_POST['From_Email'] . "\");"; |                 $example_code .= "\n\$mail->addReplyTo(\"" . addslashes($from_email) . "\");"; | ||||||
|                 $example_code .= "\n\$mail->setFrom(\"" . |                 $example_code .= "\n\$mail->setFrom(\"" . | ||||||
|                     $_POST['From_Email'] . "\", \"" . $_POST['From_Email'] . "\");"; |                     addslashes($from_email) . "\", \"" . addslashes($from_email) . "\");"; | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             if ($_POST['To_Name'] != '') { |             if ($_POST['To_Name'] != '') { | ||||||
|                 $mail->addAddress($to, $_POST['To_Name']); |                 $mail->addAddress($to, $to_name); | ||||||
|                 $example_code .= "\n\$mail->addAddress(\"$to\", \"" . $_POST['To_Name'] . "\");"; |                 $example_code .= "\n\$mail->addAddress(\"$to\", \"" . addslashes($to_name) . "\");"; | ||||||
|             } else { |             } else { | ||||||
|                 $mail->addAddress($to); |                 $mail->addAddress($to); | ||||||
|                 $example_code .= "\n\$mail->addAddress(\"$to\");"; |                 $example_code .= "\n\$mail->addAddress(\"$to\");"; | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             if ($_POST['bcc_Email'] != '') { |             if ($_POST['bcc_Email'] != '') { | ||||||
|                 $indiBCC = explode(" ", $_POST['bcc_Email']); |                 $indiBCC = explode(" ", $bcc_email); | ||||||
|                 foreach ($indiBCC as $key => $value) { |                 foreach ($indiBCC as $key => $value) { | ||||||
|                     $mail->addBCC($value); |                     $mail->addBCC($value); | ||||||
|                     $example_code .= "\n\$mail->addBCC(\"$value\");"; |                     $example_code .= "\n\$mail->addBCC(\"" . addslashes($value) . "\");"; | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|  |  | ||||||
|             if ($_POST['cc_Email'] != '') { |             if ($_POST['cc_Email'] != '') { | ||||||
|                 $indiCC = explode(" ", $_POST['cc_Email']); |                 $indiCC = explode(" ", $cc_Email); | ||||||
|                 foreach ($indiCC as $key => $value) { |                 foreach ($indiCC as $key => $value) { | ||||||
|                     $mail->addCC($value); |                     $mail->addCC($value); | ||||||
|                     $example_code .= "\n\$mail->addCC(\"$value\");"; |                     $example_code .= "\n\$mail->addCC(\"" . addslashes($value) . "\");"; | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } catch (phpmailerException $e) { //Catch all kinds of bad addressing |         } catch (phpmailerException $e) { //Catch all kinds of bad addressing | ||||||
|             throw new phpmailerAppException($e->getMessage()); |             throw new phpmailerAppException($e->getMessage()); | ||||||
|         } |         } | ||||||
|         $mail->Subject = $_POST['Subject'] . ' (PHPMailer test using ' . strtoupper($_POST['test_type']) . ')'; |         $mail->Subject = $subject . ' (PHPMailer test using ' . strtoupper($test_type) . ')'; | ||||||
|         $example_code .= "\n\$mail->Subject  = \"" . $_POST['Subject'] . |         $example_code .= "\n\$mail->Subject  = \"" . addslashes($subject) . | ||||||
|             ' (PHPMailer test using ' . strtoupper($_POST['test_type']) . ')";'; |             ' (PHPMailer test using ' . addslashes(strtoupper($test_type)) . ')";'; | ||||||
|  |  | ||||||
|         if ($_POST['Message'] == '') { |         if ($_POST['Message'] == '') { | ||||||
|             $body = file_get_contents('contents.html'); |             $body = file_get_contents('contents.html'); | ||||||
|         } else { |         } else { | ||||||
|             $body = $_POST['Message']; |             $body = $message; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         $example_code .= "\n\$body = <<<'EOT'\n" . htmlentities($body) . "\nEOT;"; |         $example_code .= "\n\$body = <<<'EOT'\n$body\nEOT;"; | ||||||
|  |  | ||||||
|         $mail->WordWrap = 78; // set word wrap to the RFC2822 limit |         $mail->WordWrap = 78; // set word wrap to the RFC2822 limit | ||||||
|         $mail->msgHTML($body, dirname(__FILE__), true); //Create message bodies and embed images |         $mail->msgHTML($body, dirname(__FILE__), true); //Create message bodies and embed images | ||||||
| @@ -187,7 +194,7 @@ try { | |||||||
|         $example_code .= "\n\ntry {"; |         $example_code .= "\n\ntry {"; | ||||||
|         $example_code .= "\n  \$mail->send();"; |         $example_code .= "\n  \$mail->send();"; | ||||||
|         $example_code .= "\n  \$results_messages[] = \"Message has been sent using " . |         $example_code .= "\n  \$results_messages[] = \"Message has been sent using " . | ||||||
|             strtoupper($_POST['test_type']) . "\";"; |             addslashes(strtoupper($test_type)) . "\";"; | ||||||
|         $example_code .= "\n}"; |         $example_code .= "\n}"; | ||||||
|         $example_code .= "\ncatch (phpmailerException \$e) {"; |         $example_code .= "\ncatch (phpmailerException \$e) {"; | ||||||
|         $example_code .= "\n  throw new phpmailerAppException('Unable to send to: ' . \$to. ': '.\$e->getMessage());"; |         $example_code .= "\n  throw new phpmailerAppException('Unable to send to: ' . \$to. ': '.\$e->getMessage());"; | ||||||
| @@ -195,7 +202,7 @@ try { | |||||||
|  |  | ||||||
|         try { |         try { | ||||||
|             $mail->send(); |             $mail->send(); | ||||||
|             $results_messages[] = "Message has been sent using " . strtoupper($_POST["test_type"]); |             $results_messages[] = "Message has been sent using " . strtoupper($test_type); | ||||||
|         } catch (phpmailerException $e) { |         } catch (phpmailerException $e) { | ||||||
|             throw new phpmailerAppException("Unable to send to: " . $to . ': ' . $e->getMessage()); |             throw new phpmailerAppException("Unable to send to: " . $to . ': ' . $e->getMessage()); | ||||||
|         } |         } | ||||||
| @@ -309,22 +316,22 @@ $example_code .= "\n}"; | |||||||
|  |  | ||||||
|         function startAgain() { |         function startAgain() { | ||||||
|             var post_params = { |             var post_params = { | ||||||
|                 "From_Name": "<?php echo $from_name; ?>", |                 "From_Name": <?php echo JSString($from_name); ?>, | ||||||
|                 "From_Email": "<?php echo $from_email; ?>", |                 "From_Email": <?php echo JSString($from_email); ?>, | ||||||
|                 "To_Name": "<?php echo $to_name; ?>", |                 "To_Name": <?php echo JSString($to_name); ?>, | ||||||
|                 "To_Email": "<?php echo $to_email; ?>", |                 "To_Email": <?php echo JSString($to_email); ?>, | ||||||
|                 "cc_Email": "<?php echo $cc_email; ?>", |                 "cc_Email": <?php echo JSString($cc_email); ?>, | ||||||
|                 "bcc_Email": "<?php echo $bcc_email; ?>", |                 "bcc_Email": <?php echo JSString($bcc_email); ?>, | ||||||
|                 "Subject": "<?php echo $subject; ?>", |                 "Subject": <?php echo JSString($subject); ?>, | ||||||
|                 "Message": "<?php echo $message; ?>", |                 "Message": <?php echo JSString($message); ?>, | ||||||
|                 "test_type": "<?php echo $test_type; ?>", |                 "test_type": <?php echo JSString($test_type); ?>, | ||||||
|                 "smtp_debug": "<?php echo $smtp_debug; ?>", |                 "smtp_debug": <?php echo JSString($smtp_debug); ?>, | ||||||
|                 "smtp_server": "<?php echo $smtp_server; ?>", |                 "smtp_server": <?php echo JSString($smtp_server); ?>, | ||||||
|                 "smtp_port": "<?php echo $smtp_port; ?>", |                 "smtp_port": <?php echo JSString($smtp_port); ?>, | ||||||
|                 "smtp_secure": "<?php echo $smtp_secure; ?>", |                 "smtp_secure": <?php echo JSString($smtp_secure); ?>, | ||||||
|                 "smtp_authenticate": "<?php echo $smtp_authenticate; ?>", |                 "smtp_authenticate": <?php echo JSString($smtp_authenticate); ?>, | ||||||
|                 "authenticate_username": "<?php echo $authenticate_username; ?>", |                 "authenticate_username": <?php echo JSString($authenticate_username); ?>, | ||||||
|                 "authenticate_password": "<?php echo $authenticate_password; ?>" |                 "authenticate_password": <?php echo JSString($authenticate_password); ?> | ||||||
|             }; |             }; | ||||||
|  |  | ||||||
|             var resetForm = document.createElement("form"); |             var resetForm = document.createElement("form"); | ||||||
| @@ -374,7 +381,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|     echo "<button type=\"submit\" onclick=\"startAgain();\">Start Over</button><br>\n"; |     echo "<button type=\"submit\" onclick=\"startAgain();\">Start Over</button><br>\n"; | ||||||
|     echo "<br><span>Script:</span>\n"; |     echo "<br><span>Script:</span>\n"; | ||||||
|     echo "<pre class=\"brush: php;\">\n"; |     echo "<pre class=\"brush: php;\">\n"; | ||||||
|     echo $example_code; |     echo htmlentities($example_code); | ||||||
|     echo "\n</pre>\n"; |     echo "\n</pre>\n"; | ||||||
|     echo "\n<hr style=\"margin: 3em;\">\n"; |     echo "\n<hr style=\"margin: 3em;\">\n"; | ||||||
| } | } | ||||||
| @@ -390,7 +397,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <label for="From_Name"><strong>From</strong> Name</label> |                             <label for="From_Name"><strong>From</strong> Name</label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="From_Name" name="From_Name" value="<?php echo $from_name; ?>" |                             <input type="text" id="From_Name" name="From_Name" value="<?php echo htmlentities($from_name); ?>" | ||||||
|                                    style="width:95%;" autofocus placeholder="Your Name"> |                                    style="width:95%;" autofocus placeholder="Your Name"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -399,7 +406,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <label for="From_Email"><strong>From</strong> Email Address</label> |                             <label for="From_Email"><strong>From</strong> Email Address</label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="From_Email" name="From_Email" value="<?php echo $from_email; ?>" |                             <input type="text" id="From_Email" name="From_Email" value="<?php echo htmlentities($from_email); ?>" | ||||||
|                                    style="width:95%;" required placeholder="Your.Email@example.com"> |                                    style="width:95%;" required placeholder="Your.Email@example.com"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -408,7 +415,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <label for="To_Name"><strong>To</strong> Name</label> |                             <label for="To_Name"><strong>To</strong> Name</label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="To_Name" name="To_Name" value="<?php echo $to_name; ?>" |                             <input type="text" id="To_Name" name="To_Name" value="<?php echo htmlentities($to_name); ?>" | ||||||
|                                    style="width:95%;" placeholder="Recipient's Name"> |                                    style="width:95%;" placeholder="Recipient's Name"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -417,7 +424,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <label for="To_Email"><strong>To</strong> Email Address</label> |                             <label for="To_Email"><strong>To</strong> Email Address</label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="To_Email" name="To_Email" value="<?php echo $to_email; ?>" |                             <input type="text" id="To_Email" name="To_Email" value="<?php echo htmlentities($to_email); ?>" | ||||||
|                                    style="width:95%;" required placeholder="Recipients.Email@example.com"> |                                    style="width:95%;" required placeholder="Recipients.Email@example.com"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -428,7 +435,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             </label> |                             </label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="cc_Email" name="cc_Email" value="<?php echo $cc_email; ?>" |                             <input type="text" id="cc_Email" name="cc_Email" value="<?php echo htmlentities($cc_email); ?>" | ||||||
|                                    style="width:95%;" placeholder="cc1@example.com, cc2@example.com"> |                                    style="width:95%;" placeholder="cc1@example.com, cc2@example.com"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -439,7 +446,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             </label> |                             </label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" id="bcc_Email" name="bcc_Email" value="<?php echo $bcc_email; ?>" |                             <input type="text" id="bcc_Email" name="bcc_Email" value="<?php echo htmlentities($bcc_email); ?>" | ||||||
|                                    style="width:95%;" placeholder="bcc1@example.com, bcc2@example.com"> |                                    style="width:95%;" placeholder="bcc1@example.com, bcc2@example.com"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -448,7 +455,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <label for="Subject"><strong>Subject</strong></label> |                             <label for="Subject"><strong>Subject</strong></label> | ||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <input type="text" name="Subject" id="Subject" value="<?php echo $subject; ?>" |                             <input type="text" name="Subject" id="Subject" value="<?php echo htmlentities($subject); ?>" | ||||||
|                                    style="width:95%;" placeholder="Email Subject"> |                                    style="width:95%;" placeholder="Email Subject"> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
| @@ -460,7 +467,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                         </td> |                         </td> | ||||||
|                         <td class="colrite"> |                         <td class="colrite"> | ||||||
|                             <textarea name="Message" id="Message" style="width:95%;height:5em;" |                             <textarea name="Message" id="Message" style="width:95%;height:5em;" | ||||||
|                                       placeholder="Body of your email"><?php echo $message; ?></textarea> |                                       placeholder="Body of your email"><?php echo htmlentities($message); ?></textarea> | ||||||
|                         </td> |                         </td> | ||||||
|                     </tr> |                     </tr> | ||||||
|                 </table> |                 </table> | ||||||
| @@ -531,7 +538,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <td class="colleft"><label for="smtp_server">SMTP Server</label></td> |                             <td class="colleft"><label for="smtp_server">SMTP Server</label></td> | ||||||
|                             <td class="colrite"> |                             <td class="colrite"> | ||||||
|                                 <input type="text" id="smtp_server" name="smtp_server" |                                 <input type="text" id="smtp_server" name="smtp_server" | ||||||
|                                        value="<?php echo $smtp_server; ?>" style="width:95%;" |                                        value="<?php echo htmlentities($smtp_server); ?>" style="width:95%;" | ||||||
|                                        placeholder="smtp.server.com"> |                                        placeholder="smtp.server.com"> | ||||||
|                             </td> |                             </td> | ||||||
|                         </tr> |                         </tr> | ||||||
| @@ -539,7 +546,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <td class="colleft" style="width: 5em;"><label for="smtp_port">SMTP Port</label></td> |                             <td class="colleft" style="width: 5em;"><label for="smtp_port">SMTP Port</label></td> | ||||||
|                             <td class="colrite"> |                             <td class="colrite"> | ||||||
|                                 <input type="text" name="smtp_port" id="smtp_port" size="3" |                                 <input type="text" name="smtp_port" id="smtp_port" size="3" | ||||||
|                                        value="<?php echo $smtp_port; ?>" placeholder="Port"> |                                        value="<?php echo htmlentities($smtp_port); ?>" placeholder="Port"> | ||||||
|                             </td> |                             </td> | ||||||
|                         </tr> |                         </tr> | ||||||
|                         <tr> |                         <tr> | ||||||
| @@ -560,14 +567,14 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
| <?php if ($smtp_authenticate != '') { | <?php if ($smtp_authenticate != '') { | ||||||
|     echo "checked"; |     echo "checked"; | ||||||
| } ?> | } ?> | ||||||
|                                        value="<?php echo $smtp_authenticate; ?>"> |                                        value="true"> | ||||||
|                             </td> |                             </td> | ||||||
|                         </tr> |                         </tr> | ||||||
|                         <tr> |                         <tr> | ||||||
|                             <td class="colleft"><label for="authenticate_username">Authenticate Username</label></td> |                             <td class="colleft"><label for="authenticate_username">Authenticate Username</label></td> | ||||||
|                             <td class="colrite"> |                             <td class="colrite"> | ||||||
|                                 <input type="text" id="authenticate_username" name="authenticate_username" |                                 <input type="text" id="authenticate_username" name="authenticate_username" | ||||||
|                                        value="<?php echo $authenticate_username; ?>" style="width:95%;" |                                        value="<?php echo htmlentities($authenticate_username); ?>" style="width:95%;" | ||||||
|                                        placeholder="SMTP Server Username"> |                                        placeholder="SMTP Server Username"> | ||||||
|                             </td> |                             </td> | ||||||
|                         </tr> |                         </tr> | ||||||
| @@ -575,7 +582,7 @@ if (isset($_POST["submit"]) && $_POST["submit"] == "Submit") { | |||||||
|                             <td class="colleft"><label for="authenticate_password">Authenticate Password</label></td> |                             <td class="colleft"><label for="authenticate_password">Authenticate Password</label></td> | ||||||
|                             <td class="colrite"> |                             <td class="colrite"> | ||||||
|                                 <input type="password" name="authenticate_password" id="authenticate_password" |                                 <input type="password" name="authenticate_password" id="authenticate_password" | ||||||
|                                        value="<?php echo $authenticate_password; ?>" style="width:95%;" |                                        value="<?php echo htmlentities($authenticate_password); ?>" style="width:95%;" | ||||||
|                                        placeholder="SMTP Server Password"> |                                        placeholder="SMTP Server Password"> | ||||||
|                             </td> |                             </td> | ||||||
|                         </tr> |                         </tr> | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| <?php | <?php | ||||||
| /** | /** | ||||||
|  * This example shows settings to use when sending via Google's Gmail servers. |  * This example shows settings to use when sending via Google's Gmail servers. | ||||||
|  |  * The IMAP section shows how to save this message to the 'Sent Mail' folder using IMAP commands. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| //SMTP needs accurate times, and the PHP time zone MUST be set | //SMTP needs accurate times, and the PHP time zone MUST be set | ||||||
| @@ -72,4 +73,27 @@ if (!$mail->send()) { | |||||||
|     echo "Mailer Error: " . $mail->ErrorInfo; |     echo "Mailer Error: " . $mail->ErrorInfo; | ||||||
| } else { | } else { | ||||||
|     echo "Message sent!"; |     echo "Message sent!"; | ||||||
|  |     //Section 2: IMAP | ||||||
|  |     //Uncomment these to save your message in the 'Sent Mail' folder. | ||||||
|  |     #if (save_mail($mail)) { | ||||||
|  |     #    echo "Message saved!"; | ||||||
|  |     #} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | //Section 2: IMAP | ||||||
|  | //IMAP commands requires the PHP IMAP Extension, found at: https://php.net/manual/en/imap.setup.php | ||||||
|  | //Function to call which uses the PHP imap_*() functions to save messages: https://php.net/manual/en/book.imap.php | ||||||
|  | //You can use imap_getmailboxes($imapStream, '/imap/ssl') to get a list of available folders or labels, this can | ||||||
|  | //be useful if you are trying to get this working on a non-Gmail IMAP server. | ||||||
|  | function save_mail($mail) { | ||||||
|  |     //You can change 'Sent Mail' to any other folder or tag | ||||||
|  |     $path = "{imap.gmail.com:993/imap/ssl}[Gmail]/Sent Mail"; | ||||||
|  |  | ||||||
|  |     //Tell your server to open an IMAP connection using the same username and password as you used for SMTP | ||||||
|  |     $imapStream = imap_open($path, $mail->Username, $mail->Password); | ||||||
|  |  | ||||||
|  |     $result = imap_append($imapStream, $path, $mail->getSentMIMEMessage()); | ||||||
|  |     imap_close($imapStream); | ||||||
|  |  | ||||||
|  |     return $result; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -43,8 +43,8 @@ $mail->SMTPAuth = true; | |||||||
| //Set AuthType | //Set AuthType | ||||||
| $mail->AuthType = 'XOAUTH2'; | $mail->AuthType = 'XOAUTH2'; | ||||||
|  |  | ||||||
| //User Email to use for SMTP authentication - Use the same Email used in Google Developer Console | //User Email to use for SMTP authentication - user who gave consent to our app | ||||||
| $mail->oauthUserEmail = "someone@gmail.com"; | $mail->oauthUserEmail = "from@gmail.com"; | ||||||
|  |  | ||||||
| //Obtained From Google Developer Console | //Obtained From Google Developer Console | ||||||
| $mail->oauthClientId = "RANDOMCHARS-----duv1n2.apps.googleusercontent.com"; | $mail->oauthClientId = "RANDOMCHARS-----duv1n2.apps.googleusercontent.com"; | ||||||
|   | |||||||
							
								
								
									
										26
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								data/web/inc/lib/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | |||||||
|  | <?php | ||||||
|  | /** | ||||||
|  |  * Bosnian PHPMailer language file: refer to English translation for definitive list | ||||||
|  |  * @package PHPMailer | ||||||
|  |  * @author Ermin Islamagić <ermin@islamagic.com> | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | $PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela prijava.'; | ||||||
|  | $PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Ne moguće se spojiti sa SMTP serverom.'; | ||||||
|  | $PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.'; | ||||||
|  | $PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.'; | ||||||
|  | $PHPMAILER_LANG['encoding']             = 'Nepoznata kriptografija: '; | ||||||
|  | $PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: '; | ||||||
|  | $PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: '; | ||||||
|  | $PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: '; | ||||||
|  | $PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje sa navedenih e-mail adresa nije uspjelo: '; | ||||||
|  | $PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedene e-mail adrese nije uspjelo: '; | ||||||
|  | $PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.'; | ||||||
|  | $PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: '; | ||||||
|  | $PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.'; | ||||||
|  | $PHPMAILER_LANG['provide_address']      = 'Definišite barem jednu adresu primaoca.'; | ||||||
|  | $PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: '; | ||||||
|  | $PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP server nije uspjelo.'; | ||||||
|  | $PHPMAILER_LANG['smtp_error']           = 'SMTP greška: '; | ||||||
|  | $PHPMAILER_LANG['variable_set']         = 'Nije moguće postaviti varijablu ili je vratiti nazad: '; | ||||||
|  | $PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: '; | ||||||
| @@ -1,25 +1,25 @@ | |||||||
| <?php | <?php | ||||||
| /** | /** | ||||||
|  * Norwegian PHPMailer language file: refer to English translation for definitive list |  * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list | ||||||
|  * @package PHPMailer |  * @package PHPMailer | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| $PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.'; | $PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.'; | ||||||
| $PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.'; | $PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.'; | ||||||
| $PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Data ble ikke akseptert.'; | $PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.'; | ||||||
| $PHPMAILER_LANG['empty_message']        = 'Meldingsinnholdet er tomt'; | $PHPMAILER_LANG['empty_message']        = 'Melding kropp tomt'; | ||||||
| $PHPMAILER_LANG['encoding']             = 'Ukjent tegnkoding: '; | $PHPMAILER_LANG['encoding']             = 'Ukjent koding: '; | ||||||
| $PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: '; | $PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: '; | ||||||
| $PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: '; | $PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: '; | ||||||
| $PHPMAILER_LANG['file_open']            = 'Fil feil: Kunne ikke åpne filen: '; | $PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: '; | ||||||
| $PHPMAILER_LANG['from_failed']          = 'Følgende avsenderadresse feilet: '; | $PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: '; | ||||||
| $PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere mailfunksjonen.'; | $PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.'; | ||||||
| $PHPMAILER_LANG['invalid_address']      = 'Meldingen ble ikke sendt, følgende adresse er ugyldig: '; | $PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: '; | ||||||
| $PHPMAILER_LANG['provide_address']      = 'Du må angi minst en mottakeradresse.'; | $PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.'; | ||||||
| $PHPMAILER_LANG['mailer_not_supported'] = ' mailer er ikke supportert.'; | $PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.'; | ||||||
| $PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottagere feilet: '; | $PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: '; | ||||||
| $PHPMAILER_LANG['signing']              = 'Signeringsfeil: '; | $PHPMAILER_LANG['signing']              = 'Signering Feil: '; | ||||||
| $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() feilet.'; | $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.'; | ||||||
| $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfeil: '; | $PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: '; | ||||||
| $PHPMAILER_LANG['variable_set']         = 'Kan ikke sette eller resette variabelen: '; | $PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: '; | ||||||
| //$PHPMAILER_LANG['extension_missing']    = 'Extension missing: '; | $PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: '; | ||||||
|   | |||||||
| @@ -5,6 +5,7 @@ | |||||||
|  * @author Paulo Henrique Garcia <paulo@controllerweb.com.br> |  * @author Paulo Henrique Garcia <paulo@controllerweb.com.br> | ||||||
|  * @author Lucas Guimarães <lucas@lucasguimaraes.com> |  * @author Lucas Guimarães <lucas@lucasguimaraes.com> | ||||||
|  * @author Phelipe Alves <phelipealvesdesouza@gmail.com> |  * @author Phelipe Alves <phelipealvesdesouza@gmail.com> | ||||||
|  |  * @author Fabio Beneditto <fabiobeneditto@gmail.com> | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| $PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.'; | $PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.'; | ||||||
| @@ -15,7 +16,7 @@ $PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: '; | |||||||
| $PHPMAILER_LANG['execute']              = 'Não foi possível executar: '; | $PHPMAILER_LANG['execute']              = 'Não foi possível executar: '; | ||||||
| $PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: '; | $PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: '; | ||||||
| $PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; | $PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; | ||||||
| $PHPMAILER_LANG['from_failed']          = 'Os seguintes remententes falharam: '; | $PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: '; | ||||||
| $PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.'; | $PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.'; | ||||||
| $PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: '; | $PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: '; | ||||||
| $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.'; | $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.'; | ||||||
|   | |||||||
| @@ -23,4 +23,4 @@ $PHPMAILER_LANG['signing']              = 'Грешка приликом при | |||||||
| $PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.'; | $PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.'; | ||||||
| $PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: '; | $PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: '; | ||||||
| $PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: '; | $PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: '; | ||||||
| //$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
 | $PHPMAILER_LANG['extension_missing']    = 'Недостаје проширење: '; | ||||||
| @@ -6,6 +6,7 @@ | |||||||
|  * @author Can Yılmaz |  * @author Can Yılmaz | ||||||
|  * @author Mehmet Benlioğlu |  * @author Mehmet Benlioğlu | ||||||
|  * @author @yasinaydin |  * @author @yasinaydin | ||||||
|  |  * @author Ogün Karakuş | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| $PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.'; | $PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.'; | ||||||
| @@ -26,4 +27,4 @@ $PHPMAILER_LANG['signing']              = 'İmzalama hatası: '; | |||||||
| $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.'; | $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.'; | ||||||
| $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: '; | $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: '; | ||||||
| $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: '; | $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: '; | ||||||
| //$PHPMAILER_LANG['extension_missing']    = 'Extension missing: '; | $PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: '; | ||||||
|   | |||||||
| @@ -4,13 +4,14 @@ | |||||||
|  * @package PHPMailer |  * @package PHPMailer | ||||||
|  * @author liqwei <liqwei@liqwei.com> |  * @author liqwei <liqwei@liqwei.com> | ||||||
|  * @author young <masxy@foxmail.com> |  * @author young <masxy@foxmail.com> | ||||||
|  |  * @author Teddysun <i@teddysun.com> | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| $PHPMAILER_LANG['authenticate']         = 'SMTP 错误:登录失败。'; | $PHPMAILER_LANG['authenticate']         = 'SMTP 错误:登录失败。'; | ||||||
| $PHPMAILER_LANG['connect_host']         = 'SMTP 错误:无法连接到 SMTP 主机。'; | $PHPMAILER_LANG['connect_host']         = 'SMTP 错误:无法连接到 SMTP 主机。'; | ||||||
| $PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误:数据不被接受。'; | $PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误:数据不被接受。'; | ||||||
| $PHPMAILER_LANG['empty_message']        = '邮件正文为空。'; | $PHPMAILER_LANG['empty_message']        = '邮件正文为空。'; | ||||||
| $PHPMAILER_LANG['encoding']             = '未知编码: '; | $PHPMAILER_LANG['encoding']             = '未知编码:'; | ||||||
| $PHPMAILER_LANG['execute']              = '无法执行:'; | $PHPMAILER_LANG['execute']              = '无法执行:'; | ||||||
| $PHPMAILER_LANG['file_access']          = '无法访问文件:'; | $PHPMAILER_LANG['file_access']          = '无法访问文件:'; | ||||||
| $PHPMAILER_LANG['file_open']            = '文件错误:无法打开文件:'; | $PHPMAILER_LANG['file_open']            = '文件错误:无法打开文件:'; | ||||||
| @@ -22,6 +23,6 @@ $PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地 | |||||||
| $PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误:收件人地址错误:'; | $PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误:收件人地址错误:'; | ||||||
| $PHPMAILER_LANG['signing']              = '登录失败:'; | $PHPMAILER_LANG['signing']              = '登录失败:'; | ||||||
| $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。'; | $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。'; | ||||||
| $PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错: '; | $PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错:'; | ||||||
| $PHPMAILER_LANG['variable_set']         = '无法设置或重置变量:'; | $PHPMAILER_LANG['variable_set']         = '无法设置或重置变量:'; | ||||||
| //$PHPMAILER_LANG['extension_missing']    = 'Extension missing: '; | $PHPMAILER_LANG['extension_missing']    = '丢失模块 Extension:'; | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| <?php | <?php | ||||||
| require_once 'inc/vars.inc.php'; | require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php'; | ||||||
| $default_autodiscover_config = $autodiscover_config; | $default_autodiscover_config = $autodiscover_config; | ||||||
| if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) { | if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) { | ||||||
|   include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php'; |   include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php'; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user