<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-require_once 'banana/banana.inc.php';
require_once 'banana/hooks.inc.php';
function hook_checkcancel($_headers)
{
- return ($_headers['x-org-id'] == S::v('hruid') or S::has_perms());
+ return ($_headers['x-org-id'] == S::v('hruid') or S::admin());
}
class ForumsBanana extends Banana
global $globals;
Banana::$msgedit_canattach = false;
- Banana::$spool_root = $globals->banana->spool_root;
+ Banana::$spool_root = $globals->spoolroot . '/spool/banana/';
array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail');
- Banana::$nntp_host = 'news://web_' . $user->login()
- . ":{$globals->banana->password}@{$globals->banana->server}:{$globals->banana->port}/";
- if (S::has_perms()) {
+ Banana::$nntp_host = self::buildURL($user->login());
+ if (S::admin()) {
Banana::$msgshow_mimeparts[] = 'source';
}
Banana::$debug_nntp = ($globals->debug & DEBUG_BT);
}
}
+ public static function buildURL($login = null)
+ {
+ global $globals;
+ $scheme = ($globals->banana->port == 563) ? "nntps" : "news";
+ $user = $globals->banana->web_user;
+ if ($login != null) {
+ $user .= '_' . $login;
+ $pass = $globals->banana->password;
+ } else {
+ $pass = $globals->banana->web_pass;
+ }
+ return $scheme . '://' . $user
+ . ":{$pass}@{$globals->banana->server}:{$globals->banana->port}/";
+
+ }
+
+ private function fetchProfile()
+ {
+ // Get user profile from SQL
+ $req = XDB::query("SELECT name, mail, sig,
+ FIND_IN_SET('threads',flags) AS threads,
+ FIND_IN_SET('automaj',flags) AS maj,
+ FIND_IN_SET('xface', flags) AS xface,
+ tree_unread, tree_read
+ FROM forum_profiles
+ WHERE uid = {?}", $this->user->id());
+ if ($req->numRows()) {
+ $infos = $req->fetchOneAssoc();
+ } else {
+ $infos = array();
+ }
+ if (empty($infos['name'])) {
+ $infos = array('name' => $this->user->fullName(),
+ 'mail' => $this->user->forlifeEmail(),
+ 'sig' => $this->user->displayName(),
+ 'threads' => false,
+ 'maj' => true,
+ 'xface' => false,
+ 'tree_unread' => 'o',
+ 'tree_read' => 'dg' );
+ }
+ return $infos;
+ }
+
public function run()
{
global $platal, $globals;
$time = null;
if (!is_null($this->params) && isset($this->params['updateall'])) {
$time = intval($this->params['updateall']);
- S::set('banana_last', $time);
+ $this->user->banana_last = $time;
}
- // Get user profile from SQL
- $req = XDB::query("SELECT name, mail, sig,
- FIND_IN_SET('threads',flags), FIND_IN_SET('automaj',flags),
- tree_unread, tree_read
- FROM forum_profiles
- WHERE uid = {?}", $this->user->id());
- if (!(list($nom, $mail, $sig, $disp, $maj, $unread, $read) = $req->fetchOneRow()) || !$nom) {
- $nom = S::v('prenom')." ".S::v('nom');
- $mail = $this->user->forlifeEmail();
- $sig = $nom." (".S::v('promo').")";
- $disp = 0;
- $maj = 1;
- $unread = 'o';
- $read = 'dg';
- }
- if ($maj) {
+ $infos = $this->fetchProfile();
+ if ($infos['maj']) {
$time = time();
}
FROM forum_subs AS fs
LEFT JOIN forums AS f ON (f.fid = fs.fid)
WHERE uid={?}", $this->user->id());
- Banana::$profile['headers']['From'] = "$nom <$mail>";
+ Banana::$profile['headers']['From'] = $infos['name'] . ' <' . $infos['mail'] . '>';
Banana::$profile['headers']['Organization'] = make_Organization();
- Banana::$profile['signature'] = $sig;
- Banana::$profile['display'] = $disp;
- Banana::$profile['autoup'] = $maj;
- Banana::$profile['lastnews'] = S::v('banana_last');
+ Banana::$profile['signature'] = $infos['sig'];
+ Banana::$profile['display'] = $infos['threads'];
+ Banana::$profile['autoup'] = $infos['maj'];
+ Banana::$profile['lastnews'] = $this->user->banana_last;
Banana::$profile['subscribe'] = $req->fetchColumn();
- Banana::$tree_unread = $unread;
- Banana::$tree_read = $read;
+ Banana::$tree_unread = $infos['tree_unread'];
+ Banana::$tree_read = $infos['tree_read'];
// Update the "unread limit"
if (!is_null($time)) {
WHERE uid = {?}',
$time, $this->user->id());
if (XDB::affectedRows() == 0) {
- XDB::execute('INSERT INTO forum_profiles (uid, last_seen)
- VALUES ({?}, FROM_UNIXTIME({?}))',
+ XDB::execute('INSERT IGNORE INTO forum_profiles (uid, last_seen)
+ VALUES ({?}, FROM_UNIXTIME({?}))',
$this->user->id(), $time);
}
}
return true;
}
- $req = XDB::iterRow('SELECT fid, name
- FROM forums');
- $fids = array();
- while (list($fid, $fnom) = $req->next()) {
- $fids[$fnom] = $fid;
- }
-
+ $fids = XDB::fetchAllAssoc('name', 'SELECT fid, name
+ FROM forums');
$diff = array_diff($groups, array_keys($fids));
foreach ($diff as $g) {
XDB::execute('INSERT INTO forums (name)
} else {
$last_seen = '0000-00-00';
}
- XDB::execute('REPLACE INTO forum_profiles (uid, sig, mail, name, flags, tree_unread, tree_read, last_seen)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ XDB::execute('INSERT INTO forum_profiles (uid, sig, mail, name, flags, tree_unread, tree_read, last_seen)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})
+ ON DUPLICATE KEY UPDATE sig = VALUES(sig), mail = VALUES(mail), name = VALUES(name), flags = VALUES(flags),
+ tree_unread = VALUES(tree_unread), tree_read = VALUES(tree_read), last_seen = VALUES(last_seen)',
$this->user->id(), Post::v('bananasig'),
Post::v('bananamail'), Post::v('banananame'),
$flags, $unread, $read, $last_seen);
}
}
- $req = XDB::query('SELECT name, mail, sig,
- FIND_IN_SET(\'threads\', flags),
- FIND_IN_SET(\'automaj\', flags),
- FIND_IN_SET(\'xface\', flags),
- tree_unread, tree_read
- FROM forum_profiles
- WHERE uid = {?}', $this->user->id());
- if (!((list($nom, $mail, $sig, $disp, $maj, $xface, $unread, $read) = $req->fetchOneRow())) || !$nom) {
- $nom = $this->user->fullName();
- $mail = $this->user->forlifeEmail();
- $sig = $this->user->displayName();
- $disp = 0;
- $maj = 0;
- $xface = 0;
- $unread = 'o';
- $read = 'dg';
- }
- $page->assign('nom' , $nom);
- $page->assign('mail', $mail);
- $page->assign('sig', $sig);
- $page->assign('disp', $disp);
- $page->assign('maj', $maj);
- $page->assign('xface', $xface);
- $page->assign('unread', $unread);
- $page->assign('read', $read);
+ $infos = $this->fetchProfile();
+ $page->assign('nom' , $infos['name']);
+ $page->assign('mail', $infos['mail']);
+ $page->assign('sig', $infos['sig']);
+ $page->assign('disp', $infos['threads']);
+ $page->assign('maj', $infos['maj']);
+ $page->assign('xface', $infos['xface']);
+ $page->assign('unread', $infos['tree_unread']);
+ $page->assign('read', $infos['tree_read']);
return null;
}
}
projects / platal.git / blobdiff