function hook_checkcancel($_headers)
{
- return ($_headers['x-org-id'] == S::v('forlife') or S::has_perms());
+ return ($_headers['x-org-id'] == S::v('hruid') or S::has_perms());
}
class ForumsBanana extends Banana
{
- private $forlife;
+ private $user;
- public function __construct($forlife, $params = null)
+ public function __construct(User &$user, $params = null)
{
- $this->forlife = $forlife;
+ $this->user = &$user;
global $globals;
Banana::$msgedit_canattach = false;
Banana::$spool_root = $globals->banana->spool_root;
array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail');
- Banana::$nntp_host = 'news://web_'.$forlife
+ Banana::$nntp_host = 'news://web_' . $user->login()
. ":{$globals->banana->password}@{$globals->banana->server}:{$globals->banana->port}/";
if (S::has_perms()) {
Banana::$msgshow_mimeparts[] = 'source';
// Get user profile from SQL
$req = XDB::query("SELECT nom, mail, sig,
- FIND_IN_SET('threads',flags), FIND_IN_SET('automaj',flags)
+ FIND_IN_SET('threads',flags), FIND_IN_SET('automaj',flags),
+ tree_unread, tree_read
FROM {$globals->banana->table_prefix}profils
WHERE uid={?}", S::i('uid'));
- if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) {
+ if (!(list($nom, $mail, $sig, $disp, $maj, $unread, $read) = $req->fetchOneRow())) {
$nom = S::v('prenom')." ".S::v('nom');
- $mail = S::v('forlife')."@" . $globals->mail->domain;
+ $mail = $this->user->forlifeEmail();
$sig = $nom." (".S::v('promo').")";
$disp = 0;
$maj = 1;
+ $unread = 'o';
+ $read = 'dg';
}
if ($maj) {
$time = time();
Banana::$profile['autoup'] = $maj;
Banana::$profile['lastnews'] = S::v('banana_last');
Banana::$profile['subscribe'] = $req->fetchColumn();
+ Banana::$tree_unread = $unread;
+ Banana::$tree_read = $read;
// Update the "unread limit"
if (!is_null($time)) {
public function post($dest, $reply, $subject, $body)
{
global $globals;
- $res = XDB::query('SELECT nom, prenom, promo, b.alias AS bestalias
+ $res = XDB::query('SELECT nom, prenom, promo
FROM auth_user_md5 AS u
- INNER JOIN aliases AS a ON (a.id = u.user_id)
- INNER JOIN aliases AS b ON (b.id = a.id AND FIND_IN_SET(\'bestalias\', b.flags))
- WHERE a.alias = {?}', $this->forlife);
- list($nom, $prenom, $promo, $bestalias) = $res->fetchOneRow();
- Banana::$profile['headers']['From'] = "$prenom $nom ($promo) <$bestalias@{$globals->mail->domain}>";
+ WHERE u.user_id = {?}', $this->user->id());
+ list($nom, $prenom, $promo) = $res->fetchOneRow();
+ Banana::$profile['headers']['From'] = "$prenom $nom ($promo) <{$this->user->bestEmail()}>";
Banana::$profile['headers']['Organization'] = make_Organization();
return parent::post($dest, $reply, $subject, $body);
}
global $globals;
$page = Platal::page();
- if (Post::has('action') && Post::has('banananame') && Post::has('bananasig')
- && Post::has('bananadisplay') && Post::has('bananamail')
- && Post::has('bananaupdate') && Post::v('action')=="Enregistrer" ) {
- $flags = new PlFlagSet();
+ $colors = glob(dirname(__FILE__) . '/../../htdocs/images/banana/m2*.gif');
+ foreach ($colors as $key=>$path) {
+ $path = basename($path, '.gif');
+ $colors[$key] = substr($path, 2);
+ }
+ $page->assign('colors', $colors);
+
+ if (Post::has('action') && Post::v('action') == 'Enregistrer') {
+ S::assert_xsrf_token();
+ $flags = new FlagSet();
if (Post::b('bananadisplay')) {
$flags->addFlag('threads');
}
if (Post::b('bananaxface')) {
$flags->addFlag('xface');
}
- if (XDB::execute("REPLACE INTO forums.profils (uid, sig, mail, nom, flags)
- VALUES ({?}, {?}, {?}, {?}, {?})",
- S::v('uid'), Post::v('bananasig'),
- Post::v('bananamail'), Post::v('banananame'),
- $flags)) {
+ $unread = Post::s('unread');
+ $read = Post::s('read');
+ if (!in_array($unread, $colors) || !in_array($read, $colors)) {
+ $page->trigError('Le choix de type pour l\'arborescence est invalide');
+ } elseif (XDB::execute("REPLACE INTO forums.profils (uid, sig, mail, nom, flags, tree_unread, tree_read)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})",
+ S::v('uid'), Post::v('bananasig'),
+ Post::v('bananamail'), Post::v('banananame'),
+ $flags, $unread, $read)) {
$page->trigSuccess("Ton profil a été enregistré avec succès.");
} else {
$page->trigError("Une erreur s'est produite lors de l'enregistrement de ton profil");
SELECT nom, mail, sig,
FIND_IN_SET('threads', flags),
FIND_IN_SET('automaj', flags),
- FIND_IN_SET('xface', flags)
+ FIND_IN_SET('xface', flags),
+ tree_unread,
+ tree_read
FROM forums.profils
WHERE uid = {?}", S::v('uid'));
- if (!(list($nom, $mail, $sig, $disp, $maj, $xface) = $req->fetchOneRow())) {
+ if (!(list($nom, $mail, $sig, $disp, $maj, $xface, $unread, $read) = $req->fetchOneRow())) {
$nom = S::v('prenom').' '.S::v('nom');
- $mail = S::v('forlife').'@'.$globals->mail->domain;
+ $mail = S::user()->forlifeEmail();
$sig = $nom.' ('.S::v('promo').')';
$disp = 0;
$maj = 0;
$xface = 0;
+ $unread = 'o';
+ $read = 'dg';
}
$page->assign('nom' , $nom);
$page->assign('mail', $mail);
$page->assign('disp', $disp);
$page->assign('maj', $maj);
$page->assign('xface', $xface);
+ $page->assign('unread', $unread);
+ $page->assign('read', $read);
return null;
}
}
projects / platal.git / blobdiff