X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbanana.php;h=c23749d06cfb6b6ce6e0ab39e1a2d72733f1a1c7;hb=ce835419ab95b6b42dbb4bdc249b4bf7ffdc497b;hp=85f8db72d009a07c67f33929586280bd9b61eec3;hpb=6544d0e1de719d31db03a7c7fddfe4c0301d9d6d;p=platal.git diff --git a/modules/banana.php b/modules/banana.php index 85f8db7..c23749d 100644 --- a/modules/banana.php +++ b/modules/banana.php @@ -1,6 +1,6 @@ $this->make_hook('banana', AUTH_COOKIE), - 'banana/profile' => $this->make_hook('profile', AUTH_MDP), - 'banana/subscription' => $this->make_hook('subscription', AUTH_COOKIE), - 'banana/rss' => $this->make_hook('rss', AUTH_PUBLIC), +// 'banana/profile' => $this->make_hook('profile', AUTH_MDP), +// 'banana/subscribe' => $this->make_hook('subscription', AUTH_COOKIE), + 'banana/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), ); } @@ -36,16 +36,16 @@ class BananaModule extends PLModule $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements'); $p_for = "xorg.promo.x$promo"; - // récupération de l'id du forum promo + // récupération de l'id du forum promo $res = XDB::query("SELECT fid FROM forums.list WHERE nom={?}", $p_for); if ($res->numRows()) { $cible[] = $p_for; - } else { // pas de forum promo, il faut le créer + } else { // pas de forum promo, il faut le créer $res = XDB::query("SELECT SUM(perms IN ('admin','user') AND deces=0),COUNT(*) FROM auth_user_md5 WHERE promo={?}", $promo); list($effau, $effid) = $res->fetchOneRow(); if (5*$effau>$effid) { // + de 20% d'inscrits - $mymail = new PlMailer('mails/forums.promo.tpl'); + $mymail = new PlMailer('admin/forums-promo.mail.tpl'); $mymail->assign('promo', $promo); $mymail->send(); } @@ -59,37 +59,16 @@ class BananaModule extends PLModule function handler_banana(&$page, $group = null, $action = null, $artid = null) { + $page->changeTpl('banana/index.tpl'); + $page->assign('xorg_title','Polytechnique.org - Forums & PA'); + $get = Array(); - if (!is_null($group)) { - $get['group'] = $group; - } if (Post::has('updateall')) { $get['updateall'] = Post::v('updateall'); } - if (!is_null($action)) { - if ($action == 'new') { - $get['action'] = 'new'; - } elseif (!is_null($artid)) { - $get['artid'] = $artid; - if ($action == 'reply') { - $get['action'] = 'new'; - } elseif ($action == 'cancel') { - $get['action'] = $action; - } elseif ($action == 'from') { - $get['first'] = $artid; - unset($get['artid']); - } elseif ($action == 'read') { - $get['part'] = @$_GET['part']; - } elseif ($action == 'source') { - $get['part'] = 'source'; - } elseif ($action == 'xface') { - $get['part'] = 'xface'; - } elseif ($action) { - $get['part'] = str_replace('.', '/', $action); - } - } - } - return BananaModule::run_banana($page, $get); + require_once 'banana/forum.inc.php'; + get_banana_params($get, $group, $action, $artid); + run_banana($page, 'ForumsBanana', $get); } function handler_profile(&$page, $action = null) @@ -100,42 +79,48 @@ class BananaModule extends PLModule if (!(Post::has('action') && Post::has('banananame') && Post::has('bananasig') && Post::has('bananadisplay') && Post::has('bananamail') - && Post::has('bananaupdate') && Post::v('action')=="OK" )) + && Post::has('bananaupdate') && Post::v('action')=="Enregistrer" )) { $req = XDB::query(" - SELECT nom,mail,sig,if(FIND_IN_SET('threads',flags),'1','0'), - IF(FIND_IN_SET('automaj',flags),'1','0') + SELECT nom, mail, sig, + FIND_IN_SET('threads', flags), + FIND_IN_SET('automaj', flags), + FIND_IN_SET('xface', flags) FROM forums.profils WHERE uid = {?}", S::v('uid')); - if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) { - $nom = S::v('prenom').' '.S::v('nom'); - $mail = S::v('forlife').'@'.$globals->mail->domain; - $sig = $nom.' ('.S::v('promo').')'; - $disp = 0; - $maj = 0; + if (!(list($nom, $mail, $sig, $disp, $maj, $xface) = $req->fetchOneRow())) { + $nom = S::v('prenom').' '.S::v('nom'); + $mail = S::v('forlife').'@'.$globals->mail->domain; + $sig = $nom.' ('.S::v('promo').')'; + $disp = 0; + $maj = 0; + $xface = 0; } - $page->assign('nom' , $nom); - $page->assign('mail', $mail); - $page->assign('sig' , $sig); - $page->assign('disp', $disp); - $page->assign('maj' , $maj); + $page->assign('nom' , $nom); + $page->assign('mail', $mail); + $page->assign('sig', $sig); + $page->assign('disp', $disp); + $page->assign('maj', $maj); + $page->assign('xface', $xface); } else { - XDB::execute( - 'REPLACE INTO forums.profils (uid,sig,mail,nom,flags) - VALUES ({?},{?},{?},{?},{?})', - S::v('uid'), Post::v('bananasig'), - Post::v('bananamail'), Post::v('banananame'), - (Post::b('bananadisplay') ? 'threads,' : '') . - (Post::b('bananaupdate') ? 'automaj' : '') - ); + $flags = array(); + if (Post::b('bananadisplay')) { + $flags[] = 'threads'; + } + if (Post::b('bananaupdate')) { + $flags[] = 'automaj'; + } + if (Post::b('bananaxface')) { + $flags[] = 'xface'; + } + XDB::execute("REPLACE INTO forums.profils (uid, sig, mail, nom, flags) + VALUES ({?}, {?}, {?}, {?}, {?})", + S::v('uid'), Post::v('bananasig'), + Post::v('bananamail'), Post::v('banananame'), + implode(',', $flags)); } } - function handler_subscription(&$page) - { - return $this->run_banana($page, Array('action' => 'subscribe')); - } - function handler_rss(&$page, $group, $alias, $hash, $file = null) { if (is_null($file)) { @@ -156,8 +141,8 @@ class BananaModule extends PLModule $_SESSION = array_merge($row, $_SESSION); require_once 'banana/forum.inc.php'; - $banana = new ForumsBanana(array('group' => $group, 'action' => 'rss2')); - echo $banana->run(); + $banana = new ForumsBanana(S::v('forlife'), array('group' => $group, 'action' => 'rss2')); + $banana->run(); exit; } @@ -167,22 +152,7 @@ class BananaModule extends PLModule $page->assign('xorg_title','Polytechnique.org - Forums & PA'); require_once 'banana/forum.inc.php'; - - $banana = new ForumsBanana($params); - $res = $banana->run(); - $page->assign_by_ref('banana', $banana); - $page->assign('banana_res', $res); - $page->addCssInline($banana->css()); - $page->addCssLink('banana.css'); - $rss = $banana->feed(); - if ($rss) { - if (@$params['group']) { - $page->setRssLink('Banana :: ' . $params['group'], $rss); - } else { - $page->setRssLink('Banana :: Abonnements', $rss); - } - } - new PlBacktrace('NNTP', $banana->backtrace(), 'response', 'time'); + run_banana($page, 'ForumsBanana', $params); } }