Minor improvement of keynote skin

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index e2de116..0824f2b 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -39,7 +39,7 @@ class PlatalModule extends PLModule
     {
         return array(
             'index'       => $this->make_hook('index',     AUTH_PUBLIC),
-           'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
+            'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
             'changelog'   => $this->make_hook('changelog', AUTH_PUBLIC),
 
             // Preferences thingies
@@ -55,6 +55,7 @@ class PlatalModule extends PLModule
             'password/smtp' => $this->make_hook('smtppass',  AUTH_MDP),
             'recovery'      => $this->make_hook('recovery',  AUTH_PUBLIC),
             'exit'          => $this->make_hook('exit', AUTH_PUBLIC),
+            'review'        => $this->make_hook('review', AUTH_PUBLIC),
             'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC),
         );
     }
@@ -63,6 +64,8 @@ class PlatalModule extends PLModule
     {
         if (S::logged()) {
             pl_redirect('events');
+        } else if (!@$GLOBALS['IS_XNET_SITE']) {
+            pl_redirect('review');
         }
     }
 
@@ -84,6 +87,7 @@ class PlatalModule extends PLModule
         $page->changeTpl('platal/changeLog.tpl');
 
         $clog = pl_entities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
+        $clog = preg_replace('/=+\s*/', '</pre><hr /><pre>', $clog);
         // url catch only (not all wiki syntax)
         $clog = preg_replace(array(
             '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui',
@@ -96,6 +100,7 @@ class PlatalModule extends PLModule
           $clog);
         $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog);
         $clog = preg_replace('!vim:.*$!', '', $clog);
+        $clog = preg_replace("!(<hr />(\\s|\n)*)?<pre>(\s|\n)*</pre>((\\s|\n)*<hr />)?!m", "", "<pre>$clog</pre>");
         $page->assign('ChangeLog', $clog);
     }
 
@@ -185,7 +190,7 @@ class PlatalModule extends PLModule
 
             $_SESSION['password'] = $password = Post::v('response2');
 
-            XDB::execute('UPDATE  auth_user_md5 
+            XDB::execute('UPDATE  auth_user_md5
                              SET  password={?}
                            WHERE  user_id={?}', $password,
                            S::v('uid'));
@@ -210,7 +215,7 @@ class PlatalModule extends PLModule
     {
         $page->changeTpl('platal/acces_smtp.tpl');
         $page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP');
-        
+
         require_once 'wiki.inc.php';
         wiki_require_page('Xorg.SMTPSécurisé');
         wiki_require_page('Xorg.NNTPSécurisé');
@@ -219,8 +224,8 @@ class PlatalModule extends PLModule
         $pass = Env::v('smtppass1');
         $log  = S::v('log');
 
-        if (Env::v('op') == "Valider" && strlen($pass) >= 6 
-        &&  Env::v('smtppass1') == Env::v('smtppass2')) 
+        if (Env::v('op') == "Valider" && strlen($pass) >= 6
+        &&  Env::v('smtppass1') == Env::v('smtppass2'))
         {
             XDB::execute('UPDATE auth_user_md5 SET smtppass = {?}
                                      WHERE user_id = {?}', $pass, $uid);
@@ -233,7 +238,7 @@ class PlatalModule extends PLModule
             $log->log("passwd_del");
         }
 
-        $res = XDB::query("SELECT IF(smtppass != '', 'actif', '') 
+        $res = XDB::query("SELECT IF(smtppass != '', 'actif', '')
                                        FROM auth_user_md5
                                       WHERE user_id = {?}", $uid);
         $page->assign('actif', $res->fetchOneCell());
@@ -283,8 +288,8 @@ class PlatalModule extends PLModule
 
             $page->assign('ok', true);
 
-            $url   = rand_url_id(); 
-            XDB::execute('INSERT INTO  perte_pass (certificat,uid,created) 
+            $url   = rand_url_id();
+            XDB::execute('INSERT INTO  perte_pass (certificat,uid,created)
                                VALUES  ({?},{?},NOW())', $url, $uid);
             $res   = XDB::query('SELECT  email
                                    FROM  emails
@@ -307,7 +312,7 @@ class PlatalModule extends PLModule
 
 Si en cliquant dessus tu n'y arrives pas, copie intégralement l'adresse dans la barre de ton navigateur. Si tu n'as pas utilisé ce lien dans six heures, tu peux tout simplement recommencer cette procédure.
 
--- 
+--
 Polytechnique.org
 \"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"
 
@@ -417,6 +422,31 @@ Adresse de secours : " . Post::v('email') : ""));
             $page->changeTpl('platal/exit.tpl');
         }
     }
+
+    function handler_review(&$page, $action = null, $mode = null) 
+    {
+        require_once 'wiki.inc.php';
+        require_once dirname(__FILE__) . '/platal/review.inc.php';
+        $dir = wiki_work_dir();
+        $dom = 'Review';
+        if (@$GLOBALS['IS_XNET_SITE']) {
+            $dom .= 'Xnet';
+        }
+        if (!is_dir($dir)) {
+            $page->kill("Impossible de trouver le wiki");
+        }
+        if (!file_exists($dir . '/' . $dom . '.Admin')) {
+            $page->kill("Impossible de trouver la page d'administration");
+        }
+        $conf = preg_grep('/^text=/', explode("\n", file_get_contents($dir . '/' . $dom . '.Admin')));
+        $conf = preg_split('/(text\=|\%0a)/', array_shift($conf), -1, PREG_SPLIT_NO_EMPTY);
+        $wiz = new PlWizard('Tour d\'horizon', 'core/plwizard.tpl', true);
+        foreach ($conf as $line) {
+            $list = preg_split('/\s*[*|]\s*/', $line, -1, PREG_SPLIT_NO_EMPTY);
+            $wiz->addPage('ReviewPage', $list[0], $list[1]);
+        }
+        $wiz->apply($page, 'review', $action, $mode);
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: