diff --git a/library/contrib/phpmailer/class.phpmailer.php b/library/contrib/phpmailer/class.phpmailer.php index 0357eac3a..81099e595 100644 --- a/library/contrib/phpmailer/class.phpmailer.php +++ b/library/contrib/phpmailer/class.phpmailer.php @@ -577,7 +577,8 @@ function SmtpConnect() { /* Retry while there is no connection */ while($index < count($hosts) && $connection == false) { $hostinfo = array(); - if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) { + #if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) { + if(preg_match("/^(.+):([0-9]+)$/i", $hosts[$index], $hostinfo)) { $host = $hostinfo[1]; $port = $hostinfo[2]; } else { diff --git a/library/contrib/phpxpath/XPath.class.php b/library/contrib/phpxpath/XPath.class.php index d7dd47b63..b7cca8da0 100644 --- a/library/contrib/phpxpath/XPath.class.php +++ b/library/contrib/phpxpath/XPath.class.php @@ -10,7 +10,7 @@ * | What Is XPath: * | -------------- * | - "What SQL is for a relational database, XPath is for an XML document." -- Sam Blum - * | - "The primary purpose of XPath is to address parts of an XML document. In support of this + * | - "The primary purpose of XPath is to address parts of an XML document. In support of this * | primary purpose, it also provides basic facilities for manipulting it." -- W3C * | * | XPath in action and a very nice intro is under: @@ -4456,7 +4456,8 @@ function _handleFunction_starts_with($arguments, $context) { $first = $this->_handleFunction_string($first, $context); $second = $this->_handleFunction_string($second, $context); // Check whether the first string starts with the second one. - return (bool) ereg('^'.$second, $first); + #return (bool) ereg('^'.$second, $first); + return (bool) preg_match("/^".$second."/", $first); } /** @@ -4713,7 +4714,8 @@ function _handleFunction_lang($arguments, $context) { // Check whether the node has an language attribute. if (isSet($currentNode['attributes']['xml:lang'])) { // Check whether it's the language, the user asks for; if so return TRUE else FALSE - return eregi('^'.$arguments, $currentNode['attributes']['xml:lang']); + #return eregi('^'.$arguments, $currentNode['attributes']['xml:lang']); + return preg_match("/^".$arguments."/i", $currentNode['attributes']['xml:lang']); } $currentNode = $currentNode['parentNode']; // Move up to parent } // End while diff --git a/setup.php b/setup.php index fc84f1018..7ca470993 100644 --- a/setup.php +++ b/setup.php @@ -479,10 +479,6 @@ function suggestDefaultPort(db) { count dechex dir -ereg -ereg_replace -eregi -eregi_replace explode fclose feof