Changeset 5962

Timestamp:

05/17/08 17:37:46 (8 months ago)

Author:

coolengineer

Message:

• #960, stat callback 추가
  

Files:

• trunk/components/Needlworks.Mail.Pop3.php (modified) (7 diffs)

trunk/components/Needlworks.Mail.Pop3.php

@@ -11 +11 @@
         $this->uidl_filter = null;
         $this->size_filter = null;
+        $this->stat_callback = null;
         $this->retr_callback = null;
         $this->mails = array();
@@ -31 +32 @@
         $this->ctx = fsockopen( $bSSL ? "ssl://$server" : $server, $port); 
         if( !$this->ctx ) {
-            $this->log( "Connect failed: $server:$port" );
             return false;
         }
@@ -126 +126 @@
     }
 
+    function setStatCallback( $func )
+    {
+        $this->stat_callback =& $func;
+    }
+
     function setRetrCallback( $func )
     {
@@ -152 +157 @@
             list( $number, $uid ) = split( " ", $line );
             if( !empty($this->filterred[$number]) ) {
-                $this->log( "Msg $number: Already filterred" );
                 continue;
             }
-            if( $this->uidl_filter && call_user_func($this->uidl_filter, $uid) ) {
-                $this->log( "Msg $number: Filterred by uid: $uid" );
+            if( $this->uidl_filter && call_user_func($this->uidl_filter, $uid, $number) ) {
                 $this->filterred[$number] = true;
                 continue;
@@ -177 +180 @@
         }
         list( $total, $totalsize ) = split( " ", $this->status );
+        if( $this->stat_callback ) {
+            if( !call_user_func( $this->stat_callback, $total, $totalsize ) ) {
+                return false;
+            }
+        }
+
+        if( $total == 0 ) {
+            return false;
+        }
 
         $this->log( "Send: LIST" );
@@ -188 +200 @@
             list( $number, $size ) = split( " ", $line );
             if( !empty($this->filterred[$number]) ) {
-                $this->log( "Msg $number: Already filterred" );
                 continue;
             }
             if( $this->size_filter && call_user_func($this->size_filter, $size, $number, $total) ) {
-                $this->log( "Msg $number: Filterred by size: $size" );
                 if( isset( $this->uids[$number] ) ) {
                     unset( $this->mails[$this->uids[$number]] );
@@ -221 +231 @@
         $count = 1000000; /* Maximum 1000000 lines! it's enough to handle 6MB bytes */
         $line = fgets($this->ctx, 1024); 
-        $this->log( "Recv: $line" );
+        $this->log( "Recv: ".trim($line) );
         if( !$line ) {
             return false;