[telaen-cvs] SF.net SVN: telaen:[535] trunk/telaen/inc/class/class.telaen_mail.php

[<ji...@us...>]

Revision: 535
          http://telaen.svn.sourceforge.net/telaen/?rev=535&view=rev
Author:   jimjag
Date:     2010-05-04 18:08:44 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Requires this var

Modified Paths:
--------------
    trunk/telaen/inc/class/class.telaen_mail.php

Modified: trunk/telaen/inc/class/class.telaen_mail.php
===================================================================
--- trunk/telaen/inc/class/class.telaen_mail.php	2010-05-04 17:53:36 UTC (rev 534)
+++ trunk/telaen/inc/class/class.telaen_mail.php	2010-05-04 18:08:44 UTC (rev 535)
@@ -630,11 +630,7 @@
 
 			if(substr($buffer, 0, 3) != "+OK")	{
 				$this->mail_error_msg = $buffer;
-				$myreturnarray = Array();
-				$myreturnarray[0] = Array(); 
-				$myreturnarray[1] = Array();
-				$myreturnarray[2] = -1;
-				return $myreturnarray;
+				return -1;
 			}
 
 			$counter = 0;
@@ -827,6 +823,7 @@
 
 			$d->close();
 		}
+		$messages[] = $fetched_part;
 		return $messages;
 	}
 
@@ -840,6 +837,9 @@
 	 */
 	function mail_list_msgs($boxname = "INBOX", $localmessages = Array()) {
 
+		global $userfolder;
+		$fetched_part = 0;
+
 		if($this->mail_protocol == "imap") {
 			$messages = $this->_mail_list_msgs_imap($boxname, $localmessages);
 		} else {
@@ -851,6 +851,7 @@
 				$myreturnarray[2] = $messages;
 				return $myreturnarray; 
 			}
+			$fetched_part = array_pop($messages);
 		}
 		/* 
 		 * OK, now we have the message list, that contains id, size and header
@@ -865,7 +866,7 @@
 		for($i=0;$i<count($messages);$i++) {
 			$mail_info = $this->get_mail_info($messages[$i]["header"]);
 
-			$havespam = 0;
+			$havespam = false;
 			$spamsubject = $mail_info["subject"];
 			$xspamlevel = $mail_info["x-spam-level"];
 			/*
@@ -877,7 +878,7 @@
 				(strtoupper($boxname) == "INBOX" || strtoupper($boxname) == "SPAM") ) {
 				foreach ($this->_spamregex as $spamregex) {
 					if (preg_match("/$spamregex/i",$spamsubject)) {
-						$havespam = 1;
+						$havespam = true;
 						$this->havespam = "TRUE";
 						break;
 					}
@@ -885,7 +886,7 @@
 				if ($this->userspamlevel) {
 					preg_match('|[*+]+|', $xspamlevel, $matches);
 					if (strlen($matches[0]) >= $this->userspamlevel) {
-						$havespam = 1;
+						$havespam = true;
 						$this->havespam = "TRUE";						
 					}
 				}


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