Updated text on the password/smtp page

[platal.git] / modules / forums.php

diff --git a/modules/forums.php b/modules/forums.php
index f02a9dc..9c8ac06 100644 (file)
--- a/modules/forums.php
+++ b/modules/forums.php
@@ -24,42 +24,16 @@ class ForumsModule extends PLModule
     function handlers()
     {
         return array(
-            'banana'              => $this->make_hook('banana', AUTH_COOKIE),
-            'banana/rss'          => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'banana'         => $this->make_hook('banana', AUTH_COOKIE),
+            'banana/rss'     => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
             'admin/forums'   => $this->make_hook('forums_bans', AUTH_MDP, 'admin'),
         );
     }
 
-    function on_subscribe($forlife, $uid, $promo, $password)
-    {
-        $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
-        $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
-            $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('admin/forums-promo.mail.tpl');
-                $mymail->assign('promo', $promo);
-                $mymail->send();
-            }
-        }
-
-        while (list ($key, $val) = each ($cible)) {
-            XDB::execute("INSERT INTO  forums.abos (fid,uid)
-                               SELECT  fid,{?} FROM forums.list WHERE nom={?}", $uid, $val);
-        }
-    }
-
     function handler_banana(&$page, $group = null, $action = null, $artid = null)
     {
         $page->changeTpl('banana/index.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Forums & PA');
+        $page->setTitle('Forums & PA');
 
         $get = Array();
         if (Post::has('updateall')) {
@@ -70,56 +44,6 @@ class ForumsModule extends PLModule
         run_banana($page, 'ForumsBanana', $get);
     }
 
-    function handler_profile(&$page, $action = null)
-    {
-        global $globals;
-
-        $page->changeTpl('banana/profile.tpl');
-
-        if (!(Post::has('action') && Post::has('banananame') && Post::has('bananasig')
-        && Post::has('bananadisplay') && Post::has('bananamail')
-        && Post::has('bananaupdate') && Post::v('action')=="Enregistrer" ))
-        {
-            $req = XDB::query("
-                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, $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('xface', $xface);
-        } else {
-            $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_rss(&$page, $group, $alias, $hash, $file = null)
     {
         if (is_null($file)) {
@@ -140,14 +64,14 @@ class ForumsModule extends PLModule
         $_SESSION = array_merge($row, $_SESSION);
 
         require_once 'banana/forum.inc.php';
-        $banana = new ForumsBanana(S::v('forlife'), array('group' => $group, 'action' => 'rss2'));
+        $banana = new ForumsBanana(S::user(), array('group' => $group, 'action' => 'rss2'));
         $banana->run();
         exit;
     }
 
     function handler_forums_bans(&$page, $action = 'list', $id = null)
     {
-        $page->assign('xorg_title','Polytechnique.org - Administration - Bannissements des forums');
+        $page->setTitle('Administration - Bannissements des forums');
         $page->assign('title', 'Gestion des mises au ban');
         $table_editor = new PLTableEditor('admin/forums','forums.innd','id_innd');
         $table_editor->add_sort_field('priority', true, true);
@@ -157,12 +81,13 @@ class ForumsModule extends PLModule
         $table_editor->describe('comment','commentaire',true);
         $table_editor->apply($page, $action, $id);
         $page->changeTpl('forums/admin.tpl');
+        $page->addJsLink('jquery.js');
     }
 
     static function run_banana(&$page, $params = null)
     {
         $page->changeTpl('banana/index.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Forums & PA');
+        $page->setTitle('Forums & PA');
 
         require_once 'banana/forum.inc.php';
         run_banana($page, 'ForumsBanana', $params);