Changes from trunk/wp-includes/class-pop3.php at r17677 to branches/3.1/wp-includes/class-pop3.php at r17436

File:

• branches/3.1/wp-includes/class-pop3.php (modified) (9 diffs)

branches/3.1/wp-includes/class-pop3.php

@@ -3 +3 @@
  * mail_fetch/setup.php
  *
- * Copyright (c) 1999-2011 CDI (cdi@thewebmasters.net) All Rights Reserved
- * Modified by Philippe Mingo 2001-2009 mingo@rotedic.com
+ * @package SquirrelMail
+ *
+ * @copyright (c) 1999-2006 The SquirrelMail Project Team
+ *
+ * @copyright (c) 1999 CDI (cdi@thewebmasters.net) All Rights Reserved
+ * Modified by Philippe Mingo 2001 mingo@rotedic.com
  * An RFC 1939 compliant wrapper class for the POP3 protocol.
  *
  * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
  *
- * POP3 class
+ * pop3 class
  *
- * @copyright 1999-2011 The SquirrelMail Project Team
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @package plugins
- * @subpackage mail_fetch
+ * $Id$
  */
 
@@ -75 +77 @@
         // If MAILSERVER is set, override $server with it's value
 
-    if (!isset($port) || !$port) {$port = 110;}
+    if (!isset($port) || !$port) {$port = 110;}
         if(!empty($this->MAILSERVER))
             $server = $this->MAILSERVER;
@@ -252 +254 @@
 
         $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
+        while ( !ereg("^\.\r\n",$line))
         {
             $MsgArray[$count] = $line;
@@ -319 +321 @@
             $line = fgets($fp,$this->BUFFER);
             $line = $this->strip_clf($line);
-            if(strpos($line, '.') === 0)
+            if(ereg("^\.",$line))
             {
                 $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
@@ -365 +367 @@
 
         $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
-        {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
+        while ( !ereg("^\.\r\n",$line))
+        {
+            if ( $line[0] == '.' ) { $line = substr($line,1); }
             $MsgArray[$count] = $line;
             $count++;
@@ -553 +555 @@
             $count = 1;
             $line = fgets($fp,$buffer);
-            while ( !preg_match('/^\.\r\n/',$line)) {
+            while ( !ereg("^\.\r\n",$line)) {
+                if(ereg("^\.\r\n",$line)) {
+                    break;
+                }
                 list ($msg,$msgUidl) = preg_split('/\s+/',$line);
                 $msgUidl = $this->strip_clf($msgUidl);
@@ -603 +608 @@
             return false;
         else
-            return( stripos($cmd, '+OK') !== false );
+            return( ereg ("^\+OK", $cmd ) );
     }
 
@@ -612 +617 @@
             return $text;
         else {
-            $stripped = str_replace(array("\r","\n"),'',$text);
+            $stripped = str_replace("\r",'',$text);
+            $stripped = str_replace("\n",'',$stripped);
             return $stripped;
         }
@@ -644 +650 @@
 
 }   // End class
-
-// For php4 compatibility
-if (!function_exists("stripos")) {
-    function stripos($haystack, $needle){
-        return strpos($haystack, stristr( $haystack, $needle ));
-    }
-}
+?>