remove fail() that is not used

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index b8ed76b..b5dfe4a 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -43,11 +43,11 @@ class PlatalModule extends PLModule
             'changelog'   => $this->make_hook('changelog', AUTH_PUBLIC),
 
             // Preferences thingies
-            'prefs'     => $this->make_hook('prefs',     AUTH_COOKIE),
-            'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE),
+            'prefs'       => $this->make_hook('prefs',     AUTH_COOKIE),
+            'prefs/rss'   => $this->make_hook('prefs_rss', AUTH_COOKIE),
             'prefs/webredirect'
-                        => $this->make_hook('webredir',  AUTH_MDP),
-            'skin'      => $this->make_hook('skin',      AUTH_COOKIE),
+                          => $this->make_hook('webredir',  AUTH_MDP),
+            'prefs/skin'  => $this->make_hook('skin',      AUTH_COOKIE),
 
             // password related thingies
             'password'      => $this->make_hook('password',  AUTH_MDP),
@@ -64,7 +64,7 @@ class PlatalModule extends PLModule
     function handler_index(&$page)
     {
         if (S::logged()) {
-            redirect("events");
+            pl_redirect('events');
         }
     }
 
@@ -103,27 +103,22 @@ class PlatalModule extends PLModule
 
     function handler_prefs(&$page)
     {
-        global $globals;
-
         $page->changeTpl('preferences.tpl');
         $page->assign('xorg_title','Polytechnique.org - Mes préférences');
 
-        if (Env::has('mail_fmt')) {
-            $fmt = Env::get('mail_fmt');
+        if (Post::has('mail_fmt')) {
+            $fmt = Post::get('mail_fmt');
             if ($fmt != 'texte') $fmt = 'html';
             XDB::execute("UPDATE auth_user_quick
                                        SET core_mail_fmt = '$fmt'
                                      WHERE user_id = {?}",
                                      S::v('uid'));
             $_SESSION['mail_fmt'] = $fmt;
-            redirect($globals->baseurl.'/preferences');
         }
 
-        if (Env::has('rss')) {
-            $this->__set_rss_state(Env::getBool('rss'));
+        if (Post::has('rss')) {
+            $this->__set_rss_state(Post::getBool('rss'));
         }
-
-        $page->assign('prefs', $globals->hook->prefs());
     }
 
     function handler_webredir(&$page)
@@ -238,9 +233,14 @@ class PlatalModule extends PLModule
         }
 
         if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) {
-            $page->trig_run('Date de naissance incorrecte ou incohérente');
+            $page->trig('Date de naissance incorrecte ou incohérente');
+            return;
         }
-        $birth   = sprintf('%s-%s-%s', substr(Env::get('birth'),4,4), substr(Env::get('birth'),2,2), substr(Env::get('birth'),0,2));
+
+        $birth   = sprintf('%s-%s-%s',
+                           substr(Env::get('birth'), 4, 4),
+                           substr(Env::get('birth'), 2, 2),
+                           substr(Env::get('birth'), 0, 2));
 
         $mailorg = strtok(Env::get('login'), '@');
 
@@ -329,9 +329,13 @@ Mail envoy
             XDB::execute('UPDATE auth_user_quick
                              SET skin={?} WHERE user_id={?}',
                          Env::getInt('newskin'), S::v('uid'));
+            S::kill('skin');
             set_skin();
         }
 
+        $res = XDB::query('SELECT id FROM skins WHERE skin_tpl={?}', S::v('skin'));
+        $page->assign('skin_id', $res->fetchOneCell());
+
         $sql = "SELECT s.*,auteur,count(*) AS nb
                   FROM skins AS s
              LEFT JOIN auth_user_quick AS a ON s.id=a.skin
@@ -350,9 +354,9 @@ Mail envoy
                 $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']);
                 $_SESSION = $suid;
                 S::kill('suid');
-                redirect($globals->baseurl.'/admin/utilisateurs.php?login='.$a4l);
+                pl_redirect('admin/utilisateurs.php', 'login='.$a4l);
             } else {
-                redirect("events");
+                pl_redirect('events');
             }
         }
 
@@ -378,7 +382,7 @@ Mail envoy
         XorgSession::destroy();
 
         if (Get::has('redirect')) {
-            redirect(rawurldecode(Get::get('redirect')));
+            http_redirect(rawurldecode(Get::get('redirect')));
         } else {
             $page->changeTpl('exit.tpl');
         }