Fix RSS encoding, add a disclaimer for xnet announces...

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index d1cf8c6..586b485 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -56,9 +56,6 @@ class PlatalModule extends PLModule
             'recovery'      => $this->make_hook('recovery',  AUTH_PUBLIC),
             'exit'          => $this->make_hook('exit', AUTH_PUBLIC),
             'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC),
-
-            // happenings related thingies
-            'rss'         => $this->make_hook('rss',       AUTH_PUBLIC),
         );
     }
 
@@ -191,7 +188,6 @@ class PlatalModule extends PLModule
             }
 
             $page->changeTpl('motdepasse.success.tpl');
-            $page->assign('now', strftime("%Y%m%d%H%M%S"));
             $page->run();
         }
 
@@ -319,7 +315,6 @@ Mail envoy
             XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
             $logger->log("passwd","");
             $page->changeTpl('tmpPWD.success.tpl');
-            $page->assign('now', strftime("%Y%m%d%H%M%S"));
         } else {
             $page->changeTpl('motdepasse.tpl');
             $page->addJsLink('motdepasse.js');
@@ -349,23 +344,19 @@ Mail envoy
              LEFT JOIN auth_user_quick AS a ON s.id=a.skin
                  WHERE skin_tpl != '' AND ext != ''
               GROUP BY id ORDER BY s.date DESC";
-        $page->assign_by_ref('skins', XDB::iterator($sql));
+        $page->assign('skins', XDB::iterator($sql));
     }
 
     function handler_exit(&$page, $level = null)
     {
         if (S::has('suid')) {
-            if (S::has('suid')) {
-                $a4l  = S::v('forlife');
-                $suid = S::v('suid');
-                $log  = S::v('log');
-                $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']);
-                $_SESSION = $suid;
-                S::kill('suid');
-                pl_redirect('admin/utilisateurs.php', 'login='.$a4l);
-            } else {
-                pl_redirect('events');
-            }
+            $a4l  = S::v('forlife');
+            $suid = S::v('suid');
+            $log  = S::v('log');
+            $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']);
+            $_SESSION = $suid;
+            S::kill('suid');
+            pl_redirect('admin/user/' . $a4l);
         }
 
         if ($level == 'forget' || $level == 'forgetall') {
@@ -395,24 +386,6 @@ Mail envoy
             $page->changeTpl('exit.tpl');
         }
     }
-
-    function handler_rss(&$page, $user = null, $hash = null)
-    {
-        require_once 'rss.inc.php';
-
-        $uid = init_rss('rss.tpl', $user, $hash);
-
-        $rss = XDB::iterator(
-                'SELECT  e.id, e.titre, e.texte, e.creation_date,
-                         IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
-                   FROM  auth_user_md5   AS u
-             INNER JOIN  evenements      AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
-                                                 AND (e.promo_max = 0 || e.promo_max >= u.promo) )
-             INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
-                  WHERE  u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
-                                         AND peremption >= NOW()', $uid);
-        $page->assign('rss', $rss);
-    }
 }
 
 ?>