"XXS-yourself" fixes

[squirrelmail.git] / plugins / mail_fetch / class.POP3.php

diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php
index ba8cd77b613e74e19409c6ec417f2422601c5ae3..1edd8763c1db453357bf35f01726d30b25d3e217 100644 (file)
--- a/plugins/mail_fetch/class.POP3.php
+++ b/plugins/mail_fetch/class.POP3.php
@@ -1,14 +1,23 @@
-<?
-
-/*
-    class.POP3.php3 v1.0    99/03/24 CDI cdi@thewebmasters.net
-    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.
-*/
+<?php 
+
+   /**
+    * mail_fetch/setup.php
+    *
+    * Copyright (c) 1999-2003 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.
+    *
+    * pop3 class
+    *
+    * $Id$
+    */
 
 class POP3 {
-    var $ERROR      = "";       //  Error string.
+    var $ERROR      = '';       //  Error string.
 
     var $TIMEOUT    = 60;       //  Default timeout before giving up on a
                                 //  network operation.
@@ -19,26 +28,23 @@ class POP3 {
                                 //  Per RFC 1939 the returned line a POP3
                                 //  server can send is 512 bytes.
 
-    var $FP         = "";       //  The connection to the server's
+    var $FP         = '';       //  The connection to the server's
                                 //  file descriptor
 
-    var $MAILSERVER = "";       // Set this to hard code the server name
+    var $MAILSERVER = '';       // Set this to hard code the server name
 
-    var $DEBUG      = false;    // set to true to echo pop3
+    var $DEBUG      = FALSE;    // set to true to echo pop3
                                 // commands and responses to error_log
                                 // this WILL log passwords!
 
-    var $BANNER     = "";       //  Holds the banner returned by the
+    var $BANNER     = '';       //  Holds the banner returned by the
                                 //  pop server - used for apop()
 
-    var $RFC1939    = true;     //  Set by noop(). See rfc1939.txt
-                                //
-
-    var $ALLOWAPOP  = false;    //  Allow or disallow apop()
+    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
                                 //  This must be set to true
                                 //  manually
 
-    function POP3 ( $server = "", $timeout = "" ) {
+    function POP3 ( $server = '', $timeout = '' ) {
         settype($this->BUFFER,"integer");
         if( !empty($server) ) {
             // Do not allow programs to alter MAILSERVER
@@ -65,7 +71,8 @@ class POP3 {
         //  port defaults to 110. Returns true on success, false on fail
 
         // If MAILSERVER is set, override $server with it's value
-
+       
+       if (!isset($port) || !$port) {$port = 110;}
         if(!empty($this->MAILSERVER))
             $server = $this->MAILSERVER;
 
@@ -96,13 +103,7 @@ class POP3 {
         }
         $this->FP = $fp;
         $this->BANNER = $this->parse_banner($reply);
-        $this->RFC1939 = $this->noop();
-        if($this->RFC1939) {
-            $this->ERROR = _("POP3: premature NOOP OK, NOT an RFC 1939 Compliant server");
-            $this->quit();
-            return false;
-        } else
-            return true;
+        return true;
     }
 
     function noop () {
@@ -156,13 +157,7 @@ class POP3 {
                 //  Auth successful.
                 $count = $this->last("count");
                 $this->COUNT = $count;
-                $this->RFC1939 = $this->noop();
-                if(!$this->RFC1939) {
-                    $this->ERROR = _("POP3 pass:") . ' ' . _("NOOP failed. Server not RFC 1939 compliant");
-                    $this->quit();
-                    return false;
-                } else
-                    return $count;
+                return $count;
             }
         }
     }
@@ -205,13 +200,7 @@ class POP3 {
                     //  Auth successful.
                     $count = $this->last("count");
                     $this->COUNT = $count;
-                    $this->RFC1939 = $this->noop();
-                    if(!$this->RFC1939) {
-                        $this->ERROR = _("POP3 apop:") . ' ' . _("NOOP failed. Server not RFC 1939 compliant");
-                        $this->quit();
-                        return false;
-                    } else
-                        return $count;
+                    return $count;
                 }
             }
         }
@@ -583,7 +572,7 @@ class POP3 {
                 }
                 else
                 {
-                    $UIDLArray[$count] = "deleted";
+                    $UIDLArray[$count] = 'deleted';
                 }
                 $count++;
                 $line = fgets($fp,$buffer);