Allow more precise description of the read/unread messages through a

[banana.git] / banana / nntpcore.inc.php

diff --git a/banana/nntpcore.inc.php b/banana/nntpcore.inc.php
index f1cf460..80322ad 100644 (file)
--- a/banana/nntpcore.inc.php
+++ b/banana/nntpcore.inc.php
@@ -50,7 +50,7 @@ class BananaNNTPCore
         }
 
         $this->checkState();
-        $this->posting = ($this->lastresultcode == '200'); 
+        $this->posting = ($this->lastresultcode == '200');
         if ($reader && $this->posting) {
             $this->execLine('MODE READER');
             $this->posting = ($this->lastresultcode == '200');
@@ -79,7 +79,11 @@ class BananaNNTPCore
 
     public function lastError()
     {
-        return $this->lasterrortext;
+        if (!is_utf8($this->lasterrortext)) {
+            return utf8_encode($this->lasterrortext);
+        } else {
+            return $this->lasterrortext;
+        }
     }
 
     public function backtrace()
@@ -96,34 +100,25 @@ class BananaNNTPCore
     /** get a line from server
      * @return STRING 
      */
-    private function getLine()
+    private function &getLine()
     {
-        return rtrim(fgets($this->ns, 1200));
+        $data = rtrim(@fgets($this->ns, 1200), "\r\n");
+        return $data;
     }
 
     /** fetch data (and on delimitor)
      * @param STRING $delim string indicating and of transmission
      */
-    private function fetchResult($callback = null)
+    private function &fetchResult()
     {
         $array = Array();
-        while (($result = $this->getLine()) != '.') {
-            if (!is_null($callback)) {
-                list($key, $result) = call_user_func($callback, $result);
-                if (is_null($result)) {
-                    continue;
-                }
-                if (is_null($key)) {
-                    $array[] = $result;
-                } else {
-                    $array[$key] = $result;
-                }
-            } else {
-                $array[] = $result;
-            }
+        while (($result =& $this->getLine()) != '.') {
+            $array[] =& $result;
         }
         if ($this->debug && $this->bt) {
-            $this->bt[count($this->bt) - 1]['response'] = count($array);
+            $trace =& $this->bt[count($this->bt) - 1];
+            $trace['response'] = count($array);
+            $trace['time']     = microtime(true) - $trace['start'];
         }
         return $array;
     }
@@ -139,9 +134,9 @@ class BananaNNTPCore
         }
         if ($this->debug) {
             $db_line = preg_replace('/PASS .*/', 'PASS *******', $line);
-            $this->bt[] = array('action' => $db_line, 'time' => microtime(true));
+            $this->bt[] = array('action' => $db_line, 'start' => microtime(true));
         }
-        return fputs($this->ns, $line, strlen($line));
+        return @fputs($this->ns, $line, strlen($line));
     }
 
     /** put a message (multiline)
@@ -180,7 +175,7 @@ class BananaNNTPCore
         $this->lastresulttext = substr($result, 4);
         if ($this->debug && $this->bt) {
             $trace =& $this->bt[count($this->bt) - 1];
-            $trace['time']     = microtime(true) - $trace['time'];
+            $trace['time']     = microtime(true) - $trace['start'];
             $trace['code']     = $this->lastresultcode;
             $trace['message']  = $this->lastresulttext;
             $trace['response'] = 0;
@@ -203,7 +198,7 @@ class BananaNNTPCore
      * @param $pass INTEGER password
      * @return BOOLEAN true if authentication was successful
      */
-    protected function authinfo($user, $pass)
+    public function authinfo($user, $pass)
     {
         if ($this->execLine("AUTHINFO USER $user", false)) {
             return $this->execline("AUTHINFO PASS $pass");
@@ -221,7 +216,7 @@ class BananaNNTPCore
      * @see body
      * @see head
      */
-    protected function article($msgid = "")
+    public function article($msgid = "")
     {
         if (!$this->execLine("ARTICLE $msgid")) {
             return false;
@@ -234,7 +229,7 @@ class BananaNNTPCore
      * @param $_message STRING message to post
      * @return STRING MSGID of article 
      */
-    protected function post($message)
+    public function post($message)
     {
         if (!$this->execLine("POST ", false)) {
             return false;
@@ -256,7 +251,7 @@ class BananaNNTPCore
      * @see article
      * @see head
      */
-    protected function body($msgid = '')
+    public function body($msgid = '')
     {
         if ($this->execLine("BODY $msgid")) {
             return false;
@@ -271,7 +266,7 @@ class BananaNNTPCore
      * @see article
      * @see body
      */
-    protected function head($msgid = '')
+    public function head($msgid = '')
     {
         if (!$this->execLine("HEAD $msgid")) {
             return false;
@@ -283,7 +278,7 @@ class BananaNNTPCore
      * @param $_group STRING 
      * @return ARRAY array : nb of articles in group, MSGNUM of first article, MSGNUM of last article, and group name
      */
-    protected function group($group)
+    public function group($group)
     {
         if (!$this->execLine("GROUP $group")) {
             return false;
@@ -299,7 +294,7 @@ class BananaNNTPCore
      * @return STRING MSGID of article
      * @see next
      */
-    protected function last()
+    public function last()
     {
         if (!$this->execLine("LAST ")) {
             return false;
@@ -315,7 +310,7 @@ class BananaNNTPCore
      * @see last
      */
 
-    protected function next()
+    public function next()
     {
         if (!$this->execLine('NEXT ')) {
             return false;
@@ -332,7 +327,7 @@ class BananaNNTPCore
      * @see article
      * @see body
      */
-    protected function nntpstat($msgid)
+    public function nntpstat($msgid)
     {
         if (!$this->execLine("STAT $msgid")) {
             return false;
@@ -363,7 +358,7 @@ class BananaNNTPCore
      * @return ARRAY group name => (MSGNUM of first article, MSGNUM of last article, NNTP flags)
      * @see newgroups
      */
-    protected function listGroups()
+    public function listGroups()
     {
         if (!$this->execLine('LIST')) {
             return false;
@@ -386,14 +381,14 @@ class BananaNNTPCore
      * @return ARRAY same format as liste
      * @see liste
      */
-    protected function newgroups($since, $distributions = '')
+    public function newgroups($since, $distributions = '')
     {
         if (!($since = $this->formatDate($since))) {
             return false;
         }
         if (!$this->execLine("NEWGROUPS $since $distributions")) {
             return false;
-        }    
+        }
         return $this->filterGroups();
     }
 
@@ -402,7 +397,7 @@ class BananaNNTPCore
      * @parma $_groups STRING pattern of intersting groups 
      * @return ARRAY MSGID of new articles
      */
-    protected function newnews($groups = '*', $since = 0, $distributions = '')
+    public function newnews($groups = '*', $since = 0, $distributions = '')
     {
         if (!($since = $this->formatDate($since))) {
             return false;
@@ -416,7 +411,7 @@ class BananaNNTPCore
     /** Tell the remote server that I am not a user client, but probably another news server
      * @return BOOLEAN true if sucessful
      */
-    protected function slave()
+    public function slave()
     {
         return $this->execLine("SLAVE ");
     }
@@ -426,7 +421,7 @@ class BananaNNTPCore
      * @param $_message STRING article
      * @return BOOLEAN 
      */
-    protected function ihave($msgid, $message = false)
+    public function ihave($msgid, $message = false)
     {
         if (!$this->execLine("IHAVE $msgid ")) {
             return false;
@@ -436,7 +431,7 @@ class BananaNNTPCore
 
     /** closes connection to server
      */
-    protected function quit()
+    public function quit()
     {
         $this->execLine('QUIT');
         fclose($this->ns);
@@ -450,7 +445,7 @@ class BananaNNTPCore
      * @return INTEGER timestamp 
      */
 
-    protected function date()
+    public function date()
     {
         if (!$this->execLine('DATE ', false)) {
             return false;
@@ -466,15 +461,15 @@ class BananaNNTPCore
      * @return ARRAY group name => description
      */
 
-    protected function xgtitle($pattern = '*')
+    public function xgtitle($pattern = '*')
     {
         if (!$this->execLine("XGTITLE $pattern ")) {
             return false;
         }
-        $array  = $this->fetchResult();
+        $array  =& $this->fetchResult();
         $groups = array();
-        foreach ($array as $result) {
-            list($group, $desc) = split("[ \t]", $result, 2);
+        foreach ($array as &$result) {
+            @list($group, $desc) = preg_split('/[ \t]/', $result, 2);
             $groups[$group] = $desc;
         }
         return $groups;
@@ -485,7 +480,7 @@ class BananaNNTPCore
      * @param $_range STRING range of articles 
      * @return ARRAY MSGNUM => header value
      */
-    protected function xhdr($hdr, $first = null, $last = null)
+    public function xhdr($hdr, $first = null, $last = null)
     {
         if (is_null($first) && is_null($last)) {
             $range = "";
@@ -495,7 +490,7 @@ class BananaNNTPCore
         if (!$this->execLine("XHDR $hdr $range ")) {
             return false;
         }
-        $array   = $this->fetchResult();
+        $array   =& $this->fetchResult();
         $headers = array();
         foreach ($array as &$result) {
             @list($head, $value) = explode(' ', $result, 2);
@@ -510,12 +505,12 @@ class BananaNNTPCore
      * @param $_pat STRING pattern
      * @return ARRAY MSGNUM => header value
      */
-    protected function xpat($_hdr, $_range, $_pat)
+    public function xpat($_hdr, $_range, $_pat)
     {
         if (!$this->execLine("XPAT $hdr $range $pat")) {
             return false;
         }
-        $array   = $this->fetchResult();
+        $array   =& $this->fetchResult();
         $headers = array();
         foreach ($array as &$result) {
             list($head, $value) = explode(' ', $result, 2);