- *
- * @variables
- * {
- * defaultColor: black;
- * }
- * color: var(defaultColor);
- *
- *
- * Will get converted to:
- *
- * color:black;
- *
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $variable . " in media types " . implode(", ", $mediaTypes) . "", (string)$token));
- $token = new CssNullToken();
- return true;
- }
- }
- return false;
- }
-
- /**
- * Implements {@link aMinifierPlugin::getTriggerTokens()}
- *
- * @return array
- */
- public function getTriggerTokens()
- {
- return array
- (
- "CssAtFontFaceDeclarationToken",
- "CssAtPageDeclarationToken",
- "CssRulesetDeclarationToken"
- );
- }
-}
-
-/**
- * This {@link aCssMinifierFilter minifier filter} will parse the variable declarations out of @variables at-rule
- * blocks. The variables will get store in the {@link CssVariablesMinifierPlugin} that will apply the variables to
- * declaration.
- *
- * @package CssMin/Minifier/Filters
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla CssVariablesMinifierPlugin was not found but is required for " . __CLASS__ . ""));
- } else {
- $plugin->setVariables($variables);
- }
- return count($remove);
- }
-}
-
-/**
- * {@link aCssParserPlugin Parser plugin} for preserve parsing url() values.
- *
- * This plugin return no {@link aCssToken CssToken} but ensures that url() values will get parsed properly.
- *
- * @package CssMin/Parser/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- if (!is_null($source)) {
- $this->parse($source);
- }
- }
-
- /**
- * Parse the CSS source and return a array with parsed tokens.
- *
- * @param string $source CSS source
- * @return array Array with tokens
- */
- public function parse($source)
- {
- // Reset
- $this->source = "";
- $this->tokens = array();
- // Create a global and plugin lookup table for trigger chars; set array of plugins as local variable and create
- // several helper variables for plugin handling
- $globalTriggerChars = "";
- $plugins = $this->plugins;
- $pluginCount = count($plugins);
- $pluginIndex = array();
- $pluginTriggerStates = array();
- $pluginTriggerChars = array();
- for ($i = 0, $l = count($plugins); $i < $l; $i++) {
- $tPluginClassName = get_class($plugins[$i]);
- $pluginTriggerChars[$i] = implode("", $plugins[$i]->getTriggerChars());
- $tPluginTriggerStates = $plugins[$i]->getTriggerStates();
- $pluginTriggerStates[$i] = $tPluginTriggerStates === false ? false : "|" . implode("|", $tPluginTriggerStates) . "|";
- $pluginIndex[$tPluginClassName] = $i;
- for ($ii = 0, $ll = strlen($pluginTriggerChars[$i]); $ii < $ll; $ii++) {
- $c = substr($pluginTriggerChars[$i], $ii, 1);
- if (strpos($globalTriggerChars, $c) === false) {
- $globalTriggerChars .= $c;
- }
- }
- }
- // Normalise line endings
- $source = str_replace("\r\n", "\n", $source); // Windows to Unix line endings
- $source = str_replace("\r", "\n", $source); // Mac to Unix line endings
- $this->source = $source;
- // Variables
- $buffer = &$this->buffer;
- $exclusive = &$this->stateExclusive;
- $state = &$this->state;
- $c = $p = null;
- // --
- for ($i = 0, $l = strlen($source); $i < $l; $i++) {
- // Set the current Char
- $c = $source[$i]; // Is faster than: $c = substr($source, $i, 1);
- // Normalize and filter double whitespace characters
- if ($exclusive === false) {
- if ($c === "\n" || $c === "\t") {
- $c = " ";
- }
- if ($c === " " && $p === " ") {
- continue;
- }
- }
- $buffer .= $c;
- // Extended processing only if the current char is a global trigger char
- if (strpos($globalTriggerChars, $c) !== false) {
- // Exclusive state is set; process with the exclusive plugin
- if ($exclusive) {
- $tPluginIndex = $pluginIndex[$exclusive];
- if (strpos($pluginTriggerChars[$tPluginIndex], $c) !== false && ($pluginTriggerStates[$tPluginIndex] === false || strpos($pluginTriggerStates[$tPluginIndex], $state) !== false)) {
- $r = $plugins[$tPluginIndex]->parse($i, $c, $p, $state);
- // Return value is TRUE => continue with next char
- if ($r === true) {
- continue;
- } // Return value is numeric => set new index and continue with next char
- elseif ($r !== false && $r != $i) {
- $i = $r;
- continue;
- }
- }
- } // Else iterate through the plugins
- else {
- $triggerState = "|" . $state . "|";
- for ($ii = 0, $ll = $pluginCount; $ii < $ll; $ii++) {
- // Only process if the current char is one of the plugin trigger chars
- if (strpos($pluginTriggerChars[$ii], $c) !== false && ($pluginTriggerStates[$ii] === false || strpos($pluginTriggerStates[$ii], $triggerState) !== false)) {
- // Process with the plugin
- $r = $plugins[$ii]->parse($i, $c, $p, $state);
- // Return value is TRUE => break the plugin loop and and continue with next char
- if ($r === true) {
- break;
- } // Return value is numeric => set new index, break the plugin loop and and continue with next char
- elseif ($r !== false && $r != $i) {
- $i = $r;
- break;
- }
- }
- }
- }
- }
- $p = $c; // Set the parent char
- }
- return $this->tokens;
- }
-
- /**
- * Append a token to the array of tokens.
- *
- * @param aCssToken $token Token to append
- * @return void
- */
- public function appendToken(aCssToken $token)
- {
- $this->tokens[] = $token;
- }
-
- /**
- * Clears the current buffer.
- *
- * @return void
- */
- public function clearBuffer()
- {
- $this->buffer = "";
- }
-
- /**
- * Returns and clear the current buffer.
- *
- * @param string $trim Chars to use to trim the returned buffer
- * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
- * @return string
- */
- public function getAndClearBuffer($trim = "", $tolower = false)
- {
- $r = $this->getBuffer($trim, $tolower);
- $this->buffer = "";
- return $r;
- }
-
- /**
- * Returns the current buffer.
- *
- * @param string $trim Chars to use to trim the returned buffer
- * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
- * @return string
- */
- public function getBuffer($trim = "", $tolower = false)
- {
- $r = $this->buffer;
- if ($trim) {
- $r = trim($r, " \t\n\r\0\x0B" . $trim);
- }
- if ($tolower) {
- $r = strtolower($r);
- }
- return $r;
- }
-
- /**
- * Sets/restores the buffer.
- *
- * @param string $buffer Buffer to set
- * @return void
- */
- public function setBuffer($buffer)
- {
- $this->buffer = $buffer;
- }
-
- /**
- * Returns the current media types state.
- *
- * @return array
- */
- public function getMediaTypes()
- {
- return $this->stateMediaTypes;
- }
-
- /**
- * Returns the CSS source.
- *
- * @return string
- */
- public function getSource()
- {
- return $this->source;
- }
-
- /**
- * Returns the current state.
- *
- * @return integer The current state
- */
- public function getState()
- {
- return $this->state;
- }
-
- /**
- * Sets the current state in the state stack; equals to {@link CssParser::popState()} + {@link CssParser::pushState()}.
- *
- * @param integer $state State to set
- * @return integer
- */
- public function setState($state)
- {
- $r = array_pop($this->states);
- array_push($this->states, $state);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
-
- /**
- * Returns a plugin by class name.
- *
- * @param string $name Class name of the plugin
- * @return aCssParserPlugin
- */
- public function getPlugin($class)
- {
- static $index = null;
- if (is_null($index)) {
- $index = array();
- for ($i = 0, $l = count($this->plugins); $i < $l; $i++) {
- $index[get_class($this->plugins[$i])] = $i;
- }
- }
- return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
- }
-
- /**
- * Returns the parsed tokens.
- *
- * @return array
- */
- public function getTokens()
- {
- return $this->tokens;
- }
-
- /**
- * Returns if the current state equals the passed state.
- *
- * @param integer $state State to compare with the current state
- * @return boolean TRUE is the state equals to the passed state; FALSE if not
- */
- public function isState($state)
- {
- return ($this->state == $state);
- }
-
- /**
- * Remove the last state of the state stack and return the removed stack value.
- *
- * @return integer Removed state value
- */
- public function popState()
- {
- $r = array_pop($this->states);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
-
- /**
- * Adds a new state onto the state stack.
- *
- * @param integer $state State to add onto the state stack.
- * @return integer The index of the added state in the state stacks
- */
- public function pushState($state)
- {
- $r = array_push($this->states, $state);
- $this->state = $this->states[count($this->states) - 1];
- return $r;
- }
-
- /**
- * Set the exclusive state.
- *
- * @param string $exclusive Exclusive state
- * @return void
- */
- public function setExclusive($exclusive)
- {
- $this->stateExclusive = $exclusive;
- }
-
- /**
- * Set the media types state.
- *
- * @param array $mediaTypes Media types state
- * @return void
- */
- public function setMediaTypes(array $mediaTypes)
- {
- $this->stateMediaTypes = $mediaTypes;
- }
-
- /**
- * Removes the exclusive state.
- *
- * @return void
- */
- public function unsetExclusive()
- {
- $this->stateExclusive = false;
- }
-
- /**
- * Removes the media types state.
- *
- * @return void
- */
- public function unsetMediaTypes()
- {
- $this->stateMediaTypes = false;
- }
-}
-
-/**
- * {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/j4XdU OTBS indent style} (The One True Brace Style).
- *
- * @package CssMin/Formatter
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- // Plugins
- foreach ($plugins as $name => $config) {
- if ($config !== false) {
- $class = "Css" . $name . "MinifierPlugin";
- $config = is_array($config) ? $config : array();
- if (class_exists($class)) {
- $this->plugins[] = new $class($this, $config);
- } else {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin " . $name . " with the class name " . $class . " was not found"));
- }
- }
- }
- // --
- if (!is_null($source)) {
- $this->minify($source);
- }
- }
-
- /**
- * Minifies the CSS source.
- *
- * @param string $source CSS source
- * @return string
- */
- public function minify($source)
- {
- // Variables
- $r = "";
- $parser = new CssParser($source);
- $tokens = $parser->getTokens();
- $filters = $this->filters;
- $filterCount = count($this->filters);
- $plugins = $this->plugins;
- $pluginCount = count($plugins);
- $pluginIndex = array();
- $pluginTriggerTokens = array();
- $globalTriggerTokens = array();
- for ($i = 0, $l = count($plugins); $i < $l; $i++) {
- $tPluginClassName = get_class($plugins[$i]);
- $pluginTriggerTokens[$i] = $plugins[$i]->getTriggerTokens();
- foreach ($pluginTriggerTokens[$i] as $v) {
- if (!in_array($v, $globalTriggerTokens)) {
- $globalTriggerTokens[] = $v;
- }
- }
- $pluginTriggerTokens[$i] = "|" . implode("|", $pluginTriggerTokens[$i]) . "|";
- $pluginIndex[$tPluginClassName] = $i;
- }
- $globalTriggerTokens = "|" . implode("|", $globalTriggerTokens) . "|";
- /*
- * Apply filters
- */
- for ($i = 0; $i < $filterCount; $i++) {
- // Apply the filter; if the return value is larger than 0...
- if ($filters[$i]->apply($tokens) > 0) {
- // ...then filter null values and rebuild the token array
- $tokens = array_values(array_filter($tokens));
- }
- }
- $tokenCount = count($tokens);
- /*
- * Apply plugins
- */
- for ($i = 0; $i < $tokenCount; $i++) {
- $triggerToken = "|" . get_class($tokens[$i]) . "|";
- if (strpos($globalTriggerTokens, $triggerToken) !== false) {
- for ($ii = 0; $ii < $pluginCount; $ii++) {
- if (strpos($pluginTriggerTokens[$ii], $triggerToken) !== false || $pluginTriggerTokens[$ii] === false) {
- // Apply the plugin; if the return value is TRUE continue to the next token
- if ($plugins[$ii]->apply($tokens[$i]) === true) {
- continue 2;
- }
- }
- }
- }
- }
- // Stringify the tokens
- for ($i = 0; $i < $tokenCount; $i++) {
- $r .= (string)$tokens[$i];
- }
- $this->minified = $r;
- return $r;
- }
-
- /**
- * Returns the minified Source.
- *
- * @return string
- */
- public function getMinified()
- {
- return $this->minified;
- }
-
- /**
- * Returns a plugin by class name.
- *
- * @param string $name Class name of the plugin
- * @return aCssMinifierPlugin
- */
- public function getPlugin($class)
- {
- static $index = null;
- if (is_null($index)) {
- $index = array();
- for ($i = 0, $l = count($this->plugins); $i < $l; $i++) {
- $index[get_class($this->plugins[$i])] = $i;
- }
- }
- return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
- }
-}
-
-/**
- * CssMin - A (simple) css minifier with benefits
- *
- * --
- * Copyright (c) 2011 Joe Scylla " . ($this->configuration["BasePath"] ? $this->configuration["BasePath"] : "null") . " is not a directory"));
- return 0;
- }
- for ($i = 0, $l = count($tokens); $i < $l; $i++) {
- if (get_class($tokens[$i]) === "CssAtImportToken") {
- $import = $this->configuration["BasePath"] . "/" . $tokens[$i]->Import;
- // Import file was not found/is not a file
- if (!is_file($import)) {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import . " was not found.", (string)$tokens[$i]));
- } // Import file already imported; remove this @import at-rule to prevent recursions
- elseif (in_array($import, $this->imported)) {
- CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file " . $import . " was already imported.", (string)$tokens[$i]));
- $tokens[$i] = null;
- } else {
- $this->imported[] = $import;
- $parser = new CssParser(file_get_contents($import));
- $import = $parser->getTokens();
- // The @import at-rule has media types defined requiring special handling
- if (count($tokens[$i]->MediaTypes) > 0 && !(count($tokens[$i]->MediaTypes) == 1 && $tokens[$i]->MediaTypes[0] == "all")) {
- $blocks = array();
- /*
- * Filter or set media types of @import at-rule or remove the @import at-rule if no media type is matching the parent @import at-rule
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- if (get_class($import[$ii]) === "CssAtImportToken") {
- // @import at-rule defines no media type or only the "all" media type; set the media types to the one defined in the parent @import at-rule
- if (count($import[$ii]->MediaTypes) == 0 || (count($import[$ii]->MediaTypes) == 1 && $import[$ii]->MediaTypes[0] == "all")) {
- $import[$ii]->MediaTypes = $tokens[$i]->MediaTypes;
- } // @import at-rule defineds one or more media types; filter out media types not matching with the parent @import at-rule
- elseif (count($import[$ii]->MediaTypes > 0)) {
- foreach ($import[$ii]->MediaTypes as $index => $mediaType) {
- if (!in_array($mediaType, $tokens[$i]->MediaTypes)) {
- unset($import[$ii]->MediaTypes[$index]);
- }
- }
- $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
- // If there are no media types left in the @import at-rule remove the @import at-rule
- if (count($import[$ii]->MediaTypes) == 0) {
- $import[$ii] = null;
- }
- }
- }
- }
- /*
- * Remove media types of @media at-rule block not defined in the @import at-rule
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- if (get_class($import[$ii]) === "CssAtMediaStartToken") {
- foreach ($import[$ii]->MediaTypes as $index => $mediaType) {
- if (!in_array($mediaType, $tokens[$i]->MediaTypes)) {
- unset($import[$ii]->MediaTypes[$index]);
- }
- $import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
- }
- }
- }
- /*
- * If no media types left of the @media at-rule block remove the complete block
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- if (get_class($import[$ii]) === "CssAtMediaStartToken") {
- if (count($import[$ii]->MediaTypes) === 0) {
- for ($iii = $ii; $iii < $ll; $iii++) {
- if (get_class($import[$iii]) === "CssAtMediaEndToken") {
- break;
- }
- }
- if (get_class($import[$iii]) === "CssAtMediaEndToken") {
- array_splice($import, $ii, $iii - $ii + 1, array());
- $ll = count($import);
- }
- }
- }
- }
- /*
- * If the media types of the @media at-rule equals the media types defined in the @import
- * at-rule remove the CssAtMediaStartToken and CssAtMediaEndToken token
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- if (get_class($import[$ii]) === "CssAtMediaStartToken" && count(array_diff($tokens[$i]->MediaTypes, $import[$ii]->MediaTypes)) === 0) {
- for ($iii = $ii; $iii < $ll; $iii++) {
- if (get_class($import[$iii]) == "CssAtMediaEndToken") {
- break;
- }
- }
- if (get_class($import[$iii]) == "CssAtMediaEndToken") {
- unset($import[$ii]);
- unset($import[$iii]);
- $import = array_values($import);
- $ll = count($import);
- }
- }
- }
- /**
- * Extract CssAtImportToken and CssAtCharsetToken tokens
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- $class = get_class($import[$ii]);
- if ($class === "CssAtImportToken" || $class === "CssAtCharsetToken") {
- $blocks = array_merge($blocks, array_splice($import, $ii, 1, array()));
- $ll = count($import);
- }
- }
- /*
- * Extract the @font-face, @media and @page at-rule block
- */
- for ($ii = 0, $ll = count($import); $ii < $ll; $ii++) {
- $class = get_class($import[$ii]);
- if ($class === "CssAtFontFaceStartToken" || $class === "CssAtMediaStartToken" || $class === "CssAtPageStartToken" || $class === "CssAtVariablesStartToken") {
- for ($iii = $ii; $iii < $ll; $iii++) {
- $class = get_class($import[$iii]);
- if ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken") {
- break;
- }
- }
- $class = get_class($import[$iii]);
- if (isset($import[$iii]) && ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken")) {
- $blocks = array_merge($blocks, array_splice($import, $ii, $iii - $ii + 1, array()));
- $ll = count($import);
- }
- }
- }
- // Create the import array with extracted tokens and the rulesets wrapped into a @media at-rule block
- $import = array_merge($blocks, array(new CssAtMediaStartToken($tokens[$i]->MediaTypes)), $import, array(new CssAtMediaEndToken()));
- }
- // Insert the imported tokens
- array_splice($tokens, $i, 1, $import);
- // Modify parameters of the for-loop
- $i--;
- $l = count($tokens);
- }
- }
- }
- }
-}
-
-/**
- * {@link aCssParserPlugin Parser plugin} for preserve parsing expression() declaration values.
- *
- * This plugin return no {@link aCssToken CssToken} but ensures that expression() declaration values will get parsed
- * properly.
- *
- * @package CssMin/Parser/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla " . $this->Source . "" : "") . "in file " . $this->File . " at line " . $this->Line; - } -} - -/** - * This {@link aCssMinifierPlugin} will convert a color value in rgb notation to hexadecimal notation. - * - * Example: - *
- * color: rgb(200,60%,5);
- *
- *
- * Will get converted to:
- *
- * color:#c89905;
- *
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla
- * color: black;
- * border: 1px solid indigo;
- *
- *
- * Will get converted to:
- *
- * color:#000;
- * border:1px solid #4b0082;
- *
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla
- * color: hsl(232,36%,48%);
- *
- *
- * Will get converted to:
- *
- * color:#4e5aa7;
- *
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla
- * font-weight: normal;
- * font: bold 11px monospace;
- *
- *
- * Will get converted to:
- *
- * font-weight:400;
- * font:700 11px monospace;
- *
- *
- * @package CssMin/Minifier/Pluginsn
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla
- * padding: 0.5em;
- * border: 0px;
- * margin: 0 0 0 0;
- *
- *
- * Will get compressed to:
- *
- *
- * padding:.5px;
- * border:0;
- * margin:0;
- *
- *
- * --
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla
- * color: #aabbcc;
- *
- *
- * Will get converted to:
- *
- * color:#abc;
- *
- *
- * @package CssMin/Minifier/Plugins
- * @link http://code.google.com/p/cssmin/
- * @author Joe Scylla +Yahoo
+Microsoft/Outlook/Hotmail/Live/Office365
+ + + $clientId, + 'clientSecret' => $clientSecret, + 'redirectUri' => $redirectUri, + 'accessType' => 'offline' +]; + +$options = []; +$provider = null; + +switch ($providerName) { + case 'Google': + $provider = new Google($params); + $options = [ + 'scope' => [ + 'https://mail.google.com/' + ] + ]; + break; + case 'Yahoo': + $provider = new Yahoo($params); + break; + case 'Microsoft': + $provider = new Microsoft($params); + $options = [ + 'scope' => [ + 'wl.imap', + 'wl.offline_access' + ] + ]; + break; +} + +if (null === $provider) { + exit('Provider missing'); +} + +if (!isset($_GET['code'])) { + // If we don't have an authorization code then get one + $authUrl = $provider->getAuthorizationUrl($options); + $_SESSION['oauth2state'] = $provider->getState(); + header('Location: ' . $authUrl); + exit; +// Check given state against previously stored one to mitigate CSRF attack +} elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) { + unset($_SESSION['oauth2state']); + unset($_SESSION['provider']); + exit('Invalid state'); +} else { + unset($_SESSION['provider']); + // Try to get an access token (using the authorization code grant) + $token = $provider->getAccessToken( + 'authorization_code', + [ + 'code' => $_GET['code'] + ] + ); + // Use this to interact with an API on the users behalf + // Use this to get a new access token if the old one expires + echo 'Refresh Token: ', $token->getRefreshToken(); +} diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php new file mode 100644 index 00000000..ff2a9695 --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-am.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP -ի սխալ: տվյալները ընդունված չեն.'; +$PHPMAILER_LANG['empty_message'] = 'Հաղորդագրությունը դատարկ է'; +$PHPMAILER_LANG['encoding'] = 'Կոդավորման անհայտ տեսակ: '; +$PHPMAILER_LANG['execute'] = 'Չհաջողվեց իրականացնել հրամանը: '; +$PHPMAILER_LANG['file_access'] = 'Ֆայլը հասանելի չէ: '; +$PHPMAILER_LANG['file_open'] = 'Ֆայլի սխալ: ֆայլը չհաջողվեց բացել: '; +$PHPMAILER_LANG['from_failed'] = 'Ուղարկողի հետևյալ հասցեն սխալ է: '; +$PHPMAILER_LANG['instantiate'] = 'Հնարավոր չէ կանչել mail ֆունկցիան.'; +$PHPMAILER_LANG['invalid_address'] = 'Հասցեն սխալ է: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' փոստային սերվերի հետ չի աշխատում.'; +$PHPMAILER_LANG['provide_address'] = 'Անհրաժեշտ է տրամադրել գոնե մեկ ստացողի e-mail հասցե.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP -ի սխալ: չի հաջողվել ուղարկել հետևյալ ստացողների հասցեներին: '; +$PHPMAILER_LANG['signing'] = 'Ստորագրման սխալ: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP -ի connect() ֆունկցիան չի հաջողվել'; +$PHPMAILER_LANG['smtp_error'] = 'SMTP սերվերի սխալ: '; +$PHPMAILER_LANG['variable_set'] = 'Չի հաջողվում ստեղծել կամ վերափոխել փոփոխականը: '; +$PHPMAILER_LANG['extension_missing'] = 'Հավելվածը բացակայում է: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php new file mode 100644 index 00000000..790e2a5e --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php @@ -0,0 +1,27 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'خطأ SMTP : لا يمكن تأكيد الهوية.'; +$PHPMAILER_LANG['connect_host'] = 'خطأ SMTP: لا يمكن الاتصال بالخادم SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'خطأ SMTP: لم يتم قبول المعلومات .'; +$PHPMAILER_LANG['empty_message'] = 'نص الرسالة فارغ'; +$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: '; +$PHPMAILER_LANG['execute'] = 'لا يمكن تنفيذ : '; +$PHPMAILER_LANG['file_access'] = 'لا يمكن الوصول للملف: '; +$PHPMAILER_LANG['file_open'] = 'خطأ في الملف: لا يمكن فتحه: '; +$PHPMAILER_LANG['from_failed'] = 'خطأ على مستوى عنوان المرسل : '; +$PHPMAILER_LANG['instantiate'] = 'لا يمكن توفير خدمة البريد.'; +$PHPMAILER_LANG['invalid_address'] = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.'; +$PHPMAILER_LANG['provide_address'] = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.'; +$PHPMAILER_LANG['recipients_failed'] = 'خطأ SMTP: الأخطاء التالية ' . + 'فشل في الارسال لكل من : '; +$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() غير ممكن.'; +$PHPMAILER_LANG['smtp_error'] = 'خطأ على مستوى الخادم SMTP: '; +$PHPMAILER_LANG['variable_set'] = 'لا يمكن تعيين أو إعادة تعيين متغير: '; +//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php new file mode 100644 index 00000000..3749d83d --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP Greška: Neuspjela prijava.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Greška: Nije moguće spojiti se 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: '; \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php new file mode 100644 index 00000000..e2f98f0f --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'Памылка SMTP: памылка ідэнтыфікацыі.'; +$PHPMAILER_LANG['connect_host'] = 'Памылка SMTP: нельга ўстанавіць сувязь з SMTP-серверам.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Памылка SMTP: звесткі непрынятыя.'; +$PHPMAILER_LANG['empty_message'] = 'Пустое паведамленне.'; +$PHPMAILER_LANG['encoding'] = 'Невядомая кадыроўка тэксту: '; +$PHPMAILER_LANG['execute'] = 'Нельга выканаць каманду: '; +$PHPMAILER_LANG['file_access'] = 'Няма доступу да файла: '; +$PHPMAILER_LANG['file_open'] = 'Нельга адкрыць файл: '; +$PHPMAILER_LANG['from_failed'] = 'Няправільны адрас адпраўніка: '; +$PHPMAILER_LANG['instantiate'] = 'Нельга прымяніць функцыю mail().'; +$PHPMAILER_LANG['invalid_address'] = 'Нельга даслаць паведамленне, няправільны email атрымальніка: '; +$PHPMAILER_LANG['provide_address'] = 'Запоўніце, калі ласка, правільны email атрымальніка.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' - паштовы сервер не падтрымліваецца.'; +$PHPMAILER_LANG['recipients_failed'] = 'Памылка SMTP: няправільныя атрымальнікі: '; +$PHPMAILER_LANG['signing'] = 'Памылка подпісу паведамлення: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'Памылка сувязі з SMTP-серверам.'; +$PHPMAILER_LANG['smtp_error'] = 'Памылка SMTP: '; +$PHPMAILER_LANG['variable_set'] = 'Нельга ўстанавіць або перамяніць значэнне пераменнай: '; +//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php new file mode 100644 index 00000000..b22941f6 --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP грешка: Не може да се удостовери пред сървъра.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP грешка: Не може да се свърже с SMTP хоста.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP грешка: данните не са приети.'; +$PHPMAILER_LANG['empty_message'] = 'Съдържанието на съобщението е празно'; +$PHPMAILER_LANG['encoding'] = 'Неизвестно кодиране: '; +$PHPMAILER_LANG['execute'] = 'Не може да се изпълни: '; +$PHPMAILER_LANG['file_access'] = 'Няма достъп до файл: '; +$PHPMAILER_LANG['file_open'] = 'Файлова грешка: Не може да се отвори файл: '; +$PHPMAILER_LANG['from_failed'] = 'Следните адреси за подател са невалидни: '; +$PHPMAILER_LANG['instantiate'] = 'Не може да се инстанцира функцията mail.'; +$PHPMAILER_LANG['invalid_address'] = 'Невалиден адрес: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' - пощенски сървър не се поддържа.'; +$PHPMAILER_LANG['provide_address'] = 'Трябва да предоставите поне един email адрес за получател.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP грешка: Следните адреси за Получател са невалидни: '; +$PHPMAILER_LANG['signing'] = 'Грешка при подписване: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP провален connect().'; +$PHPMAILER_LANG['smtp_error'] = 'SMTP сървърна грешка: '; +$PHPMAILER_LANG['variable_set'] = 'Не може да се установи или възстанови променлива: '; +$PHPMAILER_LANG['extension_missing'] = 'Липсва разширение: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php new file mode 100644 index 00000000..4117596c --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'Error SMTP: No s’ha pogut autenticar.'; +$PHPMAILER_LANG['connect_host'] = 'Error SMTP: No es pot connectar al servidor SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Dades no acceptades.'; +$PHPMAILER_LANG['empty_message'] = 'El cos del missatge està buit.'; +$PHPMAILER_LANG['encoding'] = 'Codificació desconeguda: '; +$PHPMAILER_LANG['execute'] = 'No es pot executar: '; +$PHPMAILER_LANG['file_access'] = 'No es pot accedir a l’arxiu: '; +$PHPMAILER_LANG['file_open'] = 'Error d’Arxiu: No es pot obrir l’arxiu: '; +$PHPMAILER_LANG['from_failed'] = 'La(s) següent(s) adreces de remitent han fallat: '; +$PHPMAILER_LANG['instantiate'] = 'No s’ha pogut crear una instància de la funció Mail.'; +$PHPMAILER_LANG['invalid_address'] = 'Adreça d’email invalida: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat'; +$PHPMAILER_LANG['provide_address'] = 'S’ha de proveir almenys una adreça d’email com a destinatari.'; +$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Els següents destinataris han fallat: '; +$PHPMAILER_LANG['signing'] = 'Error al signar: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'Ha fallat el SMTP Connect().'; +$PHPMAILER_LANG['smtp_error'] = 'Error del servidor SMTP: '; +$PHPMAILER_LANG['variable_set'] = 'No s’ha pogut establir o restablir la variable: '; +//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php new file mode 100644 index 00000000..4fda6b85 --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：身份验证失败。'; +$PHPMAILER_LANG['connect_host'] = 'SMTP 错误: 不能连接SMTP主机。'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误: 数据不可接受。'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = '未知编码：'; +$PHPMAILER_LANG['execute'] = '不能执行: '; +$PHPMAILER_LANG['file_access'] = '不能访问文件：'; +$PHPMAILER_LANG['file_open'] = '文件错误：不能打开文件：'; +$PHPMAILER_LANG['from_failed'] = '下面的发送地址邮件发送失败了： '; +$PHPMAILER_LANG['instantiate'] = '不能实现mail方法。'; +//$PHPMAILER_LANG['invalid_address'] = 'Invalid address: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。'; +$PHPMAILER_LANG['provide_address'] = '您必须提供至少一个 收信人的email地址。'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误： 下面的 收件人失败了： '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php new file mode 100644 index 00000000..1160cf0c --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php @@ -0,0 +1,25 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke accepteres.'; +//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: '; +$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: '; +$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: '; +$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: '; +$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er forkert: '; +$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email funktionen.'; +//$PHPMAILER_LANG['invalid_address'] = 'Invalid address: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.'; +$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en modtagers emailadresse.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er forkerte: '; +//$PHPMAILER_LANG['signing'] = 'Signing Error: '; +//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; +//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; +//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php new file mode 100644 index 00000000..aa987a9c --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php @@ -0,0 +1,25 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'Error SMTP: Imposible autentificar.'; +$PHPMAILER_LANG['connect_host'] = 'Error SMTP: Imposible conectar al servidor SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Datos no aceptados.'; +$PHPMAILER_LANG['empty_message'] = 'El cuerpo del mensaje está vacío'; +$PHPMAILER_LANG['encoding'] = 'Codificación desconocida: '; +$PHPMAILER_LANG['execute'] = 'Imposible ejecutar: '; +$PHPMAILER_LANG['file_access'] = 'Imposible acceder al archivo: '; +$PHPMAILER_LANG['file_open'] = 'Error de Archivo: Imposible abrir el archivo: '; +$PHPMAILER_LANG['from_failed'] = 'La(s) siguiente(s) direcciones de remitente fallaron: '; +$PHPMAILER_LANG['instantiate'] = 'Imposible crear una instancia de la función Mail.'; +$PHPMAILER_LANG['invalid_address'] = 'Imposible enviar: dirección de email inválido: '; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.'; +$PHPMAILER_LANG['provide_address'] = 'Debe proporcionar al menos una dirección de email de destino.'; +$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Los siguientes destinos fallaron: '; +$PHPMAILER_LANG['signing'] = 'Error al firmar: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() falló.'; +$PHPMAILER_LANG['smtp_error'] = 'Error del servidor SMTP: '; +$PHPMAILER_LANG['variable_set'] = 'No se pudo configurar la variable: '; +$PHPMAILER_LANG['extension_missing'] = 'Extensión faltante: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php new file mode 100644 index 00000000..7e06da13 --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php @@ -0,0 +1,27 @@ + + */ + +$PHPMAILER_LANG['authenticate'] = 'SMTP Viga: Autoriseerimise viga.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Viga: Vigased andmed.'; +$PHPMAILER_LANG['empty_message'] = 'Tühi kirja sisu'; +$PHPMAILER_LANG["encoding"] = 'Tundmatu kodeering: '; +$PHPMAILER_LANG['execute'] = 'Tegevus ebaõnnestus: '; +$PHPMAILER_LANG['file_access'] = 'Pole piisavalt õiguseid järgneva faili avamiseks: '; +$PHPMAILER_LANG['file_open'] = 'Faili Viga: Faili avamine ebaõnnestus: '; +$PHPMAILER_LANG['from_failed'] = 'Järgnev saatja e-posti aadress on vigane: '; +$PHPMAILER_LANG['instantiate'] = 'mail funktiooni käivitamine ebaõnnestus.'; +$PHPMAILER_LANG['invalid_address'] = 'Saatmine peatatud, e-posti address vigane: '; +$PHPMAILER_LANG['provide_address'] = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.'; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: '; +$PHPMAILER_LANG["signing"] = 'Viga allkirjastamisel: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() ebaõnnestus.'; +$PHPMAILER_LANG['smtp_error'] = 'SMTP serveri viga: '; +$PHPMAILER_LANG['variable_set'] = 'Ei õnnestunud määrata või lähtestada muutujat: '; +$PHPMAILER_LANG['extension_missing'] = 'Nõutud laiendus on puudu: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php new file mode 100644 index 00000000..ad0745c5 --- /dev/null +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php @@ -0,0 +1,27 @@ + + * @author Mohammad Hossein Mojtahedi
\n"; + } +} diff --git a/vendor/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php new file mode 100644 index 00000000..b2309a1f --- /dev/null +++ b/vendor/phpmailer/phpmailer/src/OAuth.php @@ -0,0 +1,138 @@ + + * @author Jim Jagielski (jimjag)
`, appropriate for browser output * * `error_log` Output to error log as configured in php.ini - * + * By default PHPMailer will use `echo` if run from a `cli` or `cli-server` SAPI, `html` otherwise. * Alternatively, you can provide a callable expecting two params: a message string and the debug level: - *
+ *
+ * ```php
* $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
- *
- * @var string|callable
+ * ```
+ *
+ * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
+ * level output is used:
+ *
+ * ```php
+ * $mail->Debugoutput = new myPsr3Logger;
+ * ```
+ *
* @see SMTP::$Debugoutput
+ *
+ * @var string|callable|\Psr\Log\LoggerInterface
*/
public $Debugoutput = 'echo';
@@ -352,7 +370,8 @@ class PHPMailer
* Whether to keep SMTP connection open after each message.
* If this is set to true then to close the connection
* requires an explicit call to smtpClose().
- * @var boolean
+ *
+ * @var bool
*/
public $SMTPKeepAlive = false;
@@ -360,42 +379,39 @@ class PHPMailer
* Whether to split multiple to addresses into multiple messages
* or send them all in one message.
* Only supported in `mail` and `sendmail` transports, not in SMTP.
- * @var boolean
+ *
+ * @var bool
*/
public $SingleTo = false;
/**
* Storage for addresses when SingleTo is enabled.
+ *
* @var array
- * @TODO This should really not be public
*/
- public $SingleToArray = array();
+ protected $SingleToArray = [];
/**
* Whether to generate VERP addresses on send.
* Only applicable when sending via SMTP.
- * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
- * @link http://www.postfix.org/VERP_README.html Postfix VERP info
- * @var boolean
+ *
+ * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
+ * @see http://www.postfix.org/VERP_README.html Postfix VERP info
+ *
+ * @var bool
*/
public $do_verp = false;
/**
* Whether to allow sending messages with an empty body.
- * @var boolean
+ *
+ * @var bool
*/
public $AllowEmpty = false;
- /**
- * The default line ending.
- * @note The default remains "\n". We force CRLF where we know
- * it must be used via self::CRLF.
- * @var string
- */
- public $LE = "\n";
-
/**
* DKIM selector.
+ *
* @var string
*/
public $DKIM_selector = '';
@@ -403,6 +419,7 @@ class PHPMailer
/**
* DKIM Identity.
* Usually the email address used as the source of the email.
+ *
* @var string
*/
public $DKIM_identity = '';
@@ -410,26 +427,32 @@ class PHPMailer
/**
* DKIM passphrase.
* Used if your key is encrypted.
+ *
* @var string
*/
public $DKIM_passphrase = '';
/**
* DKIM signing domain name.
+ *
* @example 'example.com'
+ *
* @var string
*/
public $DKIM_domain = '';
/**
* DKIM private key file path.
+ *
* @var string
*/
public $DKIM_private = '';
/**
* DKIM private key string.
+ *
* If set, takes precedence over `$DKIM_private`.
+ *
* @var string
*/
public $DKIM_private_string = '';
@@ -443,20 +466,24 @@ class PHPMailer
* Value can be any php callable: http://www.php.net/is_callable
*
* Parameters:
- * boolean $result result of the send action
- * string $to email address of the recipient
- * string $cc cc email addresses
- * string $bcc bcc email addresses
+ * bool $result result of the send action
+ * array $to email addresses of the recipients
+ * array $cc cc email addresses
+ * array $bcc bcc email addresses
* string $subject the subject
* string $body the email body
* string $from email address of sender
+ * string $extra extra information of possible use
+ * "smtp_transaction_id' => last smtp transaction id
+ *
* @var string
*/
public $action_function = '';
/**
* What to put in the X-Mailer header.
- * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
+ * Options: An empty string for PHPMailer default, whitespace for none, or a string to use.
+ *
* @var string
*/
public $XMailer = '';
@@ -464,205 +491,240 @@ class PHPMailer
/**
* Which validator to use by default when validating email addresses.
* May be a callable to inject your own validator, but there are several built-in validators.
+ * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
+ *
* @see PHPMailer::validateAddress()
+ *
* @var string|callable
- * @static
*/
- public static $validator = 'auto';
+ public static $validator = 'php';
/**
* An instance of the SMTP sender class.
+ *
* @var SMTP
- * @access protected
*/
protected $smtp = null;
/**
* The array of 'to' names and addresses.
+ *
* @var array
- * @access protected
*/
- protected $to = array();
+ protected $to = [];
/**
* The array of 'cc' names and addresses.
+ *
* @var array
- * @access protected
*/
- protected $cc = array();
+ protected $cc = [];
/**
* The array of 'bcc' names and addresses.
+ *
* @var array
- * @access protected
*/
- protected $bcc = array();
+ protected $bcc = [];
/**
* The array of reply-to names and addresses.
+ *
* @var array
- * @access protected
*/
- protected $ReplyTo = array();
+ protected $ReplyTo = [];
/**
* An array of all kinds of addresses.
- * Includes all of $to, $cc, $bcc
+ * Includes all of $to, $cc, $bcc.
+ *
+ * @see PHPMailer::$to
+ * @see PHPMailer::$cc
+ * @see PHPMailer::$bcc
+ *
* @var array
- * @access protected
- * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
*/
- protected $all_recipients = array();
+ protected $all_recipients = [];
/**
* An array of names and addresses queued for validation.
* In send(), valid and non duplicate entries are moved to $all_recipients
* and one of $to, $cc, or $bcc.
* This array is used only for addresses with IDN.
- * @var array
- * @access protected
- * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+ *
+ * @see PHPMailer::$to
+ * @see PHPMailer::$cc
+ * @see PHPMailer::$bcc
* @see PHPMailer::$all_recipients
+ *
+ * @var array
*/
- protected $RecipientsQueue = array();
+ protected $RecipientsQueue = [];
/**
* An array of reply-to names and addresses queued for validation.
* In send(), valid and non duplicate entries are moved to $ReplyTo.
* This array is used only for addresses with IDN.
- * @var array
- * @access protected
+ *
* @see PHPMailer::$ReplyTo
+ *
+ * @var array
*/
- protected $ReplyToQueue = array();
+ protected $ReplyToQueue = [];
/**
* The array of attachments.
+ *
* @var array
- * @access protected
*/
- protected $attachment = array();
+ protected $attachment = [];
/**
* The array of custom headers.
+ *
* @var array
- * @access protected
*/
- protected $CustomHeader = array();
+ protected $CustomHeader = [];
/**
* The most recent Message-ID (including angular brackets).
+ *
* @var string
- * @access protected
*/
protected $lastMessageID = '';
/**
* The message's MIME type.
+ *
* @var string
- * @access protected
*/
protected $message_type = '';
/**
* The array of MIME boundary strings.
+ *
* @var array
- * @access protected
*/
- protected $boundary = array();
+ protected $boundary = [];
/**
* The array of available languages.
+ *
* @var array
- * @access protected
*/
- protected $language = array();
+ protected $language = [];
/**
* The number of errors encountered.
- * @var integer
- * @access protected
+ *
+ * @var int
*/
protected $error_count = 0;
/**
* The S/MIME certificate file path.
+ *
* @var string
- * @access protected
*/
protected $sign_cert_file = '';
/**
* The S/MIME key file path.
+ *
* @var string
- * @access protected
*/
protected $sign_key_file = '';
/**
* The optional S/MIME extra certificates ("CA Chain") file path.
+ *
* @var string
- * @access protected
*/
protected $sign_extracerts_file = '';
/**
* The S/MIME password for the key.
* Used only if the key is encrypted.
+ *
* @var string
- * @access protected
*/
protected $sign_key_pass = '';
/**
* Whether to throw exceptions for errors.
- * @var boolean
- * @access protected
+ *
+ * @var bool
*/
protected $exceptions = false;
/**
* Unique ID used for message ID and boundaries.
+ *
* @var string
- * @access protected
*/
protected $uniqueid = '';
+ /**
+ * The PHPMailer Version number.
+ *
+ * @var string
+ */
+ const VERSION = '6.0.1';
+
/**
* Error severity: message only, continue processing.
+ *
+ * @var int
*/
const STOP_MESSAGE = 0;
/**
* Error severity: message, likely ok to continue processing.
+ *
+ * @var int
*/
const STOP_CONTINUE = 1;
/**
* Error severity: message, plus full stop, critical error reached.
+ *
+ * @var int
*/
const STOP_CRITICAL = 2;
/**
* SMTP RFC standard line ending.
+ *
+ * @var string
*/
- const CRLF = "\r\n";
+ protected static $LE = "\r\n";
/**
- * The maximum line length allowed by RFC 2822 section 2.1.1
- * @var integer
+ * The maximum line length allowed by RFC 2822 section 2.1.1.
+ *
+ * @var int
*/
const MAX_LINE_LENGTH = 998;
+ /**
+ * The lower maximum line length allowed by RFC 2822 section 2.1.1.
+ *
+ * @var int
+ */
+ const STD_LINE_LENGTH = 78;
+
/**
* Constructor.
- * @param boolean $exceptions Should we throw external exceptions?
+ *
+ * @param bool $exceptions Should we throw external exceptions?
*/
public function __construct($exceptions = null)
{
- if ($exceptions !== null) {
- $this->exceptions = (boolean)$exceptions;
+ if (null !== $exceptions) {
+ $this->exceptions = (bool) $exceptions;
}
+ //Pick an appropriate debug output format automatically
+ $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
}
/**
@@ -678,14 +740,15 @@ class PHPMailer
* Call mail() in a safe_mode-aware fashion.
* Also, unless sendmail_path points to sendmail (or something that
* claims to be sendmail), don't pass params (not a perfect fix,
- * but it will do)
- * @param string $to To
- * @param string $subject Subject
- * @param string $body Message Body
- * @param string $header Additional Header(s)
- * @param string $params Params
- * @access private
- * @return boolean
+ * but it will do).
+ *
+ * @param string $to To
+ * @param string $subject Subject
+ * @param string $body Message Body
+ * @param string $header Additional Header(s)
+ * @param string|null $params Params
+ *
+ * @return bool
*/
private function mailPassthru($to, $subject, $body, $header, $params)
{
@@ -695,21 +758,23 @@ class PHPMailer
} else {
$subject = $this->encodeHeader($this->secureHeader($subject));
}
-
- //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
- //@link http://php.net/manual/en/function.mail.php
- if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
+ //Calling mail() with null params breaks
+ if (!$this->UseSendmailOptions or null === $params) {
$result = @mail($to, $subject, $body, $header);
} else {
$result = @mail($to, $subject, $body, $header, $params);
}
+
return $result;
}
+
/**
* Output debugging info via user-defined method.
* Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+ *
* @see PHPMailer::$Debugoutput
* @see PHPMailer::$SMTPDebug
+ *
* @param string $str
*/
protected function edebug($str)
@@ -717,9 +782,16 @@ class PHPMailer
if ($this->SMTPDebug <= 0) {
return;
}
+ //Is this a PSR-3 logger?
+ if (is_a($this->Debugoutput, 'Psr\Log\LoggerInterface')) {
+ $this->Debugoutput->debug($str);
+
+ return;
+ }
//Avoid clash with built-in function names
- if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+ if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+
return;
}
switch ($this->Debugoutput) {
@@ -733,25 +805,31 @@ class PHPMailer
preg_replace('/[\r\n]+/', '', $str),
ENT_QUOTES,
'UTF-8'
- )
- . "\n"; + ), "
\n"; break; case 'echo': default: //Normalize line breaks - $str = preg_replace('/\r\n?/ms', "\n", $str); - echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( - "\n", - "\n \t ", - trim($str) - ) . "\n"; + $str = preg_replace('/\r\n|\r/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s'), + "\t", + //Trim trailing space + trim( + //Indent for readability, except for trailing break + str_replace( + "\n", + "\n \t ", + trim($str) + ) + ), + "\n"; } } /** * Sets message type to HTML or plain. - * @param boolean $isHtml True for HTML mode. - * @return void + * + * @param bool $isHtml True for HTML mode */ public function isHTML($isHtml = true) { @@ -764,7 +842,6 @@ class PHPMailer /** * Send messages using SMTP. - * @return void */ public function isSMTP() { @@ -773,7 +850,6 @@ class PHPMailer /** * Send messages using PHP's mail() function. - * @return void */ public function isMail() { @@ -782,7 +858,6 @@ class PHPMailer /** * Send messages using $Sendmail. - * @return void */ public function isSendmail() { @@ -798,7 +873,6 @@ class PHPMailer /** * Send messages using qmail. - * @return void */ public function isQmail() { @@ -814,9 +888,11 @@ class PHPMailer /** * Add a "To" address. + * * @param string $address The email address to send to * @param string $name - * @return boolean true on success, false if address already used or invalid in some way + * + * @return bool true on success, false if address already used or invalid in some way */ public function addAddress($address, $name = '') { @@ -825,10 +901,11 @@ class PHPMailer /** * Add a "CC" address. - * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * * @param string $address The email address to send to * @param string $name - * @return boolean true on success, false if address already used or invalid in some way + * + * @return bool true on success, false if address already used or invalid in some way */ public function addCC($address, $name = '') { @@ -837,10 +914,11 @@ class PHPMailer /** * Add a "BCC" address. - * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * * @param string $address The email address to send to * @param string $name - * @return boolean true on success, false if address already used or invalid in some way + * + * @return bool true on success, false if address already used or invalid in some way */ public function addBCC($address, $name = '') { @@ -849,9 +927,11 @@ class PHPMailer /** * Add a "Reply-To" address. + * * @param string $address The email address to reply to * @param string $name - * @return boolean true on success, false if address already used or invalid in some way + * + * @return bool true on success, false if address already used or invalid in some way */ public function addReplyTo($address, $name = '') { @@ -863,89 +943,104 @@ class PHPMailer * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still * be modified after calling this function), addition of such addresses is delayed until send(). * Addresses that have been added already return false, but do not throw exceptions. - * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' * @param string $address The email address to send, resp. to reply to * @param string $name - * @throws phpmailerException - * @return boolean true on success, false if address already used or invalid in some way - * @access protected + * + * @throws Exception + * + * @return bool true on success, false if address already used or invalid in some way */ protected function addOrEnqueueAnAddress($kind, $address, $name) { $address = trim($address); $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (($pos = strrpos($address, '@')) === false) { - // At-sign is misssing. + $pos = strrpos($address, '@'); + if (false === $pos) { + // At-sign is missing. $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address"; $this->setError($error_message); $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($error_message); + throw new Exception($error_message); } + return false; } - $params = array($kind, $address, $name); + $params = [$kind, $address, $name]; // Enqueue addresses with IDN until we know the PHPMailer::$CharSet. if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) { - if ($kind != 'Reply-To') { + if ('Reply-To' != $kind) { if (!array_key_exists($address, $this->RecipientsQueue)) { $this->RecipientsQueue[$address] = $params; + return true; } } else { if (!array_key_exists($address, $this->ReplyToQueue)) { $this->ReplyToQueue[$address] = $params; + return true; } } + return false; } + // Immediately add standard addresses without IDN. - return call_user_func_array(array($this, 'addAnAddress'), $params); + return call_user_func_array([$this, 'addAnAddress'], $params); } /** * Add an address to one of the recipient arrays or to the ReplyTo array. * Addresses that have been added already return false, but do not throw exceptions. - * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' + * + * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo' * @param string $address The email address to send, resp. to reply to * @param string $name - * @throws phpmailerException - * @return boolean true on success, false if address already used or invalid in some way - * @access protected + * + * @throws Exception + * + * @return bool true on success, false if address already used or invalid in some way */ protected function addAnAddress($kind, $address, $name = '') { - if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) { + if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) { $error_message = $this->lang('Invalid recipient kind: ') . $kind; $this->setError($error_message); $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($error_message); + throw new Exception($error_message); } + return false; } - if (!$this->validateAddress($address)) { + if (!static::validateAddress($address)) { $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address"; $this->setError($error_message); $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($error_message); + throw new Exception($error_message); } + return false; } - if ($kind != 'Reply-To') { + if ('Reply-To' != $kind) { if (!array_key_exists(strtolower($address), $this->all_recipients)) { - array_push($this->$kind, array($address, $name)); + array_push($this->$kind, [$address, $name]); $this->all_recipients[strtolower($address)] = true; + return true; } } else { if (!array_key_exists(strtolower($address), $this->ReplyTo)) { - $this->ReplyTo[strtolower($address)] = array($address, $name); + $this->ReplyTo[strtolower($address)] = [$address, $name]; + return true; } } + return false; } @@ -954,24 +1049,27 @@ class PHPMailer * of the form "display name " into an array of name/address pairs. * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available. * Note that quotes in the name part are removed. + * + * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation + * * @param string $addrstr The address list string - * @param bool $useimap Whether to use the IMAP extension to parse the list + * @param bool $useimap Whether to use the IMAP extension to parse the list + * * @return array - * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation */ - public function parseAddresses($addrstr, $useimap = true) + public static function parseAddresses($addrstr, $useimap = true) { - $addresses = array(); + $addresses = []; if ($useimap and function_exists('imap_rfc822_parse_adrlist')) { //Use this built-in parser if it's available $list = imap_rfc822_parse_adrlist($addrstr, ''); foreach ($list as $address) { - if ($address->host != '.SYNTAX-ERROR.') { - if ($this->validateAddress($address->mailbox . '@' . $address->host)) { - $addresses[] = array( + if ('.SYNTAX-ERROR.' != $address->host) { + if (static::validateAddress($address->mailbox . '@' . $address->host)) { + $addresses[] = [ 'name' => (property_exists($address, 'personal') ? $address->personal : ''), - 'address' => $address->mailbox . '@' . $address->host - ); + 'address' => $address->mailbox . '@' . $address->host, + ]; } } } @@ -983,49 +1081,55 @@ class PHPMailer //Is there a separate name part? if (strpos($address, '<') === false) { //No separate name, just use the whole thing - if ($this->validateAddress($address)) { - $addresses[] = array( + if (static::validateAddress($address)) { + $addresses[] = [ 'name' => '', - 'address' => $address - ); + 'address' => $address, + ]; } } else { list($name, $email) = explode('<', $address); $email = trim(str_replace('>', '', $email)); - if ($this->validateAddress($email)) { - $addresses[] = array( - 'name' => trim(str_replace(array('"', "'"), '', $name)), - 'address' => $email - ); + if (static::validateAddress($email)) { + $addresses[] = [ + 'name' => trim(str_replace(['"', "'"], '', $name)), + 'address' => $email, + ]; } } } } + return $addresses; } /** * Set the From and FromName properties. + * * @param string $address * @param string $name - * @param boolean $auto Whether to also set the Sender address, defaults to true - * @throws phpmailerException - * @return boolean + * @param bool $auto Whether to also set the Sender address, defaults to true + * + * @throws Exception + * + * @return bool */ public function setFrom($address, $name = '', $auto = true) { $address = trim($address); $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim // Don't validate now addresses with IDN. Will be done in send(). - if (($pos = strrpos($address, '@')) === false or + $pos = strrpos($address, '@'); + if (false === $pos or (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and - !$this->validateAddress($address)) { + !static::validateAddress($address)) { $error_message = $this->lang('invalid_address') . " (setFrom) $address"; $this->setError($error_message); $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($error_message); + throw new Exception($error_message); } + return false; } $this->From = $address; @@ -1035,6 +1139,7 @@ class PHPMailer $this->Sender = $address; } } + return true; } @@ -1043,6 +1148,7 @@ class PHPMailer * Technically this is the value from the last time the headers were created, * but it's also the message ID of the last sent message except in * pathological cases. + * * @return string */ public function getLastMessageID() @@ -1052,27 +1158,32 @@ class PHPMailer /** * Check that a string looks like an email address. - * @param string $address The email address to check - * @param string|callable $patternselect A selector for the validation pattern to use : + * Validation patterns supported: * * `auto` Pick best pattern automatically; - * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14; + * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0; * * `pcre` Use old PCRE implementation; * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements. * * `noregex` Don't use a regex: super fast, really dumb. * Alternatively you may pass in a callable to inject your own validator, for example: + * + * ```php * PHPMailer::validateAddress('user@example.com', function($address) { * return (strpos($address, '@') !== false); * }); + * ``` + * * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator. - * @return boolean - * @static - * @access public + * + * @param string $address The email address to check + * @param string|callable $patternselect Which pattern to use + * + * @return bool */ public static function validateAddress($address, $patternselect = null) { - if (is_null($patternselect)) { - $patternselect = self::$validator; + if (null === $patternselect) { + $patternselect = static::$validator; } if (is_callable($patternselect)) { return call_user_func($patternselect, $address); @@ -1081,37 +1192,26 @@ class PHPMailer if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) { return false; } - if (!$patternselect or $patternselect == 'auto') { - //Check this constant first so it works when extension_loaded() is disabled by safe mode - //Constant was added in PHP 5.2.4 - if (defined('PCRE_VERSION')) { - //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2 - if (version_compare(PCRE_VERSION, '8.0.3') >= 0) { - $patternselect = 'pcre8'; - } else { - $patternselect = 'pcre'; - } - } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) { - //Fall back to older PCRE - $patternselect = 'pcre'; - } else { - //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension - if (version_compare(PHP_VERSION, '5.2.0') >= 0) { - $patternselect = 'php'; - } else { - $patternselect = 'noregex'; - } - } - } switch ($patternselect) { + case 'pcre': //Kept for BC case 'pcre8': - /** - * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains. - * @link http://squiloople.com/2009/12/20/email-address-validation/ + /* + * A more complex and more permissive version of the RFC5322 regex on which FILTER_VALIDATE_EMAIL + * is based. + * In addition to the addresses allowed by filter_var, also permits: + * * dotless domains: `a@b` + * * comments: `1234 @ local(blah) .machine .example` + * * quoted elements: `'"test blah"@example.org'` + * * numeric TLDs: `a@b.123` + * * unbracketed IPv4 literals: `a@192.168.0.1` + * * IPv6 literals: 'first.last@[IPv6:a1::]' + * Not all of these will necessarily work for sending! + * + * @see http://squiloople.com/2009/12/20/email-address-validation/ * @copyright 2009-2010 Michael Rushton * Feel free to use and redistribute this code. But please keep this copyright notice. */ - return (boolean)preg_match( + return (bool) preg_match( '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' . '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' . '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' . @@ -1123,51 +1223,31 @@ class PHPMailer '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', $address ); - case 'pcre': - //An older regex that doesn't need a recent PCRE - return (boolean)preg_match( - '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' . - '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' . - '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' . - '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' . - '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' . - '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' . - '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' . - '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' . - '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' . - '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD', - $address - ); case 'html5': - /** + /* * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements. - * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) + * + * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) */ - return (boolean)preg_match( + return (bool) preg_match( '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' . '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD', $address ); - case 'noregex': - //No PCRE! Do something _very_ approximate! - //Check the address is 3 chars or longer and contains an @ that's not the first or last char - return (strlen($address) >= 3 - and strpos($address, '@') >= 1 - and strpos($address, '@') != strlen($address) - 1); case 'php': default: - return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL); + return (bool) filter_var($address, FILTER_VALIDATE_EMAIL); } } /** * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the - * "intl" and "mbstring" PHP extensions. - * @return bool "true" if required functions for IDN support are present + * `intl` and `mbstring` PHP extensions. + * + * @return bool `true` if required functions for IDN support are present */ public function idnSupported() { - // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2. return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding'); } @@ -1177,36 +1257,45 @@ class PHPMailer * This function silently returns unmodified address if: * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form) * - Conversion to punycode is impossible (e.g. required PHP functions are not available) - * or fails for any reason (e.g. domain has characters not allowed in an IDN) - * @see PHPMailer::$CharSet + * or fails for any reason (e.g. domain contains characters not allowed in an IDN). + * + * @see PHPMailer::$CharSet + * * @param string $address The email address to convert + * * @return string The encoded address in ASCII form */ public function punyencodeAddress($address) { // Verify we have required functions, CharSet, and at-sign. + $pos = strrpos($address, '@'); if ($this->idnSupported() and !empty($this->CharSet) and - ($pos = strrpos($address, '@')) !== false) { + false !== $pos + ) { $domain = substr($address, ++$pos); // Verify CharSet string is a valid one, and domain properly encoded in this CharSet. if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) { $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet); - if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ? - idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) : - idn_to_ascii($domain)) !== false) { + //Ignore IDE complaints about this line - method signature changed in PHP 5.4 + $errorcode = 0; + $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46); + if (false !== $punycode) { return substr($address, 0, $pos) . $punycode; } } } + return $address; } /** * Create a message and send it. * Uses the sending method specified by $Mailer. - * @throws phpmailerException - * @return boolean false on error - See the ErrorInfo property for details of the error. + * + * @throws Exception + * + * @return bool false on error - See the ErrorInfo property for details of the error */ public function send() { @@ -1214,24 +1303,55 @@ class PHPMailer if (!$this->preSend()) { return false; } + return $this->postSend(); - } catch (phpmailerException $exc) { + } catch (Exception $exc) { $this->mailHeader = ''; $this->setError($exc->getMessage()); if ($this->exceptions) { throw $exc; } + return false; } } /** * Prepare a message for sending. - * @throws phpmailerException - * @return boolean + * + * @throws Exception + * + * @return bool */ public function preSend() { + if ('smtp' == $this->Mailer or + ('mail' == $this->Mailer and stripos(PHP_OS, 'WIN') === 0) + ) { + //SMTP mandates RFC-compliant line endings + //and it's also used with mail() on Windows + static::setLE("\r\n"); + } else { + //Maintain backward compatibility with legacy Linux command line mailers + static::setLE(PHP_EOL); + } + //Check for buggy PHP versions that add a header with an incorrect line break + if (ini_get('mail.add_x_header') == 1 + and 'mail' == $this->Mailer + and stripos(PHP_OS, 'WIN') === 0 + and ((version_compare(PHP_VERSION, '7.0.0', '>=') + and version_compare(PHP_VERSION, '7.0.17', '<')) + or (version_compare(PHP_VERSION, '7.1.0', '>=') + and version_compare(PHP_VERSION, '7.1.3', '<'))) + ) { + trigger_error( + 'Your version of PHP is affected by a bug that may result in corrupted messages.' . + ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' . + ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.', + E_USER_WARNING + ); + } + try { $this->error_count = 0; // Reset errors $this->mailHeader = ''; @@ -1239,26 +1359,27 @@ class PHPMailer // Dequeue recipient and Reply-To addresses with IDN foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) { $params[1] = $this->punyencodeAddress($params[1]); - call_user_func_array(array($this, 'addAnAddress'), $params); + call_user_func_array([$this, 'addAnAddress'], $params); } - if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { - throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL); + if (count($this->to) + count($this->cc) + count($this->bcc) < 1) { + throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL); } // Validate From, Sender, and ConfirmReadingTo addresses - foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) { + foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) { $this->$address_kind = trim($this->$address_kind); if (empty($this->$address_kind)) { continue; } $this->$address_kind = $this->punyencodeAddress($this->$address_kind); - if (!$this->validateAddress($this->$address_kind)) { + if (!static::validateAddress($this->$address_kind)) { $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind; $this->setError($error_message); $this->edebug($error_message); if ($this->exceptions) { - throw new phpmailerException($error_message); + throw new Exception($error_message); } + return false; } } @@ -1271,9 +1392,11 @@ class PHPMailer $this->setMessageType(); // Refuse to send an empty message unless we are specifically allowing it if (!$this->AllowEmpty and empty($this->Body)) { - throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL); + throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL); } + //Trim subject consistently + $this->Subject = trim($this->Subject); // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding) $this->MIMEHeader = ''; $this->MIMEBody = $this->createBody(); @@ -1284,7 +1407,7 @@ class PHPMailer // To capture the complete message when using mail(), create // an extra header list which createHeader() doesn't fold in - if ($this->Mailer == 'mail') { + if ('mail' == $this->Mailer) { if (count($this->to) > 0) { $this->mailHeader .= $this->addrAppend('To', $this->to); } else { @@ -1292,15 +1415,15 @@ class PHPMailer } $this->mailHeader .= $this->headerLine( 'Subject', - $this->encodeHeader($this->secureHeader(trim($this->Subject))) + $this->encodeHeader($this->secureHeader($this->Subject)) ); } // Sign with DKIM if enabled if (!empty($this->DKIM_domain) - && !empty($this->DKIM_selector) - && (!empty($this->DKIM_private_string) - || (!empty($this->DKIM_private) && file_exists($this->DKIM_private)) + and !empty($this->DKIM_selector) + and (!empty($this->DKIM_private_string) + or (!empty($this->DKIM_private) and file_exists($this->DKIM_private)) ) ) { $header_dkim = $this->DKIM_Add( @@ -1308,24 +1431,27 @@ class PHPMailer $this->encodeHeader($this->secureHeader($this->Subject)), $this->MIMEBody ); - $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF . - str_replace("\r\n", "\n", $header_dkim) . self::CRLF; + $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . static::$LE . + static::normalizeBreaks($header_dkim) . static::$LE; } + return true; - } catch (phpmailerException $exc) { + } catch (Exception $exc) { $this->setError($exc->getMessage()); if ($this->exceptions) { throw $exc; } + return false; } } /** - * Actually send a message. - * Send the email via the selected mechanism - * @throws phpmailerException - * @return boolean + * Actually send a message via the selected mechanism. + * + * @throws Exception + * + * @return bool */ public function postSend() { @@ -1340,80 +1466,86 @@ class PHPMailer case 'mail': return $this->mailSend($this->MIMEHeader, $this->MIMEBody); default: - $sendMethod = $this->Mailer.'Send'; + $sendMethod = $this->Mailer . 'Send'; if (method_exists($this, $sendMethod)) { return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody); } return $this->mailSend($this->MIMEHeader, $this->MIMEBody); } - } catch (phpmailerException $exc) { + } catch (Exception $exc) { $this->setError($exc->getMessage()); $this->edebug($exc->getMessage()); if ($this->exceptions) { throw $exc; } } + return false; } /** * Send mail using the $Sendmail program. + * + * @see PHPMailer::$Sendmail + * * @param string $header The message headers - * @param string $body The message body - * @see PHPMailer::$Sendmail - * @throws phpmailerException - * @access protected - * @return boolean + * @param string $body The message body + * + * @throws Exception + * + * @return bool */ protected function sendmailSend($header, $body) { // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. if (!empty($this->Sender) and self::isShellSafe($this->Sender)) { - if ($this->Mailer == 'qmail') { + if ('qmail' == $this->Mailer) { $sendmailFmt = '%s -f%s'; } else { $sendmailFmt = '%s -oi -f%s -t'; } } else { - if ($this->Mailer == 'qmail') { + if ('qmail' == $this->Mailer) { $sendmailFmt = '%s'; } else { $sendmailFmt = '%s -oi -t'; } } - // TODO: If possible, this should be changed to escapeshellarg. Needs thorough testing. $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender); if ($this->SingleTo) { foreach ($this->SingleToArray as $toAddr) { - if (!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + $mail = @popen($sendmail, 'w'); + if (!$mail) { + throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } - fputs($mail, 'To: ' . $toAddr . "\n"); - fputs($mail, $header); - fputs($mail, $body); + fwrite($mail, 'To: ' . $toAddr . "\n"); + fwrite($mail, $header); + fwrite($mail, $body); $result = pclose($mail); $this->doCallback( ($result == 0), - array($toAddr), + [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, - $this->From + $this->From, + [] ); - if ($result != 0) { - throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + if (0 !== $result) { + throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } } } else { - if (!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + $mail = @popen($sendmail, 'w'); + if (!$mail) { + throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } - fputs($mail, $header); - fputs($mail, $body); + fwrite($mail, $header); + fwrite($mail, $body); $result = pclose($mail); $this->doCallback( ($result == 0), @@ -1422,36 +1554,39 @@ class PHPMailer $this->bcc, $this->Subject, $body, - $this->From + $this->From, + [] ); - if ($result != 0) { - throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + if (0 !== $result) { + throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); } } + return true; } /** * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters. - * * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows. - * @param string $string The string to be validated + * * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report - * @access protected - * @return boolean + * + * @param string $string The string to be validated + * + * @return bool */ protected static function isShellSafe($string) { // Future-proof if (escapeshellcmd($string) !== $string - or !in_array(escapeshellarg($string), array("'$string'", "\"$string\"")) + or !in_array(escapeshellarg($string), ["'$string'", "\"$string\""]) ) { return false; } $length = strlen($string); - for ($i = 0; $i < $length; $i++) { + for ($i = 0; $i < $length; ++$i) { $c = $string[$i]; // All other characters have a special meaning in at least one common shell, including = and +. @@ -1467,16 +1602,19 @@ class PHPMailer /** * Send mail using the PHP mail() function. + * + * @see http://www.php.net/manual/en/book.mail.php + * * @param string $header The message headers - * @param string $body The message body - * @link http://www.php.net/manual/en/book.mail.php - * @throws phpmailerException - * @access protected - * @return boolean + * @param string $body The message body + * + * @throws Exception + * + * @return bool */ protected function mailSend($header, $body) { - $toArr = array(); + $toArr = []; foreach ($this->to as $toaddr) { $toArr[] = $this->addrFormat($toaddr); } @@ -1484,13 +1622,19 @@ class PHPMailer $params = null; //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver - if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { + if (!empty($this->Sender) and static::validateAddress($this->Sender)) { + //A space after `-f` is optional, but there is a long history of its presence + //causing problems, so we don't use one + //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html + //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html + //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html + //Example problem: https://www.drupal.org/node/1057954 // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. if (self::isShellSafe($this->Sender)) { $params = sprintf('-f%s', $this->Sender); } } - if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) { + if (!empty($this->Sender) and static::validateAddress($this->Sender)) { $old_from = ini_get('sendmail_from'); ini_set('sendmail_from', $this->Sender); } @@ -1498,117 +1642,162 @@ class PHPMailer if ($this->SingleTo and count($toArr) > 1) { foreach ($toArr as $toAddr) { $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); - $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $this->doCallback($result, [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, $this->From, []); } } else { $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); - $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From, []); } if (isset($old_from)) { ini_set('sendmail_from', $old_from); } if (!$result) { - throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL); + throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL); } + return true; } /** * Get an instance to use for SMTP operations. - * Override this function to load your own SMTP implementation + * Override this function to load your own SMTP implementation, + * or set one with setSMTPInstance. + * * @return SMTP */ public function getSMTPInstance() { if (!is_object($this->smtp)) { - $this->smtp = new SMTP; + $this->smtp = new SMTP(); } + + return $this->smtp; + } + + /** + * Provide an instance to use for SMTP operations. + * + * @param SMTP $smtp + * + * @return SMTP + */ + public function setSMTPInstance(SMTP $smtp) + { + $this->smtp = $smtp; + return $this->smtp; } /** * Send mail via SMTP. * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. - * Uses the PHPMailerSMTP class by default. - * @see PHPMailer::getSMTPInstance() to use a different class. + * + * @see PHPMailer::setSMTPInstance() to use a different class. + * + * @uses \PHPMailer\PHPMailer\SMTP + * * @param string $header The message headers - * @param string $body The message body - * @throws phpmailerException - * @uses SMTP - * @access protected - * @return boolean + * @param string $body The message body + * + * @throws Exception + * + * @return bool */ protected function smtpSend($header, $body) { - $bad_rcpt = array(); + $bad_rcpt = []; if (!$this->smtpConnect($this->SMTPOptions)) { - throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); + throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); } - if (!empty($this->Sender) and $this->validateAddress($this->Sender)) { - $smtp_from = $this->Sender; - } else { + //Sender already validated in preSend() + if ('' == $this->Sender) { $smtp_from = $this->From; + } else { + $smtp_from = $this->Sender; } if (!$this->smtp->mail($smtp_from)) { $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError())); - throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); + throw new Exception($this->ErrorInfo, self::STOP_CRITICAL); } + $callbacks = []; // Attempt to send to all recipients - foreach (array($this->to, $this->cc, $this->bcc) as $togroup) { + foreach ([$this->to, $this->cc, $this->bcc] as $togroup) { foreach ($togroup as $to) { if (!$this->smtp->recipient($to[0])) { $error = $this->smtp->getError(); - $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']); + $bad_rcpt[] = ['to' => $to[0], 'error' => $error['detail']]; $isSent = false; } else { $isSent = true; } - $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); + + $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]]; } } // Only send the DATA command if we have viable recipients if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) { - throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL); + throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL); } + + $smtp_transaction_id = $this->smtp->getLastTransactionID(); + if ($this->SMTPKeepAlive) { $this->smtp->reset(); } else { $this->smtp->quit(); $this->smtp->close(); } + + foreach ($callbacks as $cb) { + $this->doCallback( + $cb['issent'], + [$cb['to']], + [], + [], + $this->Subject, + $body, + $this->From, + ['smtp_transaction_id' => $smtp_transaction_id] + ); + } + //Create error message for any bad addresses if (count($bad_rcpt) > 0) { $errstr = ''; foreach ($bad_rcpt as $bad) { $errstr .= $bad['to'] . ': ' . $bad['error']; } - throw new phpmailerException( + throw new Exception( $this->lang('recipients_failed') . $errstr, self::STOP_CONTINUE ); } + return true; } /** * Initiate a connection to an SMTP server. * Returns false if the operation failed. + * * @param array $options An array of options compatible with stream_context_create() - * @uses SMTP - * @access public - * @throws phpmailerException - * @return boolean + * + * @throws Exception + * + * @uses \PHPMailer\PHPMailer\SMTP + * + * @return bool */ public function smtpConnect($options = null) { - if (is_null($this->smtp)) { + if (null === $this->smtp) { $this->smtp = $this->getSMTPInstance(); } //If no options are provided, use whatever is set in the instance - if (is_null($options)) { + if (null === $options) { $options = $this->SMTPOptions; } @@ -1625,8 +1814,13 @@ class PHPMailer $lastexception = null; foreach ($hosts as $hostentry) { - $hostinfo = array(); - if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { + $hostinfo = []; + if (!preg_match( + '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/', + trim($hostentry), + $hostinfo + )) { + static::edebug($this->lang('connect_host') . ' ' . $hostentry); // Not a valid host entry continue; } @@ -1635,29 +1829,35 @@ class PHPMailer // $hostinfo[4]: optional port number // The host string prefix can temporarily override the current setting for SMTPSecure // If it's not specified, the default value is used + + //Check the host name is a valid name or IP address before trying to use it + if (!static::isValidHost($hostinfo[3])) { + static::edebug($this->lang('connect_host') . ' ' . $hostentry); + continue; + } $prefix = ''; $secure = $this->SMTPSecure; - $tls = ($this->SMTPSecure == 'tls'); + $tls = ('tls' == $this->SMTPSecure); if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) { $prefix = 'ssl://'; $tls = false; // Can't have SSL and TLS at the same time $secure = 'ssl'; - } elseif ($hostinfo[2] == 'tls') { + } elseif ('tls' == $hostinfo[2]) { $tls = true; // tls doesn't use a prefix $secure = 'tls'; } //Do we need the OpenSSL extension? - $sslext = defined('OPENSSL_ALGO_SHA1'); + $sslext = defined('OPENSSL_ALGO_SHA256'); if ('tls' === $secure or 'ssl' === $secure) { //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled if (!$sslext) { - throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL); + throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL); } } $host = $hostinfo[3]; $port = $this->Port; - $tport = (integer)$hostinfo[4]; + $tport = (int) $hostinfo[4]; if ($tport > 0 and $tport < 65536) { $port = $tport; } @@ -1679,7 +1879,7 @@ class PHPMailer } if ($tls) { if (!$this->smtp->startTLS()) { - throw new phpmailerException($this->lang('connect_host')); + throw new Exception($this->lang('connect_host')); } // We must resend EHLO after TLS negotiation $this->smtp->hello($hello); @@ -1689,15 +1889,15 @@ class PHPMailer $this->Username, $this->Password, $this->AuthType, - $this->Realm, - $this->Workstation + $this->oauth ) ) { - throw new phpmailerException($this->lang('authenticate')); + throw new Exception($this->lang('authenticate')); } } + return true; - } catch (phpmailerException $exc) { + } catch (Exception $exc) { $lastexception = $exc; $this->edebug($exc->getMessage()); // We must have connected, but then failed TLS or Auth, so close connection nicely @@ -1708,19 +1908,19 @@ class PHPMailer // If we get here, all connection attempts have failed, so close connection hard $this->smtp->close(); // As we've caught all exceptions, just report whatever the last one was - if ($this->exceptions and !is_null($lastexception)) { + if ($this->exceptions and null !== $lastexception) { throw $lastexception; } + return false; } /** * Close the active SMTP session if one exists. - * @return void */ public function smtpClose() { - if (is_a($this->smtp, 'SMTP')) { + if (null !== $this->smtp) { if ($this->smtp->connected()) { $this->smtp->quit(); $this->smtp->close(); @@ -1732,28 +1932,30 @@ class PHPMailer * Set the language for error messages. * Returns false if it cannot load the language file. * The default language is English. - * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") + * + * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") * @param string $lang_path Path to the language file directory, with trailing separator (slash) - * @return boolean - * @access public + * + * @return bool */ public function setLanguage($langcode = 'en', $lang_path = '') { // Backwards compatibility for renamed language codes - $renamed_langcodes = array( + $renamed_langcodes = [ 'br' => 'pt_br', 'cz' => 'cs', 'dk' => 'da', 'no' => 'nb', 'se' => 'sv', - ); + 'sr' => 'rs', + ]; if (isset($renamed_langcodes[$langcode])) { $langcode = $renamed_langcodes[$langcode]; } // Define full set of translatable strings in English - $PHPMAILER_LANG = array( + $PHPMAILER_LANG = [ 'authenticate' => 'SMTP Error: Could not authenticate.', 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', 'data_not_accepted' => 'SMTP Error: data not accepted.', @@ -1772,11 +1974,11 @@ class PHPMailer 'smtp_connect_failed' => 'SMTP connect() failed.', 'smtp_error' => 'SMTP server error: ', 'variable_set' => 'Cannot set or reset variable: ', - 'extension_missing' => 'Extension missing: ' - ); + 'extension_missing' => 'Extension missing: ', + ]; if (empty($lang_path)) { // Calculate an absolute path so it can work if CWD is not here - $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR; + $lang_path = __DIR__ . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR; } //Validate $langcode if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) { @@ -1785,9 +1987,9 @@ class PHPMailer $foundlang = true; $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php'; // There is no English translation file - if ($langcode != 'en') { + if ('en' != $langcode) { // Make sure language file path is readable - if (!is_readable($lang_file)) { + if (!file_exists($lang_file)) { $foundlang = false; } else { // Overwrite language-specific strings. @@ -1796,11 +1998,13 @@ class PHPMailer } } $this->language = $PHPMAILER_LANG; - return (boolean)$foundlang; // Returns false if language not found + + return (bool) $foundlang; // Returns false if language not found } /** * Get the array of strings for the current language. + * * @return array */ public function getTranslations() @@ -1810,39 +2014,42 @@ class PHPMailer /** * Create recipient headers. - * @access public + * * @param string $type - * @param array $addr An array of recipient, - * where each recipient is a 2-element indexed array with element 0 containing an address - * and element 1 containing a name, like: - * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User')) + * @param array $addr An array of recipients, + * where each recipient is a 2-element indexed array with element 0 containing an address + * and element 1 containing a name, like: + * [['joe@example.com', 'Joe User'], ['zoe@example.com', 'Zoe User']] + * * @return string */ public function addrAppend($type, $addr) { - $addresses = array(); + $addresses = []; foreach ($addr as $address) { $addresses[] = $this->addrFormat($address); } - return $type . ': ' . implode(', ', $addresses) . $this->LE; + + return $type . ': ' . implode(', ', $addresses) . static::$LE; } /** * Format an address for use in a message header. - * @access public - * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name - * like array('joe@example.com', 'Joe User') + * + * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name like + * ['joe@example.com', 'Joe User'] + * * @return string */ public function addrFormat($addr) { if (empty($addr[1])) { // No name provided return $this->secureHeader($addr[0]); - } else { - return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader( + } + + return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader( $addr[0] ) . '>'; - } } /** @@ -1850,33 +2057,34 @@ class PHPMailer * For use with mailers that do not automatically perform wrapping * and for quoted-printable encoded messages. * Original written by philippe. + * * @param string $message The message to wrap - * @param integer $length The line length to wrap to - * @param boolean $qp_mode Whether to run in Quoted-Printable mode - * @access public + * @param int $length The line length to wrap to + * @param bool $qp_mode Whether to run in Quoted-Printable mode + * * @return string */ public function wrapText($message, $length, $qp_mode = false) { if ($qp_mode) { - $soft_break = sprintf(' =%s', $this->LE); + $soft_break = sprintf(' =%s', static::$LE); } else { - $soft_break = $this->LE; + $soft_break = static::$LE; } // If utf-8 encoding is used, we will need to make sure we don't // split multibyte characters when we wrap $is_utf8 = (strtolower($this->CharSet) == 'utf-8'); - $lelen = strlen($this->LE); - $crlflen = strlen(self::CRLF); + $lelen = strlen(static::$LE); + $crlflen = strlen(static::$LE); - $message = $this->fixEOL($message); + $message = static::normalizeBreaks($message); //Remove a trailing line break - if (substr($message, -$lelen) == $this->LE) { + if (substr($message, -$lelen) == static::$LE) { $message = substr($message, 0, -$lelen); } //Split message into lines - $lines = explode($this->LE, $message); + $lines = explode(static::$LE, $message); //Message will be rebuilt in here $message = ''; foreach ($lines as $line) { @@ -1892,14 +2100,14 @@ class PHPMailer if ($is_utf8) { $len = $this->utf8CharBoundary($word, $len); } elseif (substr($word, $len - 1, 1) == '=') { - $len--; + --$len; } elseif (substr($word, $len - 2, 1) == '=') { $len -= 2; } $part = substr($word, 0, $len); $word = substr($word, $len); $buf .= ' ' . $part; - $message .= $buf . sprintf('=%s', self::CRLF); + $message .= $buf . sprintf('=%s', static::$LE); } else { $message .= $buf . $soft_break; } @@ -1913,7 +2121,7 @@ class PHPMailer if ($is_utf8) { $len = $this->utf8CharBoundary($word, $len); } elseif (substr($word, $len - 1, 1) == '=') { - $len--; + --$len; } elseif (substr($word, $len - 2, 1) == '=') { $len -= 2; } @@ -1921,7 +2129,7 @@ class PHPMailer $word = substr($word, $len); if (strlen($word) > 0) { - $message .= $part . sprintf('=%s', self::CRLF); + $message .= $part . sprintf('=%s', static::$LE); } else { $buf = $part; } @@ -1940,7 +2148,7 @@ class PHPMailer } $firstword = false; } - $message .= $buf . self::CRLF; + $message .= $buf . static::$LE; } return $message; @@ -1950,10 +2158,11 @@ class PHPMailer * Find the last character boundary prior to $maxLength in a utf-8 * quoted-printable encoded string. * Original written by Colin Brown. - * @access public + * * @param string $encodedText utf-8 QP text - * @param integer $maxLength Find the last character boundary prior to this length - * @return integer + * @param int $maxLength Find the last character boundary prior to this length + * + * @return int */ public function utf8CharBoundary($encodedText, $maxLength) { @@ -1972,13 +2181,13 @@ class PHPMailer // If the encoded char was found at pos 0, it will fit // otherwise reduce maxLength to start of the encoded char if ($encodedCharPos > 0) { - $maxLength = $maxLength - ($lookBack - $encodedCharPos); + $maxLength -= $lookBack - $encodedCharPos; } $foundSplitPos = true; } elseif ($dec >= 192) { // First byte of a multi byte character // Reduce maxLength to split at start of character - $maxLength = $maxLength - ($lookBack - $encodedCharPos); + $maxLength -= $lookBack - $encodedCharPos; $foundSplitPos = true; } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back @@ -1989,6 +2198,7 @@ class PHPMailer $foundSplitPos = true; } } + return $maxLength; } @@ -1997,8 +2207,6 @@ class PHPMailer * Wraps the message body to the number of chars set in the WordWrap property. * You should only do this to plain-text bodies as wrapping HTML tags may break them. * This is called automatically by createBody(), so you don't need to call it yourself. - * @access public - * @return void */ public function setWordWrap() { @@ -2021,28 +2229,25 @@ class PHPMailer /** * Assemble message headers. - * @access public + * * @return string The assembled headers */ public function createHeader() { $result = ''; - if ($this->MessageDate == '') { - $this->MessageDate = self::rfcDate(); - } - $result .= $this->headerLine('Date', $this->MessageDate); + $result .= $this->headerLine('Date', '' == $this->MessageDate ? self::rfcDate() : $this->MessageDate); // To be created automatically by mail() if ($this->SingleTo) { - if ($this->Mailer != 'mail') { + if ('mail' != $this->Mailer) { foreach ($this->to as $toaddr) { $this->SingleToArray[] = $this->addrFormat($toaddr); } } } else { if (count($this->to) > 0) { - if ($this->Mailer != 'mail') { + if ('mail' != $this->Mailer) { $result .= $this->addrAppend('To', $this->to); } } elseif (count($this->cc) == 0) { @@ -2050,7 +2255,7 @@ class PHPMailer } } - $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName))); + $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]); // sendmail and mail() extract Cc from the header before sending if (count($this->cc) > 0) { @@ -2059,7 +2264,7 @@ class PHPMailer // sendmail and mail() extract Bcc from the header before sending if (( - $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail' + 'sendmail' == $this->Mailer or 'qmail' == $this->Mailer or 'mail' == $this->Mailer ) and count($this->bcc) > 0 ) { @@ -2071,7 +2276,7 @@ class PHPMailer } // mail() sets the subject itself - if ($this->Mailer != 'mail') { + if ('mail' != $this->Mailer) { $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject))); } @@ -2083,13 +2288,13 @@ class PHPMailer $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname()); } $result .= $this->headerLine('Message-ID', $this->lastMessageID); - if (!is_null($this->Priority)) { + if (null !== $this->Priority) { $result .= $this->headerLine('X-Priority', $this->Priority); } - if ($this->XMailer == '') { + if ('' == $this->XMailer) { $result .= $this->headerLine( 'X-Mailer', - 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)' + 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)' ); } else { $myXmailer = trim($this->XMailer); @@ -2098,7 +2303,7 @@ class PHPMailer } } - if ($this->ConfirmReadingTo != '') { + if ('' != $this->ConfirmReadingTo) { $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>'); } @@ -2119,7 +2324,7 @@ class PHPMailer /** * Get the message MIME type headers. - * @access public + * * @return string */ public function getMailMIME() @@ -2150,10 +2355,10 @@ class PHPMailer break; } // RFC1341 part 5 says 7bit is assumed if not specified - if ($this->Encoding != '7bit') { + if ('7bit' != $this->Encoding) { // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE if ($ismultipart) { - if ($this->Encoding == '8bit') { + if ('8bit' == $this->Encoding) { $result .= $this->headerLine('Content-Transfer-Encoding', '8bit'); } // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible @@ -2162,8 +2367,8 @@ class PHPMailer } } - if ($this->Mailer != 'mail') { - $result .= $this->LE; + if ('mail' != $this->Mailer) { + $result .= static::$LE; } return $result; @@ -2173,28 +2378,43 @@ class PHPMailer * Returns the whole MIME message. * Includes complete headers and body. * Only valid post preSend(). + * * @see PHPMailer::preSend() - * @access public + * * @return string */ public function getSentMIMEMessage() { - return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody; + return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . static::$LE . static::$LE . $this->MIMEBody; } /** - * Create unique ID + * Create a unique ID to use for boundaries. + * * @return string */ - protected function generateId() { - return md5(uniqid(time())); + protected function generateId() + { + $len = 32; //32 bytes = 256 bits + if (function_exists('random_bytes')) { + $bytes = random_bytes($len); + } elseif (function_exists('openssl_random_pseudo_bytes')) { + $bytes = openssl_random_pseudo_bytes($len); + } else { + //Use a hash to force the length to the same as the other methods + $bytes = hash('sha256', uniqid((string) mt_rand(), true), true); + } + + //We don't care about messing up base64 format here, just want a random string + return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true))); } /** * Assemble the message body. * Returns an empty string on failure. - * @access public - * @throws phpmailerException + * + * @throws Exception + * * @return string The assembled message body */ public function createBody() @@ -2207,7 +2427,7 @@ class PHPMailer $this->boundary[3] = 'b3_' . $this->uniqueid; if ($this->sign_key_file) { - $body .= $this->getMailMIME() . $this->LE; + $body .= $this->getMailMIME() . static::$LE; } $this->setWordWrap(); @@ -2215,45 +2435,45 @@ class PHPMailer $bodyEncoding = $this->Encoding; $bodyCharSet = $this->CharSet; //Can we do a 7-bit downgrade? - if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) { + if ('8bit' == $bodyEncoding and !$this->has8bitChars($this->Body)) { $bodyEncoding = '7bit'; //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit $bodyCharSet = 'us-ascii'; } //If lines are too long, and we're not already using an encoding that will shorten them, //change to quoted-printable transfer encoding for the body part only - if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) { + if ('base64' != $this->Encoding and static::hasLineLongerThanMax($this->Body)) { $bodyEncoding = 'quoted-printable'; } $altBodyEncoding = $this->Encoding; $altBodyCharSet = $this->CharSet; //Can we do a 7-bit downgrade? - if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) { + if ('8bit' == $altBodyEncoding and !$this->has8bitChars($this->AltBody)) { $altBodyEncoding = '7bit'; //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit $altBodyCharSet = 'us-ascii'; } //If lines are too long, and we're not already using an encoding that will shorten them, //change to quoted-printable transfer encoding for the alt body part only - if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) { + if ('base64' != $altBodyEncoding and static::hasLineLongerThanMax($this->AltBody)) { $altBodyEncoding = 'quoted-printable'; } //Use this as a preamble in all multipart message types - $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; + $mimepre = 'This is a multi-part message in MIME format.' . static::$LE; switch ($this->message_type) { case 'inline': $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->attachAll('inline', $this->boundary[1]); break; case 'attach': $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'inline_attach': @@ -2261,26 +2481,26 @@ class PHPMailer $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->attachAll('inline', $this->boundary[2]); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt': $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; if (!empty($this->Ical)) { $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', ''); $body .= $this->encodeString($this->Ical, $this->Encoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; } $body .= $this->endBoundary($this->boundary[1]); break; @@ -2288,16 +2508,16 @@ class PHPMailer $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->attachAll('inline', $this->boundary[2]); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->endBoundary($this->boundary[1]); break; case 'alt_attach': @@ -2305,15 +2525,19 @@ class PHPMailer $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; + if (!empty($this->Ical)) { + $body .= $this->getBoundary($this->boundary[2], '', 'text/calendar; method=REQUEST', ''); + $body .= $this->encodeString($this->Ical, $this->Encoding); + } $body .= $this->endBoundary($this->boundary[2]); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt_inline_attach': @@ -2321,21 +2545,21 @@ class PHPMailer $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->textLine('--' . $this->boundary[2]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"'); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); - $body .= $this->LE . $this->LE; + $body .= static::$LE; $body .= $this->attachAll('inline', $this->boundary[3]); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->endBoundary($this->boundary[2]); - $body .= $this->LE; + $body .= static::$LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; default: @@ -2348,15 +2572,18 @@ class PHPMailer if ($this->isError()) { $body = ''; + if ($this->exceptions) { + throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL); + } } elseif ($this->sign_key_file) { try { if (!defined('PKCS7_TEXT')) { - throw new phpmailerException($this->lang('extension_missing') . 'openssl'); + throw new Exception($this->lang('extension_missing') . 'openssl'); } - // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1 + // @TODO would be nice to use php://temp streams here $file = tempnam(sys_get_temp_dir(), 'mail'); if (false === file_put_contents($file, $body)) { - throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); + throw new Exception($this->lang('signing') . ' Could not write temp file'); } $signed = tempnam(sys_get_temp_dir(), 'signed'); //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 @@ -2365,96 +2592,96 @@ class PHPMailer $file, $signed, 'file://' . realpath($this->sign_cert_file), - array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), - null + ['file://' . realpath($this->sign_key_file), $this->sign_key_pass], + [] ); } else { $sign = @openssl_pkcs7_sign( $file, $signed, 'file://' . realpath($this->sign_cert_file), - array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), - null, + ['file://' . realpath($this->sign_key_file), $this->sign_key_pass], + [], PKCS7_DETACHED, $this->sign_extracerts_file ); } + @unlink($file); if ($sign) { - @unlink($file); $body = file_get_contents($signed); @unlink($signed); //The message returned by openssl contains both headers and body, so need to split them up $parts = explode("\n\n", $body, 2); - $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE; + $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE; $body = $parts[1]; } else { - @unlink($file); @unlink($signed); - throw new phpmailerException($this->lang('signing') . openssl_error_string()); + throw new Exception($this->lang('signing') . openssl_error_string()); } - } catch (phpmailerException $exc) { + } catch (Exception $exc) { $body = ''; if ($this->exceptions) { throw $exc; } } } + return $body; } /** * Return the start of a message boundary. - * @access protected + * * @param string $boundary * @param string $charSet * @param string $contentType * @param string $encoding + * * @return string */ protected function getBoundary($boundary, $charSet, $contentType, $encoding) { $result = ''; - if ($charSet == '') { + if ('' == $charSet) { $charSet = $this->CharSet; } - if ($contentType == '') { + if ('' == $contentType) { $contentType = $this->ContentType; } - if ($encoding == '') { + if ('' == $encoding) { $encoding = $this->Encoding; } $result .= $this->textLine('--' . $boundary); $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet); - $result .= $this->LE; + $result .= static::$LE; // RFC1341 part 5 says 7bit is assumed if not specified - if ($encoding != '7bit') { + if ('7bit' != $encoding) { $result .= $this->headerLine('Content-Transfer-Encoding', $encoding); } - $result .= $this->LE; + $result .= static::$LE; return $result; } /** * Return the end of a message boundary. - * @access protected + * * @param string $boundary + * * @return string */ protected function endBoundary($boundary) { - return $this->LE . '--' . $boundary . '--' . $this->LE; + return static::$LE . '--' . $boundary . '--' . static::$LE; } /** * Set the message type. * PHPMailer only supports some preset message types, not arbitrary MIME structures. - * @access protected - * @return void */ protected function setMessageType() { - $type = array(); + $type = []; if ($this->alternativeExists()) { $type[] = 'alt'; } @@ -2465,7 +2692,7 @@ class PHPMailer $type[] = 'attach'; } $this->message_type = implode('_', $type); - if ($this->message_type == '') { + if ('' == $this->message_type) { //The 'plain' message_type refers to the message having a single body element, not that it is plain-text $this->message_type = 'plain'; } @@ -2473,57 +2700,62 @@ class PHPMailer /** * Format a header line. - * @access public - * @param string $name - * @param string $value + * + * @param string $name + * @param string|int $value + * * @return string */ public function headerLine($name, $value) { - return $name . ': ' . $value . $this->LE; + return $name . ': ' . $value . static::$LE; } /** * Return a formatted mail line. - * @access public + * * @param string $value + * * @return string */ public function textLine($value) { - return $value . $this->LE; + return $value . static::$LE; } /** * Add an attachment from a path on the filesystem. * Never use a user-supplied path to a file! * Returns false if the file could not be found or read. - * @param string $path Path to the attachment. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. + * + * @param string $path Path to the attachment + * @param string $name Overrides the attachment name + * @param string $encoding File encoding (see $Encoding) + * @param string $type File extension (MIME) type * @param string $disposition Disposition to use - * @throws phpmailerException - * @return boolean + * + * @throws Exception + * + * @return bool */ public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment') { try { if (!@is_file($path)) { - throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE); + throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE); } // If a MIME type is not specified, try to work it out from the file name - if ($type == '') { - $type = self::filenameToType($path); + if ('' == $type) { + $type = static::filenameToType($path); } $filename = basename($path); - if ($name == '') { + if ('' == $name) { $name = $filename; } - $this->attachment[] = array( + $this->attachment[] = [ 0 => $path, 1 => $filename, 2 => $name, @@ -2531,22 +2763,24 @@ class PHPMailer 4 => $type, 5 => false, // isStringAttachment 6 => $disposition, - 7 => 0 - ); - - } catch (phpmailerException $exc) { + 7 => $name, + ]; + } catch (Exception $exc) { $this->setError($exc->getMessage()); $this->edebug($exc->getMessage()); if ($this->exceptions) { throw $exc; } + return false; } + return true; } /** * Return the array of attachments. + * * @return array */ public function getAttachments() @@ -2557,17 +2791,18 @@ class PHPMailer /** * Attach all file, string, and binary attachments to the message. * Returns an empty string on failure. - * @access protected + * * @param string $disposition_type * @param string $boundary + * * @return string */ protected function attachAll($disposition_type, $boundary) { // Return text of body - $mime = array(); - $cidUniq = array(); - $incl = array(); + $mime = []; + $cidUniq = []; + $incl = []; // Add all attachments foreach ($this->attachment as $attachment) { @@ -2583,7 +2818,7 @@ class PHPMailer $path = $attachment[0]; } - $inclhash = md5(serialize($attachment)); + $inclhash = hash('sha256', serialize($attachment)); if (in_array($inclhash, $incl)) { continue; } @@ -2593,34 +2828,34 @@ class PHPMailer $type = $attachment[4]; $disposition = $attachment[6]; $cid = $attachment[7]; - if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) { + if ('inline' == $disposition and array_key_exists($cid, $cidUniq)) { continue; } $cidUniq[$cid] = true; - $mime[] = sprintf('--%s%s', $boundary, $this->LE); + $mime[] = sprintf('--%s%s', $boundary, static::$LE); //Only include a filename property if we have one if (!empty($name)) { $mime[] = sprintf( 'Content-Type: %s; name="%s"%s', $type, $this->encodeHeader($this->secureHeader($name)), - $this->LE + static::$LE ); } else { $mime[] = sprintf( 'Content-Type: %s%s', $type, - $this->LE + static::$LE ); } // RFC1341 part 5 says 7bit is assumed if not specified - if ($encoding != '7bit') { - $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE); + if ('7bit' != $encoding) { + $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE); } - if ($disposition == 'inline') { - $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE); + if (!empty($cid)) { + $mime[] = sprintf('Content-ID: <%s>%s', $cid, static::$LE); } // If a filename contains any of these chars, it should be quoted, @@ -2634,7 +2869,7 @@ class PHPMailer 'Content-Disposition: %s; filename="%s"%s', $disposition, $encoded_name, - $this->LE . $this->LE + static::$LE . static::$LE ); } else { if (!empty($encoded_name)) { @@ -2642,38 +2877,34 @@ class PHPMailer 'Content-Disposition: %s; filename=%s%s', $disposition, $encoded_name, - $this->LE . $this->LE + static::$LE . static::$LE ); } else { $mime[] = sprintf( 'Content-Disposition: %s%s', $disposition, - $this->LE . $this->LE + static::$LE . static::$LE ); } } } else { - $mime[] = $this->LE; + $mime[] = static::$LE; } // Encode as string attachment if ($bString) { $mime[] = $this->encodeString($string, $encoding); - if ($this->isError()) { - return ''; - } - $mime[] = $this->LE . $this->LE; } else { $mime[] = $this->encodeFile($path, $encoding); - if ($this->isError()) { - return ''; - } - $mime[] = $this->LE . $this->LE; } + if ($this->isError()) { + return ''; + } + $mime[] = static::$LE; } } - $mime[] = sprintf('--%s--%s', $boundary, $this->LE); + $mime[] = sprintf('--%s--%s', $boundary, static::$LE); return implode('', $mime); } @@ -2681,41 +2912,30 @@ class PHPMailer /** * Encode a file attachment in requested format. * Returns an empty string on failure. - * @param string $path The full path to the file + * + * @param string $path The full path to the file * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @throws phpmailerException - * @access protected + * + * @throws Exception + * * @return string */ protected function encodeFile($path, $encoding = 'base64') { try { - if (!is_readable($path)) { - throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE); - } - $magic_quotes = get_magic_quotes_runtime(); - if ($magic_quotes) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) { - set_magic_quotes_runtime(false); - } else { - //Doesn't exist in PHP 5.4, but we don't need to check because - //get_magic_quotes_runtime always returns false in 5.4+ - //so it will never get here - ini_set('magic_quotes_runtime', false); - } + if (!file_exists($path)) { + throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE); } $file_buffer = file_get_contents($path); - $file_buffer = $this->encodeString($file_buffer, $encoding); - if ($magic_quotes) { - if (version_compare(PHP_VERSION, '5.3.0', '<')) { - set_magic_quotes_runtime($magic_quotes); - } else { - ini_set('magic_quotes_runtime', $magic_quotes); - } + if (false === $file_buffer) { + throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE); } + $file_buffer = $this->encodeString($file_buffer, $encoding); + return $file_buffer; } catch (Exception $exc) { $this->setError($exc->getMessage()); + return ''; } } @@ -2723,9 +2943,10 @@ class PHPMailer /** * Encode a string in requested format. * Returns an empty string on failure. - * @param string $str The text to encode - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @access public + * + * @param string $str The text to encode + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable + * * @return string */ public function encodeString($str, $encoding = 'base64') @@ -2733,14 +2954,18 @@ class PHPMailer $encoded = ''; switch (strtolower($encoding)) { case 'base64': - $encoded = chunk_split(base64_encode($str), 76, $this->LE); + $encoded = chunk_split( + base64_encode($str), + static::STD_LINE_LENGTH - strlen(static::$LE), + static::$LE + ); break; case '7bit': case '8bit': - $encoded = $this->fixEOL($str); + $encoded = static::normalizeBreaks($str); // Make sure it ends with a line break - if (substr($encoded, -(strlen($this->LE))) != $this->LE) { - $encoded .= $this->LE; + if (substr($encoded, -(strlen(static::$LE))) != static::$LE) { + $encoded .= static::$LE; } break; case 'binary': @@ -2753,15 +2978,18 @@ class PHPMailer $this->setError($this->lang('encoding') . $encoding); break; } + return $encoded; } /** - * Encode a header string optimally. - * Picks shortest of Q, B, quoted-printable or none. - * @access public - * @param string $str - * @param string $position + * Encode a header value (not including its label) optimally. + * Picks shortest of Q, B, or none. Result includes folding if needed. + * See RFC822 definitions for phrase, comment and text positions. + * + * @param string $str The header value to encode + * @param string $position What context the string will be used in + * * @return string */ public function encodeHeader($str, $position = 'text') @@ -2772,35 +3000,39 @@ class PHPMailer if (!preg_match('/[\200-\377]/', $str)) { // Can't use addslashes as we don't know the value of magic_quotes_sybase $encoded = addcslashes($str, "\0..\37\177\\\""); - if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { - return ($encoded); - } else { - return ("\"$encoded\""); + if (($str == $encoded) and !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { + return $encoded; } + + return "\"$encoded\""; } $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); break; - /** @noinspection PhpMissingBreakStatementInspection */ + /* @noinspection PhpMissingBreakStatementInspection */ case 'comment': $matchcount = preg_match_all('/[()"]/', $str, $matches); - // Intentional fall-through + //fallthrough case 'text': default: $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); break; } - //There are no chars that need encoding - if ($matchcount == 0) { - return ($str); - } - - $maxlen = 75 - 7 - strlen($this->CharSet); + //RFCs specify a maximum line length of 78 chars, however mail() will sometimes + //corrupt messages with headers longer than 65 chars. See #818 + $lengthsub = 'mail' == $this->Mailer ? 13 : 0; + $maxlen = static::STD_LINE_LENGTH - $lengthsub; // Try to select the encoding which should produce the shortest output if ($matchcount > strlen($str) / 3) { // More than a third of the content will need encoding, so B encoding will be most efficient $encoding = 'B'; - if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) { + //This calculation is: + // max line length + // - shorten to avoid mail() corruption + // - Q/B encoding char overhead ("` =?
and must not be empty
* will look for an image file in $basedir/images/a.png and convert it to inline.
* If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+ * Converts data-uri images into embedded attachments.
* If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
- * @access public
- * @param string $message HTML message string
- * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
- * @param boolean|callable $advanced Whether to use the internal HTML to text converter
- * or your own custom converter @see PHPMailer::html2text()
+ *
+ * @param string $message HTML message string
+ * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
+ * @param bool|callable $advanced Whether to use the internal HTML to text converter
+ * or your own custom converter @see PHPMailer::html2text()
+ *
* @return string $message The transformed message Body
*/
public function msgHTML($message, $basedir = '', $advanced = false)
@@ -3408,40 +3680,49 @@ class PHPMailer
}
foreach ($images[2] as $imgindex => $url) {
// Convert data URIs into embedded images
- if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
- $data = substr($url, strpos($url, ','));
- if ($match[2]) {
- $data = base64_decode($data);
+ //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+ if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
+ if (count($match) == 4 and 'base64' == $match[2]) {
+ $data = base64_decode($match[3]);
+ } elseif ('' == $match[2]) {
+ $data = rawurldecode($match[3]);
} else {
- $data = rawurldecode($data);
+ //Not recognised so leave it alone
+ continue;
}
- $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
- if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
- $message = str_replace(
- $images[0][$imgindex],
- $images[1][$imgindex] . '="cid:' . $cid . '"',
- $message
- );
+ //Hash the decoded data, not the URL so that the same data-URI image used in multiple places
+ //will only be embedded once, even if it used a different encoding
+ $cid = hash('sha256', $data) . '@phpmailer.0'; // RFC2392 S 2
+
+ if (!$this->cidExists($cid)) {
+ $this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1]);
}
+ $message = str_replace(
+ $images[0][$imgindex],
+ $images[1][$imgindex] . '="cid:' . $cid . '"',
+ $message
+ );
continue;
}
- if (
- // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+ if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
!empty($basedir)
// Ignore URLs containing parent dir traversal (..)
- && (strpos($url, '..') === false)
+ and (strpos($url, '..') === false)
// Do not change urls that are already inline images
- && substr($url, 0, 4) !== 'cid:'
+ and substr($url, 0, 4) !== 'cid:'
// Do not change absolute URLs, including anonymous protocol
- && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+ and !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
) {
$filename = basename($url);
$directory = dirname($url);
- if ($directory == '.') {
+ if ('.' == $directory) {
$directory = '';
}
- $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
- if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+ $cid = hash('sha256', $url) . '@phpmailer.0'; // RFC2392 S 2
+ if (strlen($basedir) > 1 and substr($basedir, -1) != '/') {
+ $basedir .= '/';
+ }
+ if (strlen($directory) > 1 and substr($directory, -1) != '/') {
$directory .= '/';
}
if ($this->addEmbeddedImage(
@@ -3449,7 +3730,7 @@ class PHPMailer
$cid,
$filename,
'base64',
- self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+ static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
)
) {
$message = preg_replace(
@@ -3462,13 +3743,14 @@ class PHPMailer
}
}
$this->isHTML(true);
- // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
- $this->Body = $this->normalizeBreaks($message);
- $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+ // Convert all message body line breaks to LE, makes quoted-printable encoding work much better
+ $this->Body = static::normalizeBreaks($message);
+ $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
if (!$this->alternativeExists()) {
- $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
- self::CRLF . self::CRLF;
+ $this->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'
+ . static::$LE;
}
+
return $this->Body;
}
@@ -3476,9 +3758,10 @@ class PHPMailer
* Convert an HTML string into plain text.
* This is used by msgHTML().
* Note - older versions of this function used a bundled advanced converter
- * which was been removed for license reasons in #232.
+ * which was removed for license reasons in #232.
* Example usage:
- *
+ *
+ * ```php
* // Use default conversion
* $plain = $mail->html2text($html);
* // Use your own custom converter
@@ -3486,10 +3769,12 @@ class PHPMailer
* $converter = new MyHtml2text($html);
* return $converter->get_text();
* });
- *
- * @param string $html The HTML text to convert
- * @param boolean|callable $advanced Any boolean value to use the internal converter,
- * or provide your own callable for custom conversion.
+ * ```
+ *
+ * @param string $html The HTML text to convert
+ * @param bool|callable $advanced Any boolean value to use the internal converter,
+ * or provide your own callable for custom conversion
+ *
* @return string
*/
public function html2text($html, $advanced = false)
@@ -3497,6 +3782,7 @@ class PHPMailer
if (is_callable($advanced)) {
return call_user_func($advanced, $html);
}
+
return html_entity_decode(
trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
ENT_QUOTES,
@@ -3506,125 +3792,128 @@ class PHPMailer
/**
* Get the MIME type for a file extension.
+ *
* @param string $ext File extension
- * @access public
- * @return string MIME type of file.
- * @static
+ *
+ * @return string MIME type of file
*/
public static function _mime_types($ext = '')
{
- $mimes = array(
- 'xl' => 'application/excel',
- 'js' => 'application/javascript',
- 'hqx' => 'application/mac-binhex40',
- 'cpt' => 'application/mac-compactpro',
- 'bin' => 'application/macbinary',
- 'doc' => 'application/msword',
- 'word' => 'application/msword',
- 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
- 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
- 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
- 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
- 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
- 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
- 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+ $mimes = [
+ 'xl' => 'application/excel',
+ 'js' => 'application/javascript',
+ 'hqx' => 'application/mac-binhex40',
+ 'cpt' => 'application/mac-compactpro',
+ 'bin' => 'application/macbinary',
+ 'doc' => 'application/msword',
+ 'word' => 'application/msword',
+ 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+ 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+ 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+ 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+ 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+ 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
'class' => 'application/octet-stream',
- 'dll' => 'application/octet-stream',
- 'dms' => 'application/octet-stream',
- 'exe' => 'application/octet-stream',
- 'lha' => 'application/octet-stream',
- 'lzh' => 'application/octet-stream',
- 'psd' => 'application/octet-stream',
- 'sea' => 'application/octet-stream',
- 'so' => 'application/octet-stream',
- 'oda' => 'application/oda',
- 'pdf' => 'application/pdf',
- 'ai' => 'application/postscript',
- 'eps' => 'application/postscript',
- 'ps' => 'application/postscript',
- 'smi' => 'application/smil',
- 'smil' => 'application/smil',
- 'mif' => 'application/vnd.mif',
- 'xls' => 'application/vnd.ms-excel',
- 'ppt' => 'application/vnd.ms-powerpoint',
+ 'dll' => 'application/octet-stream',
+ 'dms' => 'application/octet-stream',
+ 'exe' => 'application/octet-stream',
+ 'lha' => 'application/octet-stream',
+ 'lzh' => 'application/octet-stream',
+ 'psd' => 'application/octet-stream',
+ 'sea' => 'application/octet-stream',
+ 'so' => 'application/octet-stream',
+ 'oda' => 'application/oda',
+ 'pdf' => 'application/pdf',
+ 'ai' => 'application/postscript',
+ 'eps' => 'application/postscript',
+ 'ps' => 'application/postscript',
+ 'smi' => 'application/smil',
+ 'smil' => 'application/smil',
+ 'mif' => 'application/vnd.mif',
+ 'xls' => 'application/vnd.ms-excel',
+ 'ppt' => 'application/vnd.ms-powerpoint',
'wbxml' => 'application/vnd.wap.wbxml',
- 'wmlc' => 'application/vnd.wap.wmlc',
- 'dcr' => 'application/x-director',
- 'dir' => 'application/x-director',
- 'dxr' => 'application/x-director',
- 'dvi' => 'application/x-dvi',
- 'gtar' => 'application/x-gtar',
- 'php3' => 'application/x-httpd-php',
- 'php4' => 'application/x-httpd-php',
- 'php' => 'application/x-httpd-php',
+ 'wmlc' => 'application/vnd.wap.wmlc',
+ 'dcr' => 'application/x-director',
+ 'dir' => 'application/x-director',
+ 'dxr' => 'application/x-director',
+ 'dvi' => 'application/x-dvi',
+ 'gtar' => 'application/x-gtar',
+ 'php3' => 'application/x-httpd-php',
+ 'php4' => 'application/x-httpd-php',
+ 'php' => 'application/x-httpd-php',
'phtml' => 'application/x-httpd-php',
- 'phps' => 'application/x-httpd-php-source',
- 'swf' => 'application/x-shockwave-flash',
- 'sit' => 'application/x-stuffit',
- 'tar' => 'application/x-tar',
- 'tgz' => 'application/x-tar',
- 'xht' => 'application/xhtml+xml',
+ 'phps' => 'application/x-httpd-php-source',
+ 'swf' => 'application/x-shockwave-flash',
+ 'sit' => 'application/x-stuffit',
+ 'tar' => 'application/x-tar',
+ 'tgz' => 'application/x-tar',
+ 'xht' => 'application/xhtml+xml',
'xhtml' => 'application/xhtml+xml',
- 'zip' => 'application/zip',
- 'mid' => 'audio/midi',
- 'midi' => 'audio/midi',
- 'mp2' => 'audio/mpeg',
- 'mp3' => 'audio/mpeg',
- 'mpga' => 'audio/mpeg',
- 'aif' => 'audio/x-aiff',
- 'aifc' => 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'ram' => 'audio/x-pn-realaudio',
- 'rm' => 'audio/x-pn-realaudio',
- 'rpm' => 'audio/x-pn-realaudio-plugin',
- 'ra' => 'audio/x-realaudio',
- 'wav' => 'audio/x-wav',
- 'bmp' => 'image/bmp',
- 'gif' => 'image/gif',
- 'jpeg' => 'image/jpeg',
- 'jpe' => 'image/jpeg',
- 'jpg' => 'image/jpeg',
- 'png' => 'image/png',
- 'tiff' => 'image/tiff',
- 'tif' => 'image/tiff',
- 'eml' => 'message/rfc822',
- 'css' => 'text/css',
- 'html' => 'text/html',
- 'htm' => 'text/html',
+ 'zip' => 'application/zip',
+ 'mid' => 'audio/midi',
+ 'midi' => 'audio/midi',
+ 'mp2' => 'audio/mpeg',
+ 'mp3' => 'audio/mpeg',
+ 'mpga' => 'audio/mpeg',
+ 'aif' => 'audio/x-aiff',
+ 'aifc' => 'audio/x-aiff',
+ 'aiff' => 'audio/x-aiff',
+ 'ram' => 'audio/x-pn-realaudio',
+ 'rm' => 'audio/x-pn-realaudio',
+ 'rpm' => 'audio/x-pn-realaudio-plugin',
+ 'ra' => 'audio/x-realaudio',
+ 'wav' => 'audio/x-wav',
+ 'bmp' => 'image/bmp',
+ 'gif' => 'image/gif',
+ 'jpeg' => 'image/jpeg',
+ 'jpe' => 'image/jpeg',
+ 'jpg' => 'image/jpeg',
+ 'png' => 'image/png',
+ 'tiff' => 'image/tiff',
+ 'tif' => 'image/tiff',
+ 'eml' => 'message/rfc822',
+ 'css' => 'text/css',
+ 'html' => 'text/html',
+ 'htm' => 'text/html',
'shtml' => 'text/html',
- 'log' => 'text/plain',
- 'text' => 'text/plain',
- 'txt' => 'text/plain',
- 'rtx' => 'text/richtext',
- 'rtf' => 'text/rtf',
- 'vcf' => 'text/vcard',
+ 'log' => 'text/plain',
+ 'text' => 'text/plain',
+ 'txt' => 'text/plain',
+ 'rtx' => 'text/richtext',
+ 'rtf' => 'text/rtf',
+ 'vcf' => 'text/vcard',
'vcard' => 'text/vcard',
- 'xml' => 'text/xml',
- 'xsl' => 'text/xml',
- 'mpeg' => 'video/mpeg',
- 'mpe' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'mov' => 'video/quicktime',
- 'qt' => 'video/quicktime',
- 'rv' => 'video/vnd.rn-realvideo',
- 'avi' => 'video/x-msvideo',
- 'movie' => 'video/x-sgi-movie'
- );
+ 'ics' => 'text/calendar',
+ 'xml' => 'text/xml',
+ 'xsl' => 'text/xml',
+ 'mpeg' => 'video/mpeg',
+ 'mpe' => 'video/mpeg',
+ 'mpg' => 'video/mpeg',
+ 'mov' => 'video/quicktime',
+ 'qt' => 'video/quicktime',
+ 'rv' => 'video/vnd.rn-realvideo',
+ 'avi' => 'video/x-msvideo',
+ 'movie' => 'video/x-sgi-movie',
+ ];
if (array_key_exists(strtolower($ext), $mimes)) {
return $mimes[strtolower($ext)];
}
+
return 'application/octet-stream';
}
/**
* Map a file name to a MIME type.
* Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+ *
* @param string $filename A file name or full path, does not need to exist as a file
+ *
* @return string
- * @static
*/
public static function filenameToType($filename)
{
@@ -3633,26 +3922,28 @@ class PHPMailer
if (false !== $qpos) {
$filename = substr($filename, 0, $qpos);
}
- $pathinfo = self::mb_pathinfo($filename);
- return self::_mime_types($pathinfo['extension']);
+ $ext = static::mb_pathinfo($filename, PATHINFO_EXTENSION);
+
+ return static::_mime_types($ext);
}
/**
* Multi-byte-safe pathinfo replacement.
- * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
- * Works similarly to the one in PHP >= 5.2.0
- * @link http://www.php.net/manual/en/function.pathinfo.php#107461
- * @param string $path A filename or path, does not need to exist as a file
- * @param integer|string $options Either a PATHINFO_* constant,
- * or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+ * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
+ *
+ * @see http://www.php.net/manual/en/function.pathinfo.php#107461
+ *
+ * @param string $path A filename or path, does not need to exist as a file
+ * @param int|string $options Either a PATHINFO_* constant,
+ * or a string name to return only the specified piece
+ *
* @return string|array
- * @static
*/
public static function mb_pathinfo($path, $options = null)
{
- $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
- $pathinfo = array();
- if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+ $ret = ['dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''];
+ $pathinfo = [];
+ if (preg_match('#^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$#im', $path, $pathinfo)) {
if (array_key_exists(1, $pathinfo)) {
$ret['dirname'] = $pathinfo[1];
}
@@ -3691,56 +3982,88 @@ class PHPMailer
* Usage Example:
* `$mail->set('SMTPSecure', 'tls');`
* is the same as:
- * `$mail->SMTPSecure = 'tls';`
- * @access public
- * @param string $name The property name to set
- * @param mixed $value The value to set the property to
- * @return boolean
- * @TODO Should this not be using the __set() magic function?
+ * `$mail->SMTPSecure = 'tls';`.
+ *
+ * @param string $name The property name to set
+ * @param mixed $value The value to set the property to
+ *
+ * @return bool
*/
public function set($name, $value = '')
{
if (property_exists($this, $name)) {
$this->$name = $value;
+
return true;
- } else {
- $this->setError($this->lang('variable_set') . $name);
- return false;
}
+ $this->setError($this->lang('variable_set') . $name);
+
+ return false;
}
/**
* Strip newlines to prevent header injection.
- * @access public
+ *
* @param string $str
+ *
* @return string
*/
public function secureHeader($str)
{
- return trim(str_replace(array("\r", "\n"), '', $str));
+ return trim(str_replace(["\r", "\n"], '', $str));
}
/**
* Normalize line breaks in a string.
* Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
* Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+ *
* @param string $text
- * @param string $breaktype What kind of line break to use, defaults to CRLF
+ * @param string $breaktype What kind of line break to use; defaults to static::$LE
+ *
* @return string
- * @access public
- * @static
*/
- public static function normalizeBreaks($text, $breaktype = "\r\n")
+ public static function normalizeBreaks($text, $breaktype = null)
{
- return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+ if (null === $breaktype) {
+ $breaktype = static::$LE;
+ }
+ // Normalise to \n
+ $text = str_replace(["\r\n", "\r"], "\n", $text);
+ // Now convert LE as needed
+ if ("\n" !== static::$LE) {
+ $text = str_replace("\n", $breaktype, $text);
+ }
+
+ return $text;
+ }
+
+ /**
+ * Return the current line break format string.
+ *
+ * @return string
+ */
+ public static function getLE()
+ {
+ return static::$LE;
+ }
+
+ /**
+ * Set the line break format string, e.g. "\r\n".
+ *
+ * @param string $le
+ */
+ protected static function setLE($le)
+ {
+ static::$LE = $le;
}
/**
* Set the public and private key files and password for S/MIME signing.
- * @access public
+ *
* @param string $cert_filename
* @param string $key_filename
- * @param string $key_pass Password for private key
+ * @param string $key_pass Password for private key
* @param string $extracerts_filename Optional path to chain certificate
*/
public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
@@ -3753,118 +4076,133 @@ class PHPMailer
/**
* Quoted-Printable-encode a DKIM header.
- * @access public
+ *
* @param string $txt
+ *
* @return string
*/
public function DKIM_QP($txt)
{
$line = '';
- for ($i = 0; $i < strlen($txt); $i++) {
+ $len = strlen($txt);
+ for ($i = 0; $i < $len; ++$i) {
$ord = ord($txt[$i]);
- if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+ if (((0x21 <= $ord) and ($ord <= 0x3A)) or $ord == 0x3C or ((0x3E <= $ord) and ($ord <= 0x7E))) {
$line .= $txt[$i];
} else {
$line .= '=' . sprintf('%02X', $ord);
}
}
+
return $line;
}
/**
* Generate a DKIM signature.
- * @access public
+ *
* @param string $signHeader
- * @throws phpmailerException
+ *
+ * @throws Exception
+ *
* @return string The DKIM signature value
*/
public function DKIM_Sign($signHeader)
{
if (!defined('PKCS7_TEXT')) {
if ($this->exceptions) {
- throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+ throw new Exception($this->lang('extension_missing') . 'openssl');
}
+
return '';
}
- $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
+ $privKeyStr = !empty($this->DKIM_private_string) ?
+ $this->DKIM_private_string :
+ file_get_contents($this->DKIM_private);
if ('' != $this->DKIM_passphrase) {
$privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
} else {
$privKey = openssl_pkey_get_private($privKeyStr);
}
- //Workaround for missing digest algorithms in old PHP & OpenSSL versions
- //@link http://stackoverflow.com/a/11117338/333340
- if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
- in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
- if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
- openssl_pkey_free($privKey);
- return base64_encode($signature);
- }
- } else {
- $pinfo = openssl_pkey_get_details($privKey);
- $hash = hash('sha256', $signHeader);
- //'Magic' constant for SHA256 from RFC3447
- //@link https://tools.ietf.org/html/rfc3447#page-43
- $t = '3031300d060960864801650304020105000420' . $hash;
- $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
- $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
+ if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+ openssl_pkey_free($privKey);
- if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
- openssl_pkey_free($privKey);
- return base64_encode($signature);
- }
+ return base64_encode($signature);
}
openssl_pkey_free($privKey);
+
return '';
}
/**
* Generate a DKIM canonicalization header.
- * @access public
+ * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
+ *
+ * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
+ *
* @param string $signHeader Header
+ *
* @return string
*/
public function DKIM_HeaderC($signHeader)
{
- $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+ //Unfold all header continuation lines
+ //Also collapses folded whitespace.
+ //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
+ //@see https://tools.ietf.org/html/rfc5322#section-2.2
+ //That means this may break if you do something daft like put vertical tabs in your headers.
+ $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
$lines = explode("\r\n", $signHeader);
foreach ($lines as $key => $line) {
+ //If the header is missing a :, skip it as it's invalid
+ //This is likely to happen because the explode() above will also split
+ //on the trailing LE, leaving an empty line
+ if (strpos($line, ':') === false) {
+ continue;
+ }
list($heading, $value) = explode(':', $line, 2);
+ //Lower-case header name
$heading = strtolower($heading);
- $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
- $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+ //Collapse white space within the value
+ $value = preg_replace('/[ \t]{2,}/', ' ', $value);
+ //RFC6376 is slightly unclear here - it says to delete space at the *end* of each value
+ //But then says to delete space before and after the colon.
+ //Net result is the same as trimming both ends of the value.
+ //by elimination, the same applies to the field name
+ $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
}
- $signHeader = implode("\r\n", $lines);
- return $signHeader;
+
+ return implode(static::$LE, $lines);
}
/**
* Generate a DKIM canonicalization body.
- * @access public
+ * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
+ *
+ * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
+ *
* @param string $body Message Body
+ *
* @return string
*/
public function DKIM_BodyC($body)
{
- if ($body == '') {
- return "\r\n";
+ if (empty($body)) {
+ return static::$LE;
}
- // stabilize line endings
- $body = str_replace("\r\n", "\n", $body);
- $body = str_replace("\n", "\r\n", $body);
- // END stabilize line endings
- while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
- $body = substr($body, 0, strlen($body) - 2);
- }
- return $body;
+ // Normalize line endings
+ $body = static::normalizeBreaks($body);
+
+ //Reduce multiple trailing line breaks to a single one
+ return rtrim($body, "\r\n") . static::$LE;
}
/**
* Create the DKIM header and body in a new message header.
- * @access public
+ *
* @param string $headers_line Header lines
- * @param string $subject Subject
- * @param string $body Body
+ * @param string $subject Subject
+ * @param string $body Body
+ *
* @return string
*/
public function DKIM_Add($headers_line, $subject, $body)
@@ -3874,7 +4212,7 @@ class PHPMailer
$DKIMquery = 'dns/txt'; // Query method
$DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
$subject_header = "Subject: $subject";
- $headers = explode($this->LE, $headers_line);
+ $headers = explode(static::$LE, $headers_line);
$from_header = '';
$to_header = '';
$date_header = '';
@@ -3890,7 +4228,7 @@ class PHPMailer
$date_header = $header;
$current = 'date_header';
} else {
- if (!empty($$current) && strpos($header, ' =?') === 0) {
+ if (!empty($$current) and strpos($header, ' =?') === 0) {
$$current .= $header;
} else {
$current = '';
@@ -3936,25 +4274,27 @@ class PHPMailer
$dkimhdrs
);
$signed = $this->DKIM_Sign($toSign);
- return $dkimhdrs . $signed . "\r\n";
+
+ return static::normalizeBreaks($dkimhdrs . $signed) . static::$LE;
}
/**
- * Detect if a string contains a line longer than the maximum line length allowed.
+ * Detect if a string contains a line longer than the maximum line length
+ * allowed by RFC 2822 section 2.1.1.
+ *
* @param string $str
- * @return boolean
- * @static
+ *
+ * @return bool
*/
public static function hasLineLongerThanMax($str)
{
- //+2 to include CRLF line break for a 1000 total
- return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+ return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
}
/**
* Allows for public read access to 'to' property.
- * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
- * @access public
+ * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+ *
* @return array
*/
public function getToAddresses()
@@ -3964,8 +4304,8 @@ class PHPMailer
/**
* Allows for public read access to 'cc' property.
- * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
- * @access public
+ * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+ *
* @return array
*/
public function getCcAddresses()
@@ -3975,8 +4315,8 @@ class PHPMailer
/**
* Allows for public read access to 'bcc' property.
- * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
- * @access public
+ * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+ *
* @return array
*/
public function getBccAddresses()
@@ -3986,8 +4326,8 @@ class PHPMailer
/**
* Allows for public read access to 'ReplyTo' property.
- * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
- * @access public
+ * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+ *
* @return array
*/
public function getReplyToAddresses()
@@ -3997,8 +4337,8 @@ class PHPMailer
/**
* Allows for public read access to 'all_recipients' property.
- * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
- * @access public
+ * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+ *
* @return array
*/
public function getAllRecipientAddresses()
@@ -4008,36 +4348,40 @@ class PHPMailer
/**
* Perform a callback.
- * @param boolean $isSent
- * @param array $to
- * @param array $cc
- * @param array $bcc
+ *
+ * @param bool $isSent
+ * @param array $to
+ * @param array $cc
+ * @param array $bcc
* @param string $subject
* @param string $body
* @param string $from
+ * @param array $extra
*/
- protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+ protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $extra)
{
- if (!empty($this->action_function) && is_callable($this->action_function)) {
- $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
- call_user_func_array($this->action_function, $params);
+ if (!empty($this->action_function) and is_callable($this->action_function)) {
+ call_user_func_array($this->action_function, [$isSent, $to, $cc, $bcc, $subject, $body, $from, $extra]);
}
}
-}
-/**
- * PHPMailer exception handler
- * @package PHPMailer
- */
-class phpmailerException extends Exception
-{
/**
- * Prettify error message output
- * @return string
+ * Get the OAuth instance.
+ *
+ * @return OAuth
*/
- public function errorMessage()
+ public function getOAuth()
{
- $errorMsg = '' . $this->getMessage() . "\n"; - return $errorMsg; + return $this->oauth; + } + + /** + * Set an OAuth instance. + * + * @param OAuth $oauth + */ + public function setOAuth(OAuth $oauth) + { + $this->oauth = $oauth; } } diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php new file mode 100644 index 00000000..4e8a5625 --- /dev/null +++ b/vendor/phpmailer/phpmailer/src/POP3.php @@ -0,0 +1,419 @@ + + * @author Jim Jagielski (jimjag)
';
+ foreach ($this->errors as $error) {
+ print_r($error);
+ }
+ echo '';
+ }
+ }
+
+ /**
+ * Get an array of error messages, if any.
+ *
+ * @return array
+ */
+ public function getErrors()
+ {
+ return $this->errors;
+ }
+
+ /**
+ * POP3 connection error handler.
+ *
+ * @param int $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param int $errline
+ */
+ protected function catchWarning($errno, $errstr, $errfile, $errline)
+ {
+ $this->setError(
+ 'Connecting to the POP3 server raised a PHP warning:' .
+ "errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
+ );
+ }
+}
diff --git a/inc/Exts/phpmailer/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
similarity index 68%
rename from inc/Exts/phpmailer/SMTP.php
rename to vendor/phpmailer/phpmailer/src/SMTP.php
index e8d9f2d0..10e3d6fe 100644
--- a/inc/Exts/phpmailer/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -1,106 +1,87 @@
- * @author Jim Jagielski (jimjag) `, appropriate for browser output * * `error_log` Output to error log as configured in php.ini - * * Alternatively, you can provide a callable expecting two params: a message string and the debug level: - *
+ *
+ * ```php
* $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
- *
- * @var string|callable
+ * ```
+ *
+ * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
+ * level output is used:
+ *
+ * ```php
+ * $mail->Debugoutput = new myPsr3Logger;
+ * ```
+ *
+ * @var string|callable|\Psr\Log\LoggerInterface
*/
public $Debugoutput = 'echo';
/**
* Whether to use VERP.
- * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
- * @link http://www.postfix.org/VERP_README.html Info on VERP
- * @var boolean
+ *
+ * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
+ * @see http://www.postfix.org/VERP_README.html Info on VERP
+ *
+ * @var bool
*/
public $do_verp = false;
/**
* The timeout value for connection, in seconds.
- * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+ * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
* This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
- * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
- * @var integer
+ *
+ * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+ *
+ * @var int
*/
public $Timeout = 300;
/**
* How long to wait for commands to complete, in seconds.
- * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
- * @var integer
+ * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
+ *
+ * @var int
*/
public $Timelimit = 300;
- /**
- * @var array patterns to extract smtp transaction id from smtp reply
- * Only first capture group will be use, use non-capturing group to deal with it
- * Extend this class to override this property to fulfil your needs.
- */
- protected $smtp_transaction_id_patterns = array(
- 'exim' => '/[0-9]{3} OK id=(.*)/',
- 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
- 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
- );
+ /**
+ * Patterns to extract an SMTP transaction id from reply to a DATA command.
+ * The first capture group in each regex will be used as the ID.
+ * MS ESMTP returns the message ID, which may not be correct for internal tracking.
+ *
+ * @var string[]
+ */
+ protected $smtp_transaction_id_patterns = [
+ 'exim' => '/[0-9]{3} OK id=(.*)/',
+ 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+ 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/',
+ 'Microsoft_ESMTP' => '/[0-9]{3} 2.[0-9].0 (.*)@(?:.*) Queued mail for delivery/',
+ 'Amazon_SES' => '/[0-9]{3} Ok (.*)/',
+ ];
+
+ /**
+ * The last transaction ID issued in response to a DATA command,
+ * if one was detected.
+ *
+ * @var string|bool|null
+ */
+ protected $last_smtp_transaction_id;
/**
* The socket for the server connection.
- * @var resource
+ *
+ * @var ?resource
*/
protected $smtp_conn;
/**
* Error information, if any, for the last SMTP command.
+ *
* @var array
*/
- protected $error = array(
+ protected $error = [
'error' => '',
'detail' => '',
'smtp_code' => '',
- 'smtp_code_ex' => ''
- );
+ 'smtp_code_ex' => '',
+ ];
/**
* The reply the server sent to us for HELO.
* If null, no HELO string has yet been received.
+ *
* @var string|null
*/
protected $helo_rply = null;
@@ -194,32 +204,42 @@ class SMTP
* represents the server name. In case of HELO it is the only element of the array.
* Other values can be boolean TRUE or an array containing extension options.
* If null, no HELO/EHLO string has yet been received.
+ *
* @var array|null
*/
protected $server_caps = null;
/**
* The most recent reply received from the server.
+ *
* @var string
*/
protected $last_reply = '';
/**
* Output debugging info via a user-selected method.
+ *
+ * @param string $str Debug string to output
+ * @param int $level The debug level of this message; see DEBUG_* constants
+ *
* @see SMTP::$Debugoutput
* @see SMTP::$do_debug
- * @param string $str Debug string to output
- * @param integer $level The debug level of this message; see DEBUG_* constants
- * @return void
*/
protected function edebug($str, $level = 0)
{
if ($level > $this->do_debug) {
return;
}
+ //Is this a PSR-3 logger?
+ if (is_a($this->Debugoutput, 'Psr\Log\LoggerInterface')) {
+ $this->Debugoutput->debug($str);
+
+ return;
+ }
//Avoid clash with built-in function names
- if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+ if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
call_user_func($this->Debugoutput, $str, $level);
+
return;
}
switch ($this->Debugoutput) {
@@ -229,40 +249,47 @@ class SMTP
break;
case 'html':
//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),
ENT_QUOTES,
'UTF-8'
- )
- . "\n"; + ), "
\n"; break; case 'echo': default: //Normalize line breaks - $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str); - echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( - "\n", - "\n \t ", - trim($str) - )."\n"; + $str = preg_replace('/\r\n|\r/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s'), + "\t", + //Trim trailing space + trim( + //Indent for readability, except for trailing break + str_replace( + "\n", + "\n \t ", + trim($str) + ) + ), + "\n"; } } /** * Connect to an SMTP server. - * @param string $host SMTP server IP or host name - * @param integer $port The port number to connect to - * @param integer $timeout How long to wait for the connection to open - * @param array $options An array of options for stream_context_create() - * @access public - * @return boolean + * + * @param string $host SMTP server IP or host name + * @param int $port The port number to connect to + * @param int $timeout How long to wait for the connection to open + * @param array $options An array of options for stream_context_create() + * + * @return bool */ - public function connect($host, $port = null, $timeout = 30, $options = array()) + public function connect($host, $port = null, $timeout = 30, $options = []) { static $streamok; //This is enabled by default since 5.0.0 but some providers disable it //Check this once and cache the result - if (is_null($streamok)) { + if (null === $streamok) { $streamok = function_exists('stream_socket_client'); } // Clear errors to avoid confusion @@ -271,23 +298,25 @@ class SMTP if ($this->connected()) { // Already connected, generate error $this->setError('Already connected to a server'); + return false; } if (empty($port)) { - $port = self::DEFAULT_SMTP_PORT; + $port = self::DEFAULT_PORT; } // Connect to the SMTP server $this->edebug( - "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true), + "Connection: opening to $host:$port, timeout=$timeout, options=" . + (count($options) > 0 ? var_export($options, true) : 'array()'), self::DEBUG_CONNECTION ); $errno = 0; $errstr = ''; if ($streamok) { $socket_context = stream_context_create($options); - set_error_handler(array($this, 'errorHandler')); + set_error_handler([$this, 'errorHandler']); $this->smtp_conn = stream_socket_client( - $host . ":" . $port, + $host . ':' . $port, $errno, $errstr, $timeout, @@ -298,10 +327,10 @@ class SMTP } else { //Fall back to fsockopen which should work in more places, but is missing some features $this->edebug( - "Connection: stream_socket_client not available, falling back to fsockopen", + 'Connection: stream_socket_client not available, falling back to fsockopen', self::DEBUG_CONNECTION ); - set_error_handler(array($this, 'errorHandler')); + set_error_handler([$this, 'errorHandler']); $this->smtp_conn = fsockopen( $host, $port, @@ -315,14 +344,16 @@ class SMTP if (!is_resource($this->smtp_conn)) { $this->setError( 'Failed to connect to server', - $errno, - $errstr + '', + (string) $errno, + (string) $errstr ); $this->edebug( 'SMTP ERROR: ' . $this->error['error'] . ": $errstr ($errno)", self::DEBUG_CLIENT ); + return false; } $this->edebug('Connection: opened', self::DEBUG_CONNECTION); @@ -331,7 +362,7 @@ class SMTP if (substr(PHP_OS, 0, 3) != 'WIN') { $max = ini_get('max_execution_time'); // Don't bother if unlimited - if ($max != 0 && $timeout > $max) { + if (0 != $max and $timeout > $max) { @set_time_limit($timeout); } stream_set_timeout($this->smtp_conn, $timeout, 0); @@ -339,13 +370,14 @@ class SMTP // Get any announcement $announce = $this->get_lines(); $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER); + return true; } /** * Initiate a TLS (encrypted) session. - * @access public - * @return boolean + * + * @return bool */ public function startTLS() { @@ -364,59 +396,68 @@ class SMTP } // Begin encrypted connection - if (!stream_socket_enable_crypto( + set_error_handler([$this, 'errorHandler']); + $crypto_ok = stream_socket_enable_crypto( $this->smtp_conn, true, $crypto_method - )) { - return false; - } - return true; + ); + restore_error_handler(); + + return (bool) $crypto_ok; } /** * Perform SMTP authentication. * Must be run after hello(). - * @see hello() + * + * @see hello() + * * @param string $username The user name * @param string $password The password - * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2) - * @param string $realm The auth realm for NTLM - * @param string $workstation The auth workstation for NTLM - * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth) - * @return bool True if successfully authenticated.* @access public + * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2) + * @param OAuth $OAuth An optional OAuth instance for XOAUTH2 authentication + * + * @return bool True if successfully authenticated */ public function authenticate( $username, $password, $authtype = null, - $realm = '', - $workstation = '', $OAuth = null ) { if (!$this->server_caps) { $this->setError('Authentication is not allowed before HELO/EHLO'); + return false; } if (array_key_exists('EHLO', $this->server_caps)) { - // SMTP extensions are available. Let's try to find a proper authentication method - + // SMTP extensions are available; try to find a proper authentication method if (!array_key_exists('AUTH', $this->server_caps)) { $this->setError('Authentication is not allowed at this stage'); // 'at this stage' means that auth may be allowed after the stage changes // e.g. after STARTTLS + return false; } - self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL); - self::edebug( + $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL); + $this->edebug( 'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']), self::DEBUG_LOWLEVEL ); + //If we have requested a specific auth type, check the server supports it before trying others + if (!in_array($authtype, $this->server_caps['AUTH'])) { + $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL); + $authtype = null; + } + if (empty($authtype)) { - foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN', 'NTLM', 'XOAUTH2') as $method) { + //If no auth mechanism is specified, attempt to use these, in this order + //Try CRAM-MD5 first as it's more secure than the others + foreach (['CRAM-MD5', 'LOGIN', 'PLAIN', 'XOAUTH2'] as $method) { if (in_array($method, $this->server_caps['AUTH'])) { $authtype = $method; break; @@ -424,13 +465,15 @@ class SMTP } if (empty($authtype)) { $this->setError('No supported authentication methods found'); + return false; } - self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL); + self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL); } if (!in_array($authtype, $this->server_caps['AUTH'])) { $this->setError("The requested authentication method \"$authtype\" is not supported by the server"); + return false; } } elseif (empty($authtype)) { @@ -457,76 +500,13 @@ class SMTP if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) { return false; } - if (!$this->sendCommand("Username", base64_encode($username), 334)) { + if (!$this->sendCommand('Username', base64_encode($username), 334)) { return false; } - if (!$this->sendCommand("Password", base64_encode($password), 235)) { + if (!$this->sendCommand('Password', base64_encode($password), 235)) { return false; } break; - case 'XOAUTH2': - //If the OAuth Instance is not set. Can be a case when PHPMailer is used - //instead of PHPMailerOAuth - if (is_null($OAuth)) { - return false; - } - $oauth = $OAuth->getOauth64(); - - // Start authentication - if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) { - return false; - } - break; - case 'NTLM': - /* - * ntlm_sasl_client.php - * Bundled with Permission - * - * How to telnet in windows: - * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx - * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication - */ - require_once 'extras/ntlm_sasl_client.php'; - $temp = new stdClass; - $ntlm_client = new ntlm_sasl_client_class; - //Check that functions are available - if (!$ntlm_client->initialize($temp)) { - $this->setError($temp->error); - $this->edebug( - 'You need to enable some modules in your php.ini file: ' - . $this->error['error'], - self::DEBUG_CLIENT - ); - return false; - } - //msg1 - $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1 - - if (!$this->sendCommand( - 'AUTH NTLM', - 'AUTH NTLM ' . base64_encode($msg1), - 334 - ) - ) { - return false; - } - //Though 0 based, there is a white space after the 3 digit number - //msg2 - $challenge = substr($this->last_reply, 3); - $challenge = base64_decode($challenge); - $ntlm_res = $ntlm_client->NTLMResponse( - substr($challenge, 24, 8), - $password - ); - //msg3 - $msg3 = $ntlm_client->typeMsg3( - $ntlm_res, - $username, - $realm, - $workstation - ); - // send encoded username - return $this->sendCommand('Username', base64_encode($msg3), 235); case 'CRAM-MD5': // Start authentication if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) { @@ -540,20 +520,35 @@ class SMTP // send encoded credentials return $this->sendCommand('Username', base64_encode($response), 235); + case 'XOAUTH2': + //The OAuth instance must be set up prior to requesting auth. + if (null === $OAuth) { + return false; + } + $oauth = $OAuth->getOauth64(); + + // Start authentication + if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) { + return false; + } + break; default: $this->setError("Authentication method \"$authtype\" is not supported"); + return false; } + return true; } /** * Calculate an MD5 HMAC hash. * Works like hash_hmac('md5', $data, $key) - * in case that function is not available + * in case that function is not available. + * * @param string $data The data to hash * @param string $key The key to hash with - * @access protected + * * @return string */ protected function hmac($data, $key) @@ -585,8 +580,8 @@ class SMTP /** * Check connection state. - * @access public - * @return boolean True if connected. + * + * @return bool True if connected */ public function connected() { @@ -599,19 +594,21 @@ class SMTP self::DEBUG_CLIENT ); $this->close(); + return false; } + return true; // everything looks good } + return false; } /** * Close the socket and clean up the state of the class. * Don't use this function without first trying to use QUIT. + * * @see quit() - * @access public - * @return void */ public function close() { @@ -632,11 +629,12 @@ class SMTP * finializing the mail transaction. $msg_data is the message * that is to be send with the headers. Each header needs to be * on a single line followed by a
@@ -56,16 +56,6 @@ class Blowfish extends Base
*/
var $block_size = 8;
- /**
- * The default password key_size used by setPassword()
- *
- * @see \phpseclib\Crypt\Base::password_key_size
- * @see \phpseclib\Crypt\Base::setPassword()
- * @var int
- * @access private
- */
- var $password_key_size = 56;
-
/**
* The mcrypt specific name of the cipher
*
@@ -281,37 +271,43 @@ class Blowfish extends Base
var $kl;
/**
- * Sets the key.
+ * The Key Length (in bytes)
*
- * Keys can be of any length. Blowfish, itself, requires the use of a key between 32 and max. 448-bits long.
- * If the key is less than 32-bits we NOT fill the key to 32bit but let the key as it is to be compatible
- * with mcrypt because mcrypt act this way with blowfish key's < 32 bits.
+ * @see \phpseclib\Crypt\Base::setKeyLength()
+ * @var int
+ * @access private
+ * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $Nk
+ * because the encryption / decryption / key schedule creation requires this number and not $key_length. We could
+ * derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
+ * of that, we'll just precompute it once.
+ */
+ var $key_length = 16;
+
+ /**
+ * Sets the key length.
*
- * If the key is more than 448-bits, we trim the excess bits.
- *
- * If the key is not explicitly set, or empty, it'll be assumed a 128 bits key to be all null bytes.
+ * Key lengths can be between 32 and 448 bits.
*
* @access public
- * @see \phpseclib\Crypt\Base::setKey()
- * @param string $key
+ * @param int $length
*/
- function setKey($key)
+ function setKeyLength($length)
{
- $keylength = strlen($key);
-
- if (!$keylength) {
- $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
- } elseif ($keylength > 56) {
- $key = substr($key, 0, 56);
+ if ($length < 32) {
+ $this->key_length = 7;
+ } elseif ($length > 448) {
+ $this->key_length = 56;
+ } else {
+ $this->key_length = $length >> 3;
}
- parent::setKey($key);
+ parent::setKeyLength($length);
}
/**
* Test for engine validity
*
- * This is mainly just a wrapper to set things up for Crypt_Base::isValidEngine()
+ * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
*
* @see \phpseclib\Crypt\Base::isValidEngine()
* @param int $engine
@@ -321,7 +317,10 @@ class Blowfish extends Base
function isValidEngine($engine)
{
if ($engine == self::ENGINE_OPENSSL) {
- if (strlen($this->key) != 16) {
+ if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
+ return false;
+ }
+ if ($this->key_length < 16) {
return false;
}
$this->cipher_name_openssl_ecb = 'bf-ecb';
@@ -469,7 +468,7 @@ class Blowfish extends Base
$lambda_functions =& self::_getLambdaFunctions();
// We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
- // (Currently, for Crypt_Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
+ // (Currently, for Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
// After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
$gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
diff --git a/inc/Exts/phpseclib/Crypt/DES.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
similarity index 97%
rename from inc/Exts/phpseclib/Crypt/DES.php
rename to vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
index 72d786cb..51220469 100644
--- a/inc/Exts/phpseclib/Crypt/DES.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
@@ -76,24 +76,13 @@ class DES extends Base
var $block_size = 8;
/**
- * The Key
+ * Key Length (in bytes)
*
- * @see \phpseclib\Crypt\Base::key
- * @see setKey()
- * @var string
- * @access private
- */
- var $key = "\0\0\0\0\0\0\0\0";
-
- /**
- * The default password key_size used by setPassword()
- *
- * @see \phpseclib\Crypt\Base::password_key_size
- * @see \phpseclib\Crypt\Base::setPassword()
+ * @see \phpseclib\Crypt\Base::setKeyLength()
* @var int
* @access private
*/
- var $password_key_size = 8;
+ var $key_length = 8;
/**
* The mcrypt specific name of the cipher
@@ -133,8 +122,8 @@ class DES extends Base
*
* Used only if $engine == self::ENGINE_INTERNAL
*
- * @see \phpseclib\Crypt\DES::_setupKey()
- * @see \phpseclib\Crypt\DES::_processBlock()
+ * @see self::_setupKey()
+ * @see self::_processBlock()
* @var int
* @access private
*/
@@ -143,16 +132,16 @@ class DES extends Base
/**
* max possible size of $key
*
- * @see \phpseclib\Crypt\DES::setKey()
+ * @see self::setKey()
* @var string
* @access private
*/
- var $key_size_max = 8;
+ var $key_length_max = 8;
/**
* The Key Schedule
*
- * @see \phpseclib\Crypt\DES::_setupKey()
+ * @see self::_setupKey()
* @var array
* @access private
*/
@@ -165,8 +154,8 @@ class DES extends Base
* with each byte containing all bits in the same state as the
* corresponding bit in the index value.
*
- * @see \phpseclib\Crypt\DES::_processBlock()
- * @see \phpseclib\Crypt\DES::_setupKey()
+ * @see self::_processBlock()
+ * @see self::_setupKey()
* @var array
* @access private
*/
@@ -592,7 +581,7 @@ class DES extends Base
/**
* Test for engine validity
*
- * This is mainly just a wrapper to set things up for Crypt_Base::isValidEngine()
+ * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
*
* @see \phpseclib\Crypt\Base::isValidEngine()
* @param int $engine
@@ -601,7 +590,7 @@ class DES extends Base
*/
function isValidEngine($engine)
{
- if ($this->key_size_max == 8) {
+ if ($this->key_length_max == 8) {
if ($engine == self::ENGINE_OPENSSL) {
$this->cipher_name_openssl_ecb = 'des-ecb';
$this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
@@ -630,8 +619,8 @@ class DES extends Base
{
// We check/cut here only up to max length of the key.
// Key padding to the proper length will be done in _setupKey()
- if (strlen($key) > $this->key_size_max) {
- $key = substr($key, 0, $this->key_size_max);
+ if (strlen($key) > $this->key_length_max) {
+ $key = substr($key, 0, $this->key_length_max);
}
// Sets the key
@@ -643,7 +632,7 @@ class DES extends Base
*
* @see \phpseclib\Crypt\Base::_encryptBlock()
* @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\DES::encrypt()
+ * @see self::encrypt()
* @access private
* @param string $in
* @return string
@@ -658,7 +647,7 @@ class DES extends Base
*
* @see \phpseclib\Crypt\Base::_decryptBlock()
* @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\DES::decrypt()
+ * @see self::decrypt()
* @access private
* @param string $in
* @return string
@@ -675,8 +664,8 @@ class DES extends Base
* {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
* idea of what this function does.
*
- * @see \phpseclib\Crypt\DES::_encryptBlock()
- * @see \phpseclib\Crypt\DES::_decryptBlock()
+ * @see self::_encryptBlock()
+ * @see self::_decryptBlock()
* @access private
* @param string $block
* @param int $mode
@@ -1308,12 +1297,12 @@ class DES extends Base
$des_rounds = $this->des_rounds;
// We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
- // (Currently, for Crypt_DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
- // (Currently, for Crypt_TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
+ // (Currently, for DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
+ // (Currently, for TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
// After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one
$gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
- // Generation of a uniqe hash for our generated code
+ // Generation of a unique hash for our generated code
$code_hash = "Crypt_DES, $des_rounds, {$this->mode}";
if ($gen_hi_opt_code) {
// For hi-optimized code, we create for each combination of
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
new file mode 100644
index 00000000..07665a16
--- /dev/null
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
@@ -0,0 +1,824 @@
+
+ * setKey('abcdefg');
+ *
+ * echo base64_encode($hash->hash('abcdefg'));
+ * ?>
+ *
+ *
+ * @category Crypt
+ * @package Hash
+ * @author Jim Wigginton \r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n\r\n"; flush(); ob_flush(); } else { $this->packet_type_log[] = $packet_type; - if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) { + if (NET_SFTP_LOGGING == self::LOG_COMPLEX) { $this->packet_log[] = $data; } } @@ -2703,7 +2917,7 @@ class SFTP extends SSH2 * There can be one SSH_MSG_CHANNEL_DATA messages containing two SFTP packets or there can be two SSH_MSG_CHANNEL_DATA * messages containing one SFTP packet. * - * @see \phpseclib\Net\SFTP::_send_sftp_packet() + * @see self::_send_sftp_packet() * @return string * @access private */ @@ -2723,6 +2937,9 @@ class SFTP extends SSH2 } $this->packet_buffer.= $temp; } + if (strlen($this->packet_buffer) < 4) { + return false; + } extract(unpack('Nlength', $this->_string_shift($this->packet_buffer, 4))); $tempLength = $length; $tempLength-= strlen($this->packet_buffer); @@ -2755,13 +2972,13 @@ class SFTP extends SSH2 if (defined('NET_SFTP_LOGGING')) { $packet_type = '<- ' . $this->packet_types[$this->packet_type] . ' (' . round($stop - $start, 4) . 's)'; - if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) { + if (NET_SFTP_LOGGING == self::LOG_REALTIME) { echo "
\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n\r\n"; flush(); ob_flush(); } else { $this->packet_type_log[] = $packet_type; - if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) { + if (NET_SFTP_LOGGING == self::LOG_COMPLEX) { $this->packet_log[] = $packet; } } @@ -2785,10 +3002,10 @@ class SFTP extends SSH2 } switch (NET_SFTP_LOGGING) { - case NET_SFTP_LOG_COMPLEX: + case self::LOG_COMPLEX: return $this->_format_log($this->packet_log, $this->packet_type_log); break; - //case NET_SFTP_LOG_SIMPLE: + //case self::LOG_SIMPLE: default: return $this->packet_type_log; } diff --git a/inc/Exts/phpseclib/Net/SFTP/Stream.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php similarity index 97% rename from inc/Exts/phpseclib/Net/SFTP/Stream.php rename to vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php index 7af7280a..08d726ca 100644 --- a/inc/Exts/phpseclib/Net/SFTP/Stream.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php @@ -19,7 +19,6 @@ namespace phpseclib\Net\SFTP; use phpseclib\Crypt\RSA; use phpseclib\Net\SFTP; -use phpseclib\Net\SSH2; /** * SFTP Stream Wrapper @@ -154,7 +153,18 @@ class Stream */ function _parse_path($path) { + $orig = $path; extract(parse_url($path) + array('port' => 22)); + if (isset($query)) { + $path.= '?' . $query; + } elseif (preg_match('/(\?|\?#)$/', $orig)) { + $path.= '?'; + } + if (isset($fragment)) { + $path.= '#' . $fragment; + } elseif ($orig[strlen($orig) - 1] == '#') { + $path.= '#'; + } if (!isset($host)) { return false; @@ -167,12 +177,13 @@ class Stream } } - if (preg_match('/^{[a-z0-9]+}$/i', $host)) { - $host = SSH2::getConnectionByResourceId($host); - if ($host === false) { + if ($host[0] == '$') { + $host = substr($host, 1); + global $$host; + if (($$host instanceof SFTP) === false) { return false; } - $this->sftp = $host; + $this->sftp = $$host; } else { if (isset($this->context)) { $context = stream_context_get_options($this->context); diff --git a/inc/Exts/phpseclib/Net/SSH1.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php similarity index 91% rename from inc/Exts/phpseclib/Net/SSH1.php rename to vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php index 91adf675..9e608f4b 100644 --- a/inc/Exts/phpseclib/Net/SSH1.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php @@ -261,7 +261,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getServerKeyPublicExponent() + * @see self::getServerKeyPublicExponent() * @var string * @access private */ @@ -272,7 +272,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getServerKeyPublicModulus() + * @see self::getServerKeyPublicModulus() * @var string * @access private */ @@ -283,7 +283,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getHostKeyPublicExponent() + * @see self::getHostKeyPublicExponent() * @var string * @access private */ @@ -294,7 +294,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getHostKeyPublicModulus() + * @see self::getHostKeyPublicModulus() * @var string * @access private */ @@ -305,7 +305,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getSupportedCiphers() + * @see self::getSupportedCiphers() * @var array * @access private */ @@ -324,7 +324,7 @@ class SSH1 * * Logged for debug purposes * - * @see \phpseclib\Net\SSH1::getSupportedAuthentications() + * @see self::getSupportedAuthentications() * @var array * @access private */ @@ -338,7 +338,7 @@ class SSH1 /** * Server Identification * - * @see \phpseclib\Net\SSH1::getServerIdentification() + * @see self::getServerIdentification() * @var string * @access private */ @@ -347,7 +347,7 @@ class SSH1 /** * Protocol Flags * - * @see \phpseclib\Net\SSH1::__construct() + * @see self::__construct() * @var array * @access private */ @@ -356,7 +356,7 @@ class SSH1 /** * Protocol Flag Log * - * @see \phpseclib\Net\SSH1::getLog() + * @see self::getLog() * @var array * @access private */ @@ -365,7 +365,7 @@ class SSH1 /** * Message Log * - * @see \phpseclib\Net\SSH1::getLog() + * @see self::getLog() * @var array * @access private */ @@ -374,7 +374,7 @@ class SSH1 /** * Real-time log file pointer * - * @see \phpseclib\Net\SSH1::_append_log() + * @see self::_append_log() * @var resource * @access private */ @@ -383,7 +383,7 @@ class SSH1 /** * Real-time log file size * - * @see \phpseclib\Net\SSH1::_append_log() + * @see self::_append_log() * @var int * @access private */ @@ -392,7 +392,7 @@ class SSH1 /** * Real-time log file wrap boolean * - * @see \phpseclib\Net\SSH1::_append_log() + * @see self::_append_log() * @var bool * @access private */ @@ -401,7 +401,7 @@ class SSH1 /** * Interactive Buffer * - * @see \phpseclib\Net\SSH1::read() + * @see self::read() * @var array * @access private */ @@ -410,7 +410,7 @@ class SSH1 /** * Timeout * - * @see \phpseclib\Net\SSH1::setTimeout() + * @see self::setTimeout() * @access private */ var $timeout; @@ -418,7 +418,7 @@ class SSH1 /** * Current Timeout * - * @see \phpseclib\Net\SSH1::_get_channel_packet() + * @see self::_get_channel_packet() * @access private */ var $curTimeout; @@ -426,7 +426,7 @@ class SSH1 /** * Log Boundary * - * @see \phpseclib\Net\SSH1::_format_log + * @see self::_format_log() * @access private */ var $log_boundary = ':'; @@ -434,7 +434,7 @@ class SSH1 /** * Log Long Width * - * @see \phpseclib\Net\SSH1::_format_log + * @see self::_format_log() * @access private */ var $log_long_width = 65; @@ -442,7 +442,7 @@ class SSH1 /** * Log Short Width * - * @see \phpseclib\Net\SSH1::_format_log + * @see self::_format_log() * @access private */ var $log_short_width = 16; @@ -450,8 +450,8 @@ class SSH1 /** * Hostname * - * @see \phpseclib\Net\SSH1::__construct() - * @see \phpseclib\Net\SSH1::_connect() + * @see self::__construct() + * @see self::_connect() * @var string * @access private */ @@ -460,8 +460,8 @@ class SSH1 /** * Port Number * - * @see \phpseclib\Net\SSH1::__construct() - * @see \phpseclib\Net\SSH1::_connect() + * @see self::__construct() + * @see self::_connect() * @var int * @access private */ @@ -475,8 +475,8 @@ class SSH1 * however, is non-optional. There will be a timeout, whether or not you set it. If you don't it'll be * 10 seconds. It is used by fsockopen() in that function. * - * @see \phpseclib\Net\SSH1::__construct() - * @see \phpseclib\Net\SSH1::_connect() + * @see self::__construct() + * @see self::_connect() * @var int * @access private */ @@ -485,8 +485,8 @@ class SSH1 /** * Default cipher * - * @see \phpseclib\Net\SSH1::__construct() - * @see \phpseclib\Net\SSH1::_connect() + * @see self::__construct() + * @see self::_connect() * @var int * @access private */ @@ -537,15 +537,14 @@ class SSH1 * Connect to an SSHv1 server * * @return bool - * @throws \UnexpectedValueException on receipt of unexpected packets - * @throws \RuntimeException on other errors * @access private */ function _connect() { $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->connectionTimeout); if (!$this->fsock) { - throw new \RuntimeException(rtrim("Cannot connect to $host. Error $errno. $errstr")); + user_error(rtrim("Cannot connect to {$this->host}:{$this->port}. Error $errno. $errstr")); + return false; } $this->server_identification = $init_line = fgets($this->fsock, 255); @@ -556,45 +555,66 @@ class SSH1 } if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) { - throw new \RuntimeException('Can only connect to SSH servers'); + user_error('Can only connect to SSH servers'); + return false; } if ($parts[1][0] != 1) { - throw new \RuntimeException("Cannot connect to $parts[1] servers"); + user_error("Cannot connect to SSH $parts[1] servers"); + return false; } fputs($this->fsock, $this->identifier."\r\n"); $response = $this->_get_binary_packet(); if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_PUBLIC_KEY) { - throw new \UnexpectedValueException('Expected SSH_SMSG_PUBLIC_KEY'); + user_error('Expected SSH_SMSG_PUBLIC_KEY'); + return false; } $anti_spoofing_cookie = $this->_string_shift($response[self::RESPONSE_DATA], 8); $this->_string_shift($response[self::RESPONSE_DATA], 4); + if (strlen($response[self::RESPONSE_DATA]) < 2) { + return false; + } $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2)); $server_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256); $this->server_key_public_exponent = $server_key_public_exponent; + if (strlen($response[self::RESPONSE_DATA]) < 2) { + return false; + } $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2)); $server_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256); + $this->server_key_public_modulus = $server_key_public_modulus; $this->_string_shift($response[self::RESPONSE_DATA], 4); + if (strlen($response[self::RESPONSE_DATA]) < 2) { + return false; + } $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2)); $host_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256); $this->host_key_public_exponent = $host_key_public_exponent; + if (strlen($response[self::RESPONSE_DATA]) < 2) { + return false; + } $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2)); $host_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256); + $this->host_key_public_modulus = $host_key_public_modulus; $this->_string_shift($response[self::RESPONSE_DATA], 4); // get a list of the supported ciphers + if (strlen($response[self::RESPONSE_DATA]) < 4) { + return false; + } extract(unpack('Nsupported_ciphers_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4))); + foreach ($this->supported_ciphers as $mask => $name) { if (($supported_ciphers_mask & (1 << $mask)) == 0) { unset($this->supported_ciphers[$mask]); @@ -602,6 +622,9 @@ class SSH1 } // get a list of the supported authentications + if (strlen($response[self::RESPONSE_DATA]) < 4) { + return false; + } extract(unpack('Nsupported_authentications_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4))); foreach ($this->supported_authentications as $mask => $name) { if (($supported_authentications_mask & (1 << $mask)) == 0) { @@ -650,7 +673,8 @@ class SSH1 $data = pack('C2a*na*N', NET_SSH1_CMSG_SESSION_KEY, $cipher, $anti_spoofing_cookie, 8 * strlen($double_encrypted_session_key), $double_encrypted_session_key, 0); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_SESSION_KEY'); + user_error('Error sending SSH_CMSG_SESSION_KEY'); + return false; } switch ($cipher) { @@ -679,7 +703,8 @@ class SSH1 $response = $this->_get_binary_packet(); if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) { - throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS'); + user_error('Expected SSH_SMSG_SUCCESS'); + return false; } $this->bitmap = self::MASK_CONNECTED; @@ -693,8 +718,6 @@ class SSH1 * @param string $username * @param string $password * @return bool - * @throws \UnexpectedValueException on receipt of unexpected packets - * @throws \RuntimeException on other errors * @access public */ function login($username, $password = '') @@ -713,7 +736,8 @@ class SSH1 $data = pack('CNa*', NET_SSH1_CMSG_USER, strlen($username), $username); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_USER'); + user_error('Error sending SSH_CMSG_USER'); + return false; } $response = $this->_get_binary_packet(); @@ -725,13 +749,15 @@ class SSH1 $this->bitmap |= self::MASK_LOGIN; return true; } elseif ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_FAILURE) { - throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE'); + user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE'); + return false; } $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen($password), $password); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_AUTH_PASSWORD'); + user_error('Error sending SSH_CMSG_AUTH_PASSWORD'); + return false; } // remove the username and password from the last logged packet @@ -751,7 +777,8 @@ class SSH1 } elseif ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_FAILURE) { return false; } else { - throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE'); + user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE'); + return false; } } @@ -782,23 +809,24 @@ class SSH1 * * Returns false on failure and the output, otherwise. * - * @see \phpseclib\Net\SSH1::interactiveRead() - * @see \phpseclib\Net\SSH1::interactiveWrite() + * @see self::interactiveRead() + * @see self::interactiveWrite() * @param string $cmd * @return mixed - * @throws \RuntimeException on error sending command * @access public */ function exec($cmd, $block = true) { if (!($this->bitmap & self::MASK_LOGIN)) { - throw new \RuntimeException('Operation disallowed prior to login()'); + user_error('Operation disallowed prior to login()'); + return false; } $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_EXEC_CMD'); + user_error('Error sending SSH_CMSG_EXEC_CMD'); + return false; } if (!$block) { @@ -831,11 +859,9 @@ class SSH1 /** * Creates an interactive shell * - * @see \phpseclib\Net\SSH1::interactiveRead() - * @see \phpseclib\Net\SSH1::interactiveWrite() + * @see self::interactiveRead() + * @see self::interactiveWrite() * @return bool - * @throws \UnexpectedValueException on receipt of unexpected packets - * @throws \RuntimeException on other errors * @access private */ function _initShell() @@ -846,7 +872,8 @@ class SSH1 $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, self::TTY_OP_END); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_REQUEST_PTY'); + user_error('Error sending SSH_CMSG_REQUEST_PTY'); + return false; } $response = $this->_get_binary_packet(); @@ -855,13 +882,15 @@ class SSH1 return false; } if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) { - throw new \UnexpectedValueException('Expected SSH_SMSG_SUCCESS'); + user_error('Expected SSH_SMSG_SUCCESS'); + return false; } $data = pack('C', NET_SSH1_CMSG_EXEC_SHELL); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_EXEC_SHELL'); + user_error('Error sending SSH_CMSG_EXEC_SHELL'); + return false; } $this->bitmap |= self::MASK_SHELL; @@ -874,7 +903,7 @@ class SSH1 /** * Inputs a command into an interactive shell. * - * @see \phpseclib\Net\SSH1::interactiveWrite() + * @see self::interactiveWrite() * @param string $cmd * @return bool * @access public @@ -890,21 +919,22 @@ class SSH1 * $expect can take the form of a string literal or, if $mode == self::READ__REGEX, * a regular expression. * - * @see \phpseclib\Net\SSH1::write() + * @see self::write() * @param string $expect * @param int $mode * @return bool - * @throws \RuntimeException on connection error * @access public */ function read($expect, $mode = self::READ__SIMPLE) { if (!($this->bitmap & self::MASK_LOGIN)) { - throw new \RuntimeException('Operation disallowed prior to login()'); + user_error('Operation disallowed prior to login()'); + return false; } if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) { - throw new \RuntimeException('Unable to initiate an interactive shell session'); + user_error('Unable to initiate an interactive shell session'); + return false; } $match = $expect; @@ -929,26 +959,28 @@ class SSH1 /** * Inputs a command into an interactive shell. * - * @see \phpseclib\Net\SSH1::interactiveRead() + * @see self::interactiveRead() * @param string $cmd * @return bool - * @throws \RuntimeException on connection error * @access public */ function interactiveWrite($cmd) { if (!($this->bitmap & self::MASK_LOGIN)) { - throw new \RuntimeException('Operation disallowed prior to login()'); + user_error('Operation disallowed prior to login()'); + return false; } if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) { - throw new \RuntimeException('Unable to initiate an interactive shell session'); + user_error('Unable to initiate an interactive shell session'); + return false; } $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($cmd), $cmd); if (!$this->_send_binary_packet($data)) { - throw new \RuntimeException('Error sending SSH_CMSG_STDIN'); + user_error('Error sending SSH_CMSG_STDIN'); + return false; } return true; @@ -963,19 +995,20 @@ class SSH1 * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user, * there's not going to be much recourse. * - * @see \phpseclib\Net\SSH1::interactiveRead() + * @see self::interactiveRead() * @return string - * @throws \RuntimeException on connection error * @access public */ function interactiveRead() { if (!($this->bitmap & self::MASK_LOGIN)) { - throw new \RuntimeException('Operation disallowed prior to login()'); + user_error('Operation disallowed prior to login()'); + return false; } if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) { - throw new \RuntimeException('Unable to initiate an interactive shell session'); + user_error('Unable to initiate an interactive shell session'); + return false; } $read = array($this->fsock); @@ -1051,7 +1084,7 @@ class SSH1 * Also, this function could be improved upon by adding detection for the following exploit: * http://www.securiteam.com/securitynews/5LP042K3FY.html * - * @see \phpseclib\Net\SSH1::_send_binary_packet() + * @see self::_send_binary_packet() * @return array * @access private */ @@ -1079,7 +1112,11 @@ class SSH1 } $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838 - $temp = unpack('Nlength', fread($this->fsock, 4)); + $data = fread($this->fsock, 4); + if (strlen($data) < 4) { + return false; + } + $temp = unpack('Nlength', $data); $padding_length = 8 - ($temp['length'] & 7); $length = $temp['length'] + $padding_length; @@ -1100,6 +1137,9 @@ class SSH1 $type = $raw[$padding_length]; $data = substr($raw, $padding_length + 1, -4); + if (strlen($raw) < 4) { + return false; + } $temp = unpack('Ncrc', substr($raw, -4)); //if ( $temp['crc'] != $this->_crc($padding . $type . $data) ) { @@ -1127,7 +1167,7 @@ class SSH1 * * Returns true on success, false on failure. * - * @see \phpseclib\Net\SSH1::_get_binary_packet() + * @see self::_get_binary_packet() * @param string $data * @return bool * @access private @@ -1174,8 +1214,8 @@ class SSH1 * we've reimplemented it. A more detailed discussion of the differences can be found after * $crc_lookup_table's initialization. * - * @see \phpseclib\Net\SSH1::_get_binary_packet() - * @see \phpseclib\Net\SSH1::_send_binary_packet() + * @see self::_get_binary_packet() + * @see self::_send_binary_packet() * @param string $data * @return int * @access private @@ -1291,7 +1331,7 @@ class SSH1 * should be a number with the property that gcd($e, ($p - 1) * ($q - 1)) == 1. Could just make anything that * calls this call modexp, instead, but I think this makes things clearer, maybe... * - * @see \phpseclib\Net\SSH1::__construct() + * @see self::__construct() * @param BigInteger $m * @param array $key * @return BigInteger diff --git a/inc/Exts/phpseclib/Net/SSH2.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php similarity index 86% rename from inc/Exts/phpseclib/Net/SSH2.php rename to vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php index 81af5d79..937c38cc 100644 --- a/inc/Exts/phpseclib/Net/SSH2.php +++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php @@ -60,7 +60,6 @@ use phpseclib\Crypt\TripleDES; use phpseclib\Crypt\Twofish; use phpseclib\Math\BigInteger; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification. use phpseclib\System\SSH\Agent; -use phpseclib\Exception\NoSupportedAlgorithmsException; /** * Pure-PHP implementation of SSHv2. @@ -177,8 +176,8 @@ class SSH2 /** * Error information * - * @see \phpseclib\Net\SSH2::getErrors() - * @see \phpseclib\Net\SSH2::getLastError() + * @see self::getErrors() + * @see self::getLastError() * @var string * @access private */ @@ -187,7 +186,7 @@ class SSH2 /** * Server Identifier * - * @see \phpseclib\Net\SSH2::getServerIdentification() + * @see self::getServerIdentification() * @var array|false * @access private */ @@ -196,7 +195,7 @@ class SSH2 /** * Key Exchange Algorithms * - * @see \phpseclib\Net\SSH2::getKexAlgorithims() + * @see self::getKexAlgorithims() * @var array|false * @access private */ @@ -205,7 +204,7 @@ class SSH2 /** * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods * - * @see Net_SSH2::_key_exchange() + * @see self::_key_exchange() * @var int * @access private */ @@ -214,7 +213,7 @@ class SSH2 /** * Preferred Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods * - * @see Net_SSH2::_key_exchange() + * @see self::_key_exchange() * @var int * @access private */ @@ -223,7 +222,7 @@ class SSH2 /** * Maximum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods * - * @see Net_SSH2::_key_exchange() + * @see self::_key_exchange() * @var int * @access private */ @@ -232,7 +231,7 @@ class SSH2 /** * Server Host Key Algorithms * - * @see \phpseclib\Net\SSH2::getServerHostKeyAlgorithms() + * @see self::getServerHostKeyAlgorithms() * @var array|false * @access private */ @@ -241,7 +240,7 @@ class SSH2 /** * Encryption Algorithms: Client to Server * - * @see \phpseclib\Net\SSH2::getEncryptionAlgorithmsClient2Server() + * @see self::getEncryptionAlgorithmsClient2Server() * @var array|false * @access private */ @@ -250,7 +249,7 @@ class SSH2 /** * Encryption Algorithms: Server to Client * - * @see \phpseclib\Net\SSH2::getEncryptionAlgorithmsServer2Client() + * @see self::getEncryptionAlgorithmsServer2Client() * @var array|false * @access private */ @@ -259,7 +258,7 @@ class SSH2 /** * MAC Algorithms: Client to Server * - * @see \phpseclib\Net\SSH2::getMACAlgorithmsClient2Server() + * @see self::getMACAlgorithmsClient2Server() * @var array|false * @access private */ @@ -268,7 +267,7 @@ class SSH2 /** * MAC Algorithms: Server to Client * - * @see \phpseclib\Net\SSH2::getMACAlgorithmsServer2Client() + * @see self::getMACAlgorithmsServer2Client() * @var array|false * @access private */ @@ -277,7 +276,7 @@ class SSH2 /** * Compression Algorithms: Client to Server * - * @see \phpseclib\Net\SSH2::getCompressionAlgorithmsClient2Server() + * @see self::getCompressionAlgorithmsClient2Server() * @var array|false * @access private */ @@ -286,7 +285,7 @@ class SSH2 /** * Compression Algorithms: Server to Client * - * @see \phpseclib\Net\SSH2::getCompressionAlgorithmsServer2Client() + * @see self::getCompressionAlgorithmsServer2Client() * @var array|false * @access private */ @@ -295,7 +294,7 @@ class SSH2 /** * Languages: Server to Client * - * @see \phpseclib\Net\SSH2::getLanguagesServer2Client() + * @see self::getLanguagesServer2Client() * @var array|false * @access private */ @@ -304,7 +303,7 @@ class SSH2 /** * Languages: Client to Server * - * @see \phpseclib\Net\SSH2::getLanguagesClient2Server() + * @see self::getLanguagesClient2Server() * @var array|false * @access private */ @@ -320,8 +319,8 @@ class SSH2 * * -- http://tools.ietf.org/html/rfc4253#section-6 * - * @see \phpseclib\Net\SSH2::__construct() - * @see \phpseclib\Net\SSH2::_send_binary_packet() + * @see self::__construct() + * @see self::_send_binary_packet() * @var int * @access private */ @@ -330,8 +329,8 @@ class SSH2 /** * Block Size for Client to Server Encryption * - * @see \phpseclib\Net\SSH2::__construct() - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::__construct() + * @see self::_get_binary_packet() * @var int * @access private */ @@ -340,7 +339,7 @@ class SSH2 /** * Server to Client Encryption Object * - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::_get_binary_packet() * @var object * @access private */ @@ -349,7 +348,7 @@ class SSH2 /** * Client to Server Encryption Object * - * @see \phpseclib\Net\SSH2::_send_binary_packet() + * @see self::_send_binary_packet() * @var object * @access private */ @@ -358,7 +357,7 @@ class SSH2 /** * Client to Server HMAC Object * - * @see \phpseclib\Net\SSH2::_send_binary_packet() + * @see self::_send_binary_packet() * @var object * @access private */ @@ -367,7 +366,7 @@ class SSH2 /** * Server to Client HMAC Object * - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::_get_binary_packet() * @var object * @access private */ @@ -380,7 +379,7 @@ class SSH2 * For the client to server side, the HMAC object will make the HMAC as long as it needs to be. All we need to do is * append it. * - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::_get_binary_packet() * @var int * @access private */ @@ -389,14 +388,14 @@ class SSH2 /** * Server Public Host Key * - * @see \phpseclib\Net\SSH2::getServerPublicHostKey() + * @see self::getServerPublicHostKey() * @var string * @access private */ var $server_public_host_key; /** - * Session identifer + * Session identifier * * "The exchange hash H from the first key exchange is additionally * used as the session identifier, which is a unique identifier for @@ -404,7 +403,7 @@ class SSH2 * * -- http://tools.ietf.org/html/rfc4253#section-7.2 * - * @see \phpseclib\Net\SSH2::_key_exchange() + * @see self::_key_exchange() * @var string * @access private */ @@ -415,7 +414,7 @@ class SSH2 * * The current exchange hash * - * @see \phpseclib\Net\SSH2::_key_exchange() + * @see self::_key_exchange() * @var string * @access private */ @@ -424,7 +423,7 @@ class SSH2 /** * Message Numbers * - * @see \phpseclib\Net\SSH2::__construct() + * @see self::__construct() * @var array * @access private */ @@ -433,7 +432,7 @@ class SSH2 /** * Disconnection Message 'reason codes' defined in RFC4253 * - * @see \phpseclib\Net\SSH2::__construct() + * @see self::__construct() * @var array * @access private */ @@ -442,7 +441,7 @@ class SSH2 /** * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254 * - * @see \phpseclib\Net\SSH2::__construct() + * @see self::__construct() * @var array * @access private */ @@ -452,7 +451,7 @@ class SSH2 * Terminal Modes * * @link http://tools.ietf.org/html/rfc4254#section-8 - * @see \phpseclib\Net\SSH2::__construct() + * @see self::__construct() * @var array * @access private */ @@ -462,7 +461,7 @@ class SSH2 * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes * * @link http://tools.ietf.org/html/rfc4254#section-5.2 - * @see \phpseclib\Net\SSH2::__construct() + * @see self::__construct() * @var array * @access private */ @@ -473,7 +472,7 @@ class SSH2 * * See 'Section 6.4. Data Integrity' of rfc4253 for more info. * - * @see \phpseclib\Net\SSH2::_send_binary_packet() + * @see self::_send_binary_packet() * @var int * @access private */ @@ -484,7 +483,7 @@ class SSH2 * * See 'Section 6.4. Data Integrity' of rfc4253 for more info. * - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::_get_binary_packet() * @var int * @access private */ @@ -495,8 +494,8 @@ class SSH2 * * Maps client channels to server channels * - * @see \phpseclib\Net\SSH2::_get_channel_packet() - * @see \phpseclib\Net\SSH2::exec() + * @see self::_get_channel_packet() + * @see self::exec() * @var array * @access private */ @@ -508,8 +507,8 @@ class SSH2 * If a client requests a packet from one channel but receives two packets from another those packets should * be placed in a buffer * - * @see \phpseclib\Net\SSH2::_get_channel_packet() - * @see \phpseclib\Net\SSH2::exec() + * @see self::_get_channel_packet() + * @see self::exec() * @var array * @access private */ @@ -520,7 +519,7 @@ class SSH2 * * Contains the type of the last sent message * - * @see \phpseclib\Net\SSH2::_get_channel_packet() + * @see self::_get_channel_packet() * @var array * @access private */ @@ -531,7 +530,7 @@ class SSH2 * * Maximum packet size indexed by channel * - * @see \phpseclib\Net\SSH2::_send_channel_packet() + * @see self::_send_channel_packet() * @var array * @access private */ @@ -540,7 +539,7 @@ class SSH2 /** * Message Number Log * - * @see \phpseclib\Net\SSH2::getLog() + * @see self::getLog() * @var array * @access private */ @@ -549,7 +548,7 @@ class SSH2 /** * Message Log * - * @see \phpseclib\Net\SSH2::getLog() + * @see self::getLog() * @var array * @access private */ @@ -561,8 +560,8 @@ class SSH2 * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB) * * @var int - * @see \phpseclib\Net\SSH2::_send_channel_packet() - * @see \phpseclib\Net\SSH2::exec() + * @see self::_send_channel_packet() + * @see self::exec() * @access private */ var $window_size = 0x7FFFFFFF; @@ -572,7 +571,7 @@ class SSH2 * * Window size indexed by channel * - * @see \phpseclib\Net\SSH2::_send_channel_packet() + * @see self::_send_channel_packet() * @var array * @access private */ @@ -583,7 +582,7 @@ class SSH2 * * Window size indexed by channel * - * @see \phpseclib\Net\SSH2::_get_channel_packet() + * @see self::_get_channel_packet() * @var array * @access private */ @@ -594,7 +593,7 @@ class SSH2 * * Verified against $this->session_id * - * @see \phpseclib\Net\SSH2::getServerPublicHostKey() + * @see self::getServerPublicHostKey() * @var string * @access private */ @@ -605,7 +604,7 @@ class SSH2 * * ssh-rsa or ssh-dss. * - * @see \phpseclib\Net\SSH2::getServerPublicHostKey() + * @see self::getServerPublicHostKey() * @var string * @access private */ @@ -614,7 +613,7 @@ class SSH2 /** * Interactive Buffer * - * @see \phpseclib\Net\SSH2::read() + * @see self::read() * @var array * @access private */ @@ -625,8 +624,8 @@ class SSH2 * * Should never exceed self::LOG_MAX_SIZE * - * @see \phpseclib\Net\SSH2::_send_binary_packet() - * @see \phpseclib\Net\SSH2::_get_binary_packet() + * @see self::_send_binary_packet() + * @see self::_get_binary_packet() * @var int * @access private */ @@ -635,7 +634,7 @@ class SSH2 /** * Timeout * - * @see \phpseclib\Net\SSH2::setTimeout() + * @see self::setTimeout() * @access private */ var $timeout; @@ -643,7 +642,7 @@ class SSH2 /** * Current Timeout * - * @see \phpseclib\Net\SSH2::_get_channel_packet() + * @see self::_get_channel_packet() * @access private */ var $curTimeout; @@ -651,7 +650,7 @@ class SSH2 /** * Real-time log file pointer * - * @see \phpseclib\Net\SSH2::_append_log() + * @see self::_append_log() * @var resource * @access private */ @@ -660,7 +659,7 @@ class SSH2 /** * Real-time log file size * - * @see \phpseclib\Net\SSH2::_append_log() + * @see self::_append_log() * @var int * @access private */ @@ -669,7 +668,7 @@ class SSH2 /** * Has the signature been validated? * - * @see \phpseclib\Net\SSH2::getServerPublicHostKey() + * @see self::getServerPublicHostKey() * @var bool * @access private */ @@ -678,7 +677,7 @@ class SSH2 /** * Real-time log file wrap boolean * - * @see \phpseclib\Net\SSH2::_append_log() + * @see self::_append_log() * @access private */ var $realtime_log_wrap; @@ -686,7 +685,7 @@ class SSH2 /** * Flag to suppress stderr from output * - * @see \phpseclib\Net\SSH2::enableQuietMode() + * @see self::enableQuietMode() * @access private */ var $quiet_mode = false; @@ -711,7 +710,7 @@ class SSH2 * Flag to request a PTY when using exec() * * @var bool - * @see \phpseclib\Net\SSH2::enablePTY() + * @see self::enablePTY() * @access private */ var $request_pty = false; @@ -743,7 +742,7 @@ class SSH2 /** * The Last Interactive Response * - * @see \phpseclib\Net\SSH2::_keyboard_interactive_process() + * @see self::_keyboard_interactive_process() * @var string * @access private */ @@ -752,7 +751,7 @@ class SSH2 /** * Keyboard Interactive Request / Responses * - * @see \phpseclib\Net\SSH2::_keyboard_interactive_process() + * @see self::_keyboard_interactive_process() * @var array * @access private */ @@ -764,8 +763,8 @@ class SSH2 * Quoting from the RFC, "in some jurisdictions, sending a warning message before * authentication may be relevant for getting legal protection." * - * @see \phpseclib\Net\SSH2::_filter() - * @see \phpseclib\Net\SSH2::getBannerMessage() + * @see self::_filter() + * @see self::getBannerMessage() * @var string * @access private */ @@ -774,7 +773,7 @@ class SSH2 /** * Did read() timeout or return normally? * - * @see \phpseclib\Net\SSH2::isTimeout() + * @see self::isTimeout() * @var bool * @access private */ @@ -783,7 +782,7 @@ class SSH2 /** * Log Boundary * - * @see \phpseclib\Net\SSH2::_format_log() + * @see self::_format_log() * @var string * @access private */ @@ -792,7 +791,7 @@ class SSH2 /** * Log Long Width * - * @see \phpseclib\Net\SSH2::_format_log() + * @see self::_format_log() * @var int * @access private */ @@ -801,7 +800,7 @@ class SSH2 /** * Log Short Width * - * @see \phpseclib\Net\SSH2::_format_log() + * @see self::_format_log() * @var int * @access private */ @@ -810,8 +809,8 @@ class SSH2 /** * Hostname * - * @see \phpseclib\Net\SSH2::__construct() - * @see \phpseclib\Net\SSH2::_connect() + * @see self::__construct() + * @see self::_connect() * @var string * @access private */ @@ -820,8 +819,8 @@ class SSH2 /** * Port Number * - * @see \phpseclib\Net\SSH2::__construct() - * @see \phpseclib\Net\SSH2::_connect() + * @see self::__construct() + * @see self::_connect() * @var int * @access private */ @@ -830,9 +829,9 @@ class SSH2 /** * Number of columns for terminal window size * - * @see \phpseclib\Net\SSH2::getWindowColumns() - * @see \phpseclib\Net\SSH2::setWindowColumns() - * @see \phpseclib\Net\SSH2::setWindowSize() + * @see self::getWindowColumns() + * @see self::setWindowColumns() + * @see self::setWindowSize() * @var int * @access private */ @@ -841,9 +840,9 @@ class SSH2 /** * Number of columns for terminal window size * - * @see \phpseclib\Net\SSH2::getWindowRows() - * @see \phpseclib\Net\SSH2::setWindowRows() - * @see \phpseclib\Net\SSH2::setWindowSize() + * @see self::getWindowRows() + * @see self::setWindowRows() + * @see self::setWindowSize() * @var int * @access private */ @@ -852,8 +851,8 @@ class SSH2 /** * Crypto Engine * - * @see Net_SSH2::setCryptoEngine() - * @see Net_SSH2::_key_exchange() + * @see self::setCryptoEngine() + * @see self::_key_exchange() * @var int * @access private */ @@ -867,14 +866,6 @@ class SSH2 */ var $agent; - /** - * Connection storage to replicates ssh2 extension functionality: - * {@link http://php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-examples} - * - * @var SSH2[] - */ - static $connections; - /** * Default Constructor. * @@ -883,7 +874,7 @@ class SSH2 * @param mixed $host * @param int $port * @param int $timeout - * @see \phpseclib\Net\SSH2::login() + * @see self::login() * @return \phpseclib\Net\SSH2 * @access public */ @@ -968,8 +959,6 @@ class SSH2 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') ); - self::$connections[$this->getResourceId()] = $this; - if (is_resource($host)) { $this->fsock = $host; return; @@ -1000,8 +989,6 @@ class SSH2 * Connect to an SSHv2 server * * @return bool - * @throws \UnexpectedValueException on receipt of unexpected packets - * @throws \RuntimeException on other errors * @access private */ function _connect() @@ -1018,10 +1005,14 @@ class SSH2 if (!is_resource($this->fsock)) { $start = microtime(true); - $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout); + // with stream_select a timeout of 0 means that no timeout takes place; + // with fsockopen a timeout of 0 means that you instantly timeout + // to resolve this incompatibility a timeout of 100,000 will be used for fsockopen if timeout is 0 + $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout == 0 ? 100000 : $this->curTimeout); if (!$this->fsock) { $host = $this->host . ':' . $this->port; - throw new \RuntimeException(rtrim("Cannot connect to $host. Error $errno. $errstr")); + user_error(rtrim("Cannot connect to $host. Error $errno. $errstr")); + return false; } $elapsed = microtime(true) - $start; @@ -1033,6 +1024,10 @@ class SSH2 } } + $this->identifier = $this->_generate_identifier(); + + fputs($this->fsock, $this->identifier . "\r\n"); + /* According to the SSH2 specs, "The server MAY send other lines of data before sending the version @@ -1040,66 +1035,84 @@ class SSH2 Feed. Such lines MUST NOT begin with "SSH-", and SHOULD be encoded in ISO-10646 UTF-8 [RFC3629] (language is not specified). Clients MUST be able to process such lines." */ - $temp = ''; - $extra = ''; - while (!feof($this->fsock) && !preg_match('#^SSH-(\d\.\d+)#', $temp, $matches)) { - if (substr($temp, -2) == "\r\n") { - $extra.= $temp; - $temp = ''; + $data = ''; + while (!feof($this->fsock) && !preg_match('#(.*)^(SSH-(\d\.\d+).*)#ms', $data, $matches)) { + $line = ''; + while (true) { + if ($this->curTimeout) { + if ($this->curTimeout < 0) { + $this->is_timeout = true; + return false; + } + $read = array($this->fsock); + $write = $except = null; + $start = microtime(true); + $sec = floor($this->curTimeout); + $usec = 1000000 * ($this->curTimeout - $sec); + // on windows this returns a "Warning: Invalid CRT parameters detected" error + // the !count() is done as a workaround for
' . $log . ''; default: return false; } @@ -3760,7 +3973,7 @@ class SSH2 /** * Returns all errors * - * @return string + * @return string[] * @access public */ function getErrors() @@ -3776,7 +3989,11 @@ class SSH2 */ function getLastError() { - return $this->errors[count($this->errors) - 1]; + $count = count($this->errors); + + if ($count > 0) { + return $this->errors[$count - 1]; + } } /** @@ -3943,8 +4160,6 @@ class SSH2 * is recommended. Returns false if the server signature is not signed correctly with the public host key. * * @return mixed - * @throws \RuntimeException on badly formatted keys - * @throws \phpseclib\Exception\NoSupportedAlgorithmsException when the key isn't in a supported format * @access public */ function getServerPublicHostKey() @@ -3958,6 +4173,9 @@ class SSH2 $signature = $this->signature; $server_public_host_key = $this->server_public_host_key; + if (strlen($server_public_host_key) < 4) { + return false; + } extract(unpack('Nlength', $this->_string_shift($server_public_host_key, 4))); $this->_string_shift($server_public_host_key, $length); @@ -3973,15 +4191,27 @@ class SSH2 case 'ssh-dss': $zero = new BigInteger(); + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $p = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256); + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $q = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256); + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $g = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256); + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $y = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256); @@ -3990,8 +4220,8 @@ class SSH2 padding, unsigned, and in network byte order). */ $temp = unpack('Nlength', $this->_string_shift($signature, 4)); if ($temp['length'] != 40) { - $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); - throw new \RuntimeException('Invalid signature'); + user_error('Invalid signature'); + return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); } $r = new BigInteger($this->_string_shift($signature, 20), 256); @@ -4002,8 +4232,8 @@ class SSH2 case $r->compare($q) >= 0: case $s->equals($zero): case $s->compare($q) >= 0: - $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); - throw new \RuntimeException('Invalid signature'); + user_error('Invalid signature'); + return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); } $w = $s->modInverse($q); @@ -4022,21 +4252,30 @@ class SSH2 list(, $v) = $v->divide($q); if (!$v->equals($r)) { - //user_error('Bad server signature'); + user_error('Bad server signature'); return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE); } break; case 'ssh-rsa': + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $e = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256); + if (strlen($server_public_host_key) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4)); $rawN = $this->_string_shift($server_public_host_key, $temp['length']); $n = new BigInteger($rawN, -256); $nLength = strlen(ltrim($rawN, "\0")); /* + if (strlen($signature) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($signature, 4)); $signature = $this->_string_shift($signature, $temp['length']); @@ -4044,11 +4283,14 @@ class SSH2 $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1); $rsa->loadKey(array('e' => $e, 'n' => $n), RSA::PUBLIC_FORMAT_RAW); if (!$rsa->verify($this->exchange_hash, $signature)) { - //user_error('Bad server signature'); + user_error('Bad server signature'); return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE); } */ + if (strlen($signature) < 4) { + return false; + } $temp = unpack('Nlength', $this->_string_shift($signature, 4)); $s = new BigInteger($this->_string_shift($signature, $temp['length']), 256); @@ -4059,8 +4301,8 @@ class SSH2 // also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source. if ($s->compare(new BigInteger()) < 0 || $s->compare($n->subtract(new BigInteger(1))) > 0) { - $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); - throw new \RuntimeException('Invalid signature'); + user_error('Invalid signature'); + return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); } $s = $s->modPow($e, $n); @@ -4070,13 +4312,13 @@ class SSH2 $h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 2 - strlen($h)) . $h; if ($s != $h) { - //user_error('Bad server signature'); + user_error('Bad server signature'); return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE); } break; default: - $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE); - throw new NoSupportedAlgorithmsException('Unsupported signature format'); + user_error('Unsupported signature format'); + return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE); } return $this->signature_format . ' ' . base64_encode($this->server_public_host_key); @@ -4152,47 +4394,4 @@ class SSH2 $this->windowColumns = $columns; $this->windowRows = $rows; } - - /** - * @return string - */ - function __toString() - { - return $this->getResourceId(); - } - - /** - * We use {} because that symbols should not be in URL according to - * {@link http://tools.ietf.org/html/rfc3986#section-2 RFC}. - * It will safe us from any conflicts, because otherwise regexp will - * match all alphanumeric domains. - * - * @return string - */ - function getResourceId() - { - return '{' . spl_object_hash($this) . '}'; - } - - /** - * Return existing connection - * - * @param string $id - * - * @return bool|SSH2 will return false if no such connection - */ - static function getConnectionByResourceId($id) - { - return isset(self::$connections[$id]) ? self::$connections[$id] : false; - } - - /** - * Return all excising connections - * - * @return SSH2[] - */ - static function getConnections() - { - return self::$connections; - } } diff --git a/inc/Exts/phpseclib/System/SSH/Agent.php b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php similarity index 90% rename from inc/Exts/phpseclib/System/SSH/Agent.php rename to vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php index 11a1f83f..a4ff0549 100644 --- a/inc/Exts/phpseclib/System/SSH/Agent.php +++ b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php @@ -115,8 +115,6 @@ class Agent * Default Constructor * * @return \phpseclib\System\SSH\Agent - * @throws \phpseclib\Exception\BadConfigurationException if SSH_AUTH_SOCK cannot be found - * @throws \RuntimeException on connection errors * @access public */ function __construct() @@ -129,12 +127,13 @@ class Agent $address = $_ENV['SSH_AUTH_SOCK']; break; default: - throw new \BadConfigurationException('SSH_AUTH_SOCK not found'); + user_error('SSH_AUTH_SOCK not found'); + return false; } $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr); if (!$this->fsock) { - throw new \RuntimeException("Unable to connect to ssh-agent (Error $errno: $errstr)"); + user_error("Unable to connect to ssh-agent (Error $errno: $errstr)"); } } @@ -145,7 +144,6 @@ class Agent * Returns an array containing zero or more \phpseclib\System\SSH\Agent\Identity objects * * @return array - * @throws \RuntimeException on receipt of unexpected packets * @access public */ function requestIdentities() @@ -156,13 +154,13 @@ class Agent $packet = pack('NC', 1, self::SSH_AGENTC_REQUEST_IDENTITIES); if (strlen($packet) != fputs($this->fsock, $packet)) { - throw new \RuntimeException('Connection closed while requesting identities'); + user_error('Connection closed while requesting identities'); } $length = current(unpack('N', fread($this->fsock, 4))); $type = ord(fread($this->fsock, 1)); if ($type != self::SSH_AGENT_IDENTITIES_ANSWER) { - throw new \RuntimeException('Unable to request identities'); + user_error('Unable to request identities'); } $identities = array(); @@ -170,14 +168,17 @@ class Agent for ($i = 0; $i < $keyCount; $i++) { $length = current(unpack('N', fread($this->fsock, 4))); $key_blob = fread($this->fsock, $length); + $key_str = 'ssh-rsa ' . base64_encode($key_blob); $length = current(unpack('N', fread($this->fsock, 4))); - $key_comment = fread($this->fsock, $length); + if ($length) { + $key_str.= ' ' . fread($this->fsock, $length); + } $length = current(unpack('N', substr($key_blob, 0, 4))); $key_type = substr($key_blob, 4, $length); switch ($key_type) { case 'ssh-rsa': $key = new RSA(); - $key->loadKey('ssh-rsa ' . base64_encode($key_blob) . ' ' . $key_comment); + $key->loadKey($key_str); break; case 'ssh-dss': // not currently supported @@ -273,7 +274,6 @@ class Agent * * @param string $data * @return data from SSH Agent - * @throws \RuntimeException on connection errors * @access private */ function _forward_data($data) @@ -292,7 +292,7 @@ class Agent } if (strlen($this->socket_buffer) != fwrite($this->fsock, $this->socket_buffer)) { - throw new \RuntimeException('Connection closed attempting to forward data to SSH agent'); + user_error('Connection closed attempting to forward data to SSH agent'); } $this->socket_buffer = ''; diff --git a/inc/Exts/phpseclib/System/SSH/Agent/Identity.php b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php similarity index 87% rename from inc/Exts/phpseclib/System/SSH/Agent/Identity.php rename to vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php index 42a4dae2..b8cc6cde 100644 --- a/inc/Exts/phpseclib/System/SSH/Agent/Identity.php +++ b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php @@ -23,9 +23,8 @@ use phpseclib\System\SSH\Agent; * Instantiation should only be performed by \phpseclib\System\SSH\Agent class. * This could be thought of as implementing an interface that phpseclib\Crypt\RSA * implements. ie. maybe a Net_SSH_Auth_PublicKey interface or something. - * The methods in this interface would be getPublicKey, setSignatureMode - * and sign since those are the methods phpseclib looks for to perform - * public key authentication. + * The methods in this interface would be getPublicKey and sign since those are the + * methods phpseclib looks for to perform public key authentication. * * @package SSH\Agent * @author Jim Wigginton