private $_lasterrno = 0;
private $_lasterror = null;
-
+
public function __construct()
{
$this->debug = Banana::$debug_mbox;
}
-
+
public function isValid()
{
return true;
//!Banana::$group || $this->file;
}
-
+
/** Indicate last error n°
*/
public function lastErrNo()
{
return $this->_lasterrno;;
}
-
+
/** Indicate last error text
*/
public function lastError()
{
$message = null;
if (!is_numeric($id)) {
- if (!Banana::$spool) {
+ if (!Banana::$spool) {
return $message;
}
- $id = Banana::$spool->ids[$id];
+ $id = Banana::$spool->ids[$id]->id;
}
$options = array ('-m ' . $id);
$this->getMBoxPosition($options, $id);
$messages =& $this->getRawMessage($id);
if ($messages) {
$messages = new BananaMessage($messages);
+ } else {
+ $messages = null;
}
- return $messages;
+ return $messages;
}
/** Return the sources of the given message
*/
public function getMessageSource($id)
- {
+ {
$message =& $this->getRawMessage($id);
if ($message) {
- $message = implode("\n", $message);
+ $message = implode("\n", $message);
}
return $message;
- }
+ }
/** Compute the number of messages of the box
*/
private function getCount()
{
$options = array();
- if (@filesize($this->getFileName()) == Banana::$spool->storage['size']) {
- return max(Banana::$spool->ids);
- }
+ if (@filesize($this->getFileName()) == @Banana::$spool->storage['size']) {
+ return max(array_keys(Banana::$spool->overview)) + 1;
+ }
$this->getMBoxPosition($options);
$val =& $this->callHelper('-c', $options);
if (!$val) {
return $headers;
}
$headers = array();
- while ($lines) {
- $id = array_shift($lines);
- if ($id === '') {
- continue;
- }
- $offset = array_shift($lines);
- if ($offset === '') {
- continue;
- }
- $id = intval($id);
- $headers[$id] = array('beginning' => intval($offset));
- while (true) {
- $hname = array_shift($lines);
- if ($hname === '') {
- break;
- }
- $hval = array_shift($lines);
- if ($hname == 'date') {
- $headers[$id][$hname] = @strtotime($hval);
- } else {
- $headers[$id][$hname] = $hval;
+ $in_message = false;
+ $get_pos = true;
+ $hname = null;
+ foreach ($lines as $key=>&$line) {
+ if (!$in_message) {
+ if (!empty($line)) {
+ $id = intval($line);
+ $in_message = true;
+ $get_pos = true;
}
+ } elseif ($get_pos) {
+ $headers[$id] = array('beginning' => intval($line));
+ $get_pos = false;
+ } elseif (empty($line) && empty($hname)) {
+ $in_message = false;
+ } elseif (empty($hname)) {
+ $hname = $line;
+ } elseif ($hname == 'date') {
+ $headers[$id][$hname] = @strtotime($line);
+ $hname = null;
+ } else {
+ BananaMimePart::decodeHeader($line, $hname);
+ $headers[$id][$hname] = $line;
+ $hname = null;
}
+ unset($lines[$key]);
}
- array_walk_recursive($headers, array('BananaMimePart', 'decodeHeader'));
return $headers;
}
return array();
}
if (is_null($this->new_messages)) {
- $this->getCount();
+ $this->getCount();
}
return range($this->count - $this->new_messages, $this->count - 1);
}
/** Send a message
* @return true if it was successfull
*/
- public function send(BananaMessage &$message)
+ public function send(BananaMessage $message)
{
$headers = $message->getHeaders();
$to = $headers['To'];
foreach ($headers as $key=>$value) {
if (!empty($value)) {
$hdrs .= "$key: $value\r\n";
- }
+ }
}
$body = $message->get(false);
return mail($to, $subject, $body, $hdrs);
/** Cancel a message
* @return true if it was successfull
*/
- public function cancel(BananaMessage &$message)
+ public function cancel(BananaMessage $message)
{
return false;
}
#######
# MBox parser
#######
-
+
/** Add the '-p' optioin for callHelper
*/
private function getMBoxPosition(array &$options, $id = null)
{
- if (Banana::$spool->overview) {
+ if (Banana::$spool && Banana::$spool->overview) {
if (!is_null($id) && isset(Banana::$spool->overview[$id])) {
$key = $id;
} else {
- $key = max(Banana::$spool->ids);
+ $key = max(array_keys(Banana::$spool->overview));
if (!is_null($id) && $key >= $id) {
return;
}
}
- if (isset(Banana::$spool->overview[$key]->storage['offset'])) {
+ if (isset(Banana::$spool->overview[$key]->storage['offset'])) {
$options[] = '-p ' . $key . ':' . Banana::$spool->overview[$key]->storage['offset'];
}
}