[phpwiki-checkins] SF.net SVN: phpwiki:[9789] trunk/lib

[<var...@us...>]

Revision: 9789
          http://sourceforge.net/p/phpwiki/code/9789
Author:   vargenau
Date:     2016-02-10 17:34:26 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
eregi_replace --> preg_replace; ereg --> preg_match

Modified Paths:
--------------
    trunk/lib/Request.php
    trunk/lib/WikiUser.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016-02-10 17:21:47 UTC (rev 9788)
+++ trunk/lib/Request.php	2016-02-10 17:34:26 UTC (rev 9789)
@@ -754,7 +754,7 @@
                 }
                 $tmp_file .= '/' . basename($fileinfo['tmp_name']);
                 /* ending slash in php.ini upload_tmp_dir is required. */
-                if (realpath(ereg_replace('/+', '/', $tmp_file)) != realpath($fileinfo['tmp_name'])) {
+                if (realpath(preg_replace('#/+#', '/', $tmp_file)) != realpath($fileinfo['tmp_name'])) {
                     trigger_error(sprintf("Uploaded tmpfile illegal: %s != %s.", $tmp_file, $fileinfo['tmp_name']) .
                             "\n" .
                             "Probably illegal TEMP environment or upload_tmp_dir setting. " .

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-02-10 17:21:47 UTC (rev 9788)
+++ trunk/lib/WikiUser.php	2016-02-10 17:34:26 UTC (rev 9789)
@@ -1896,7 +1896,7 @@
     }
     $Connect = @fsockopen($ConnectAddress, 25);
     if ($Connect) {
-        if (ereg("^220", $Out = fgets($Connect, 1024))) {
+        if (preg_match("/^220/", $Out = fgets($Connect, 1024))) {
             fputs($Connect, "HELO $HTTP_HOST\r\n");
             $Out = fgets($Connect, 1024);
             fputs($Connect, "MAIL FROM: <" . $email . ">\r\n");
@@ -1905,12 +1905,12 @@
             $To = fgets($Connect, 1024);
             fputs($Connect, "QUIT\r\n");
             fclose($Connect);
-            if (!ereg("^250", $From)) {
+            if (!preg_match("/^250/", $From)) {
                 $result[0] = false;
                 $result[1] = "Server rejected address: " . $From;
                 return $result;
             }
-            if (!ereg("^250", $To)) {
+            if (!preg_match("/^250/", $To)) {
                 $result[0] = false;
                 $result[1] = "Server rejected address: " . $To;
                 return $result;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.