require_once dirname(__FILE__) . '/banana.inc.php';
-define('BANANA_SPOOL_VERSION', '0.5.9');
+define('BANANA_SPOOL_VERSION', '0.5.12');
/** Class spoolhead
* class used in thread overviews
*/
class BananaSpoolHead
{
+ public $id;
+ public $msgid;
+
/** date (timestamp) */
public $date;
/** subject */
public $color;
/** reference of parent */
public $parent = null;
- /** paren is direct */
- public $parent_direct;
/** array of children */
public $children = Array();
/** true if post is read */
* @param $_read BOOLEAN true if read
* @param $_descunread INTEGER descunread value (0 for a new post)
*/
- public function __construct(array &$message)
+ public function __construct($id, array &$message)
{
+ $this->id = $id;
+ $this->msgid = @$message['message-id'];
$this->date = $message['date'];
- $this->subject = $message['subject'];
+ $this->subject = @$message['subject'];
$this->from = $message['from'];
$this->color = sprintf('#%06x', abs(crc32($this->from) % 0xffffff));
$this->desc = 1;
/** group name */
public $group;
/** spool */
- public $overview;
+ public $overview = array();
/** array msgid => msgnum */
- public $ids;
+ public $ids = array();
/** thread starts */
- public $roots;
+ public $roots = array();
/** thread trees (one tree per root node) */
- public $trees = array();
+ public $trees = array();
/** protocole specific data */
public $storage = array();
return $spool;
}
- private function compare($a, $b)
+ private function compare(&$a, &$b)
{
- return ($this->overview[$b]->date >= $this->overview[$a]->date);
+ return ($b->date - $a->date);
}
private function saveToFile()
$file = BananaSpool::spoolFilename($this->group);
$this->roots = Array();
- foreach($this->overview as $id=>&$msg) {
+ foreach($this->overview as &$msg) {
if (is_null($msg->parent)) {
- $this->roots[] = $id;
+ $this->roots[] =& $msg;
}
}
usort($this->roots, array($this, 'compare'));
private function clean(&$first, &$last, $msgnum)
{
$do_save = false;
- if (is_array($this->overview)) {
+ if (!empty($this->overview)) {
$mids = array_keys($this->overview);
foreach ($mids as $id) {
if (($first <= $last && ($id < $first || $id > $last))
$messages =& Banana::$protocole->getMessageHeaders($first, $last,
array('Date', 'Subject', 'From', 'Message-ID', 'References', 'In-Reply-To'));
- if (!is_array($this->ids)) {
- $this->ids = array();
- }
+ // Build all the new Spool Heads
foreach ($messages as $id=>&$message) {
- $this->ids[$message['message-id']] = $id;
+ if (!isset($this->overview[$id])) {
+ $this->overview[$id] = new BananaSpoolHead($id, $message);
+ $head =& $this->overview[$id];
+ $this->ids[$head->msgid] =& $head;
+ }
}
- if (!is_array($this->overview)) {
- $this->overview = array();
- }
+ // Build tree
$updateTrees = array();
+ $null = null;
foreach ($messages as $id=>&$message) {
- if (!isset($this->overview[$id])) {
- $this->overview[$id] = new BananaSpoolHead($message);
- }
- $msg =& $this->overview[$id];
- $msgrefs = BananaMessage::formatReferences($message);
- $parents = preg_grep('/^\d+$/', $msgrefs);
- $msg->parent = array_pop($parents);
- $msg->parent_direct = preg_match('/^\d+$/', array_pop($msgrefs));
-
- if (!is_null($p = $msg->parent)) {
- if (empty($this->overview[$p])) {
- $this->overview[$p] = new BananaSpoolHead($messages[$p]);
- }
- $this->overview[$p]->children[] = $id;
- while (!is_null($p)) {
- $this->overview[$p]->desc += $msg->desc;
- $prev = $p;
- if ($p != $this->overview[$p]->parent) {
- $p = $this->overview[$p]->parent;
+ $msg =& $this->overview[$id];
+ $parents =& $this->getReferences($message);
+ while (!empty($parents) && ($msg->parent === $msg || is_null($msg->parent))) {
+ @$msg->parent =& array_pop($parents);
+ }
+
+ if (!is_null($msg->parent)) {
+ $parent =& $msg->parent;
+ $parent->children[] =& $msg;
+ while (!is_null($parent)) {
+ $parent->desc += $msg->desc;
+ $prev =& $parent;
+ if ($parent !== $parent->parent) {
+ $parent =& $parent->parent;
} else {
- $p = null;
- }
- if (is_null($p)) {
- $updateTrees[$prev] = true;
+ $parent =& $null;
}
}
+ $updateTrees[$prev->id] = true;
}
}
foreach ($updateTrees as $root=>$t) {
return;
}
- if (!is_array($this->ids)) {
- $this->ids = array();
- }
$newpostsids = array_intersect($newpostsids, array_keys($this->ids));
foreach ($newpostsids as $mid) {
- $id = $this->ids[$mid];
- if ($this->overview[$id]->isread) {
- $this->overview[$id]->isread = false;
- $this->unreadnb++;
- while (isset($id)) {
- $this->overview[$id]->descunread++;
- $id = $this->overview[$id]->parent;
+ $overview =& $this->ids[$mid];
+ if ($overview->isread) {
+ $overview->isread = false;
+ while (!is_null($overview)) {
+ $overview->descunread++;
+ $overview =& $overview->parent;
}
}
}
+ $this->unreadnb += count($newpostsids);
}
public function setMode($mode)
if ($this->overview[$num]->isread) {
break;
}
- foreach ($this->roots as $k=>$i) {
- if ($this->overview[$i]->descunread == 0) {
- $this->killdesc($i);
- unset($this->roots[$k]);
+ foreach ($this->roots as &$root) {
+ if ($root->descunread == 0) {
+ $this->killdesc($root->id);
}
}
break;
}
}
+ /** Fetch list of references
+ */
+ public function &getReferences(array &$refs)
+ {
+ $references = array();
+ if (isset($refs['references'])) {
+ $text = preg_split('/\s/', str_replace('><', '> <', $refs['references']));
+ foreach ($text as $id=>&$value) {
+ if (isset($this->ids[$value])) {
+ $references[] =& $this->ids[$value];
+ }
+ }
+ } elseif (isset($refs['in-reply-to']) && isset($this->ids[$refs['in-reply-to']])) {
+ $references[] =& $this->ids[$refs['in-reply-to']];
+ }
+ return $references;
+ }
+
/** Mark the given id as read
* @param id MSGNUM of post
*/
if (!$this->unreadnb) {
return;
}
- if (is_null($array) && is_array($this->roots)) {
+ if (is_null($array) && !empty($this->roots)) {
$array =& $this->roots;
} elseif (is_null($array)) {
return;
}
- foreach ($array as $id) {
- if (!$this->overview[$id]->isread) {
- $this->markAsRead($id);
+ foreach ($array as &$msg) {
+ if (!$msg->isread) {
+ $this->markAsRead($msg->id);
if (!$this->unreadnb) {
return;
}
}
- if ($this->overview[$id]->descunread) {
- $this->markAllAsRead($this->overview[$id]->children);
+ if ($msg->descunread) {
+ $this->markAllAsRead($msg->children);
}
}
}
*/
private function killdesc($_id)
{
- if (sizeof($this->overview[$_id]->children)) {
- foreach ($this->overview[$_id]->children as $c) {
- $this->killdesc($c);
+ $overview =& $this->overview[$_id];
+ $children =& $overview->children;
+ if (sizeof($children)) {
+ foreach ($children as &$c) {
+ $this->killdesc($c->id);
}
}
unset($this->overview[$_id]);
- if (($msgid = array_search($_id, $this->ids)) !== false) {
- unset($this->ids[$msgid]);
+ foreach ($this->roots as $k=>&$root) {
+ if ($root === $overview) {
+ unset($this->roots[$k]);
+ break;
+ }
}
+ unset($this->ids[$overview->msgid]);
+ unset($this->trees[$_id]);
+ $overview = null;
}
/** delete a post from overview
*/
public function delid($_id, $write = true)
{
- if (isset($this->overview[$_id])) {
- $overview =& $this->overview[$_id];
- if (!$overview->isread) {
- $this->markAsRead($_id);
- }
- if ($overview->parent) {
- $p = $overview->parent;
- $parent =& $this->overview[$p];
- $parent->children = array_diff($parent->children, array($_id));
- if (sizeof($overview->children)) {
- $parent->children = array_merge($parent->children, $overview->children);
- foreach ($overview->children as $c) {
- $this->overview[$c]->parent = $p;
- $this->overview[$c]->parent_direct = false;
- }
- }
- while (isset($p)) {
- $this->overview[$p]->desc--;
- $p = $this->overview[$p]->parent;
- }
- } elseif ($overview->children) {
- foreach ($overview->children as $c) {
- $this->overview[$c]->parent = null;
+ if (!isset($this->overview[$_id])) {
+ return;
+ }
+
+ $overview =& $this->overview[$_id];
+ // Be sure it is not counted as unread
+ if (!$overview->isread) {
+ $this->markAsRead($_id);
+ }
+
+ $parent =& $overview->parent;
+
+ // Remove from the message tree
+ if (!is_null($parent)) {
+ foreach ($parent->children as $key=>&$child) {
+ if ($child === $overview) {
+ unset($parent->children[$key]);
+ break;
}
}
- unset($overview);
- unset($this->overview[$_id]);
- unset($this->trees[$_id]);
- $msgid = array_search($_id, $this->ids);
- if ($msgid !== false) {
- unset($this->ids[$msgid]);
+ if (sizeof($overview->children)) {
+ $parent->children = array_merge($parent->children, $overview->children);
+ foreach ($overview->children as &$child) {
+ $child->parent =& $parent;
+ }
}
- $msgid = array_search($_id, $this->roots);
- if ($msgid !== false) {
- unset($this->roots[$msgid]);
+ while (!is_null($parent)) {
+ $parent->desc--;
+ $parent =& $parent->parent;
}
+ }
- if ($write) {
- $this->saveToFile();
+ // Remove all refenrences and assign null to the object
+ unset($this->ids[$overview->msgid]);
+ unset($this->overview[$_id]);
+ unset($this->trees[$_id]);
+ foreach ($this->roots as $k=>&$root) {
+ if ($root === $overview) {
+ unset($this->roots[$k]);
+ break;
}
}
+ $overview = null;
+
+ if ($write) {
+ $this->saveToFile();
+ }
}
- public function formatDate($stamp)
+ public function formatDate(BananaSpoolHead &$head)
{
+ $stamp = $head->date;
$today = intval(time() / (24*3600));
$dday = intval($stamp / (24*3600));
return strftime($format, $stamp);
}
- public function formatSubject($id, $subject)
+ public function formatSubject(BananaSpoolHead &$head)
{
- $subject = banana_html_entity_decode($subject);
+ $subject = $popup = $head->subject;
$popup = $subject;
if (function_exists('hook_formatDisplayHeader')) {
list($subject, $link) = hook_formatDisplayHeader('subject', $subject, true);
if (empty($subject)) {
$subject = _b_('(pas de sujet)');
}
- if ($id != Banana::$artid) {
- $subject = Banana::$page->makeLink(Array('group' => $this->group, 'artid' => $id,
+ if ($head->id != Banana::$artid) {
+ $subject = Banana::$page->makeLink(Array('group' => $this->group, 'artid' => $head->id,
'text' => $subject, 'popup' => $popup));
}
return $subject . $link;
}
- public function formatFrom($from)
+ public function formatFrom(BananaSpoolHead &$head)
{
- $from = banana_html_entity_decode($from);
- return BananaMessage::formatFrom($from);
+ return BananaMessage::formatFrom($head->from);
}
public function start()
}
- private function &_buildTree($id, BananaSpoolHead &$head) {
+ private function &_buildTree(BananaSpoolHead &$head) {
static $t_e, $u_h, $u_ht, $u_vt, $u_l, $u_f, $r_h, $r_ht, $r_vt, $r_l, $r_f;
if (!isset($spfx_f)) {
$t_e = Banana::$page->makeImg(Array('img' => 'e', 'alt' => ' ', 'height' => 18, 'width' => 14));
$r_f = Banana::$page->makeImg(Array('img' => 'f2r', 'alt' => 't', 'height' => 18, 'width' => 14));
}
$style = 'background-color:' . $head->color . '; text-decoration: none';
- $text = '<span style="' . $style . '" title="' . banana_entities($head->name . ', ' . $this->formatDate($head->date))
+ $text = '<span style="' . $style . '" title="' . banana_entities($head->name . ', ' . $this->formatDate($head))
. '"><input type="radio" name="banana_tree" '
. (Banana::$msgshow_javascript ? 'onchange="window.location=\'' .
- banana_entities(Banana::$page->makeURL(array('group' => $this->group, 'artid' => $id))) . '\'"'
+ banana_entities(Banana::$page->makeURL(array('group' => $this->group, 'artid' => $head->id))) . '\'"'
: ' disabled="disabled"')
. ' /></span>';
$array = array($text);
- foreach ($head->children as $key=>&$child) {
- $msg =& $this->overview[$child];
- $tree =& $this->_buildTree($child, $msg);
+ foreach ($head->children as $key=>&$msg) {
+ $tree =& $this->_buildTree($msg);
$last = $key == count($head->children) - 1;
foreach ($tree as $kt=>&$line) {
if ($kt === 0 && $key === 0 && !$last) {
/** build the spool tree associated with the given message
*/
public function &buildTree($id, $force = false) {
- $id = $this->root($id);
+ $root =& $this->root($id);
+ $id = $root->id;
if (!$force && isset($this->trees[$id])) {
return $this->trees[$id];
} else {
- $tree =& $this->_buildTree($id, $this->overview[$id]);
+ $tree =& $this->_buildTree($root);
$tree = '<div class="tree"><div style="height:18px">'
. implode("</div>\n<div style=\"height:18px\">", $tree)
. '</div></div>';
/** Return root message of the given thread
* @param id INTEGER id of a message
*/
- public function root($id)
+ public function &root($id)
{
- while (true) {
- $id_parent = $this->overview[$id]->parent;
- if (is_null($id_parent)) break;
- $id = $id_parent;
+ $parent =& $this->overview[$id];
+ while (!is_null($parent->parent)) {
+ $parent =& $parent->parent;
}
- return $id;
+ return $parent;
}
/** Return the last post id with the given subject
*/
public function prevThread($id)
{
- $root = $this->root($id);
+ $root =& $this->root($id);
$last = null;
- foreach ($this->roots as $i) {
- if ($i == $root) {
+ foreach ($this->roots as &$i) {
+ if ($i === $root) {
return $last;
}
- $last = $i;
+ $last = $i->id;
}
return $last;
}
*/
public function nextThread($id)
{
- $root = $this->root($id);
+ $root =& $this->root($id);
$ok = false;
- foreach ($this->roots as $i) {
+ foreach ($this->roots as &$i) {
if ($ok) {
- return $i;
+ return $i->id;
}
- if ($i == $root) {
+ if ($i === $root) {
$ok = true;
}
}
*/
public function prevPost($id)
{
- $parent = $this->overview[$id]->parent;
+ $parent =& $this->overview[$id]->parent;
if (is_null($parent)) {
return null;
}
- $last = $parent;
- foreach ($this->overview[$parent]->children as $child) {
- if ($child == $id) {
+ $last = $parent->id;
+ foreach ($parent->children as &$child) {
+ if ($child->id == $id) {
return $last;
}
- $last = $child;
+ $last = $child->id;
}
return null;
}
*/
public function nextPost($id)
{
- if (count($this->overview[$id]->children) != 0) {
- return $this->overview[$id]->children[0];
+ $cur =& $this->overview[$id];
+ if (count($cur->children) != 0) {
+ return $cur->children[0]->id;
}
- $cur = $id;
+ $parent =& $cur;
while (true) {
- $parent = $this->overview[$cur]->parent;
+ $parent =& $cur->parent;
if (is_null($parent)) {
return null;
}
$ok = false;
- foreach ($this->overview[$parent]->children as $child) {
+ foreach ($parent->children as &$child) {
if ($ok) {
- return $child;
+ return $child->id;
}
- if ($child == $cur) {
+ if ($child === $cur) {
$ok = true;
}
}
- $cur = $parent;
+ $cur =& $parent;
}
return null;
}
/** Look for an unread message in the thread rooted by the message
* @param id INTEGER message number
*/
- private function _nextUnread($id)
+ private function _nextUnread(BananaSpoolHead &$cur)
{
- if (!$this->overview[$id]->isread) {
- return $id;
+ if (!$cur->isread) {
+ return $cur->id;
}
- foreach ($this->overview[$id]->children as $child) {
+ foreach ($cur->children as &$child) {
$unread = $this->_nextUnread($child);
if (!is_null($unread)) {
return $unread;
if (!is_null($id)) {
// Look in message children
- foreach ($this->overview[$id]->children as $child) {
+ foreach ($this->overview[$id]->children as &$child) {
$next = $this->_nextUnread($child);
if (!is_null($next)) {
return $next;
}
// Look in current thread
- $cur = $id;
+ if (is_null($id)) {
+ $cur = null;
+ } else {
+ $cur =& $this->overview[$id];
+ }
do {
- $parent = is_null($cur) ? null : $this->overview[$cur]->parent;
- $ok = is_null($cur) ? true : false;
+ if (is_null($cur)) {
+ $parent =& $cur;
+ $ok = true;
+ } else {
+ $parent =& $cur->parent;
+ $ok = false;
+ }
if (!is_null($parent)) {
- $array = &$this->overview[$parent]->children;
+ $array =& $parent->children;
} else {
- $array = &$this->roots;
+ $array =& $this->roots;
}
- foreach ($array as $child) {
+ foreach ($array as &$child) {
if ($ok) {
$next = $this->_nextUnread($child);
if (!is_null($next)) {
return $next;
}
}
- if ($child == $cur) {
+ if ($child === $cur) {
$ok = true;
}
}
- $cur = $parent;
+ $cur =& $parent;
} while(!is_null($cur));
return null;
}
projects / banana.git / blobdiff