Merge commit 'origin/core-1.0.0' into core
[platal.git] / modules / core.php
index fa54116..e85241b 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,21 +24,20 @@ class CoreModule extends PLModule
     function handlers()
     {
         return array(
-            '403'         => $this->make_hook('403', AUTH_PUBLIC),
-            '404'         => $this->make_hook('404', AUTH_PUBLIC),
-            'login'       => $this->make_hook('login',      AUTH_COOKIE),
-            'send_bug'    => $this->make_hook('bug', AUTH_COOKIE),
-            'purge_cache' => $this->make_hook('purge_cache', AUTH_COOKIE, 'admin'),
+            '403'           => $this->make_hook('403',           AUTH_PUBLIC),
+            '404'           => $this->make_hook('404',           AUTH_PUBLIC),
+            'login'         => $this->make_hook('login',         AUTH_COOKIE),
+            'send_bug'      => $this->make_hook('bug',           AUTH_COOKIE),
+            'purge_cache'   => $this->make_hook('purge_cache',   AUTH_COOKIE, 'admin'),
             'kill_sessions' => $this->make_hook('kill_sessions', AUTH_COOKIE, 'admin'),
-            'sql_errors'  => $this->make_hook('sqlerror', AUTH_COOKIE, 'admin'),
-            'get_rights'  => $this->make_hook('get_rights', AUTH_MDP, 'admin'),
+            'sql_errors'    => $this->make_hook('sqlerror',      AUTH_COOKIE, 'admin'),
 
-            'wiki_help'    => $this->make_hook('wiki_help', AUTH_PUBLIC),
-            'wiki_preview' => $this->make_hook('wiki_preview', AUTH_COOKIE, 'user', NO_AUTH),
+            'wiki_help'     => $this->make_hook('wiki_help',     AUTH_PUBLIC),
+            'wiki_preview'  => $this->make_hook('wiki_preview',  AUTH_COOKIE, 'user', NO_AUTH),
 
-            'valid.html'  => $this->make_hook('valid', AUTH_PUBLIC),
-            'favicon.ico' => $this->make_hook('favicon', AUTH_PUBLIC),
-            'robots.txt'  => $this->make_hook('robotstxt', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'valid.html'    => $this->make_hook('valid',         AUTH_PUBLIC),
+            'favicon.ico'   => $this->make_hook('favicon',       AUTH_PUBLIC),
+            'robots.txt'    => $this->make_hook('robotstxt',     AUTH_PUBLIC, 'user', NO_HTTPS),
         );
     }
 
@@ -75,7 +74,8 @@ class CoreModule extends PLModule
 
     function handler_favicon(&$page)
     {
-        $data = file_get_contents(dirname(__FILE__).'/../htdocs/images/favicon.ico');
+        global $globals;
+        $data = file_get_contents($globals->spoolroot . '/htdocs/images/favicon.ico');
         header('Content-Type: image/x-icon');
         echo $data;
         exit;
@@ -84,14 +84,25 @@ class CoreModule extends PLModule
     function handler_robotstxt(&$page)
     {
         global $globals;
-        if (!$globals->core->restricted_platal) {
-            return PL_NOT_FOUND;
+
+        $disallowed_uris = array();
+        if ($globals->core->restricted_platal) {
+            $disallowed_uris[] = '/';
+        } else if (!empty($globals->core->robotstxt_disallowed_uris)) {
+            $disallowed_uris = preg_split('/[\s,]+/',
+                                          $globals->core->robotstxt_disallowed_uris,
+                                          -1, PREG_SPLIT_NO_EMPTY);
         }
 
-        header('Content-Type: text/plain');
-        echo "User-agent: *\n";
-        echo "Disallow: /\n";
-        exit;
+        if (count($disallowed_uris) > 0) {
+            header('Content-Type: text/plain');
+            echo "User-agent: *\n";
+            foreach ($disallowed_uris as $uri) {
+                echo "Disallow: $uri\n";
+            }
+            exit;
+        }
+        return PL_NOT_FOUND;
     }
 
     function handler_purge_cache(&$page)
@@ -109,26 +120,6 @@ class CoreModule extends PLModule
         kill_sessions();
     }
 
-    function handler_get_rights(&$page, $level)
-    {
-        if (S::has('suid')) {
-            $page->kill('Déjà en SUID');
-        }
-
-        if (isset($_SESSION['log'])) {
-            if (S::user()) {
-                S::logger()->log("suid_start", "login by " . S::user()->login());
-            } else {
-                // TODO(vzanotti): trash that code when support of forlife will be gone.
-                S::logger()->log("suid_start", "login by ".S::v('forlife'));
-            }
-        }
-        Platal::session()->startSUID(S::i('uid'));
-        Platal::session()->makePerms($level);
-
-        pl_redirect('/');
-    }
-
     function handler_bug(&$page)
     {
         global $globals;
@@ -149,11 +140,10 @@ class CoreModule extends PLModule
         if (Env::has('send') && trim(Env::v('detailed_desc'))) {
             S::assert_xsrf_token();
 
-            // TODO(vzanotti): trash the 'forlife' bit when support of forlife will be gone.
             $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n"
                   . "----------------------------\n"
                   . "Page        : " . Env::v('page') . "\n\n"
-                  . "Utilisateur : " . (S::user() ? S::user()->login() : S::v('forlife')) . "\n"
+                  . "Utilisateur : " . S::user()->login() . "\n"
                   . "Navigateur  : " . $_SERVER['HTTP_USER_AGENT'] . "\n"
                   . "Skin        : " . S::v('skin') . "\n";
             $page->assign('bug_sent', 1);
@@ -161,14 +151,8 @@ class CoreModule extends PLModule
                              . ', tu devrais en recevoir une copie d\'ici quelques minutes. Nous allons '
                              . 'le traiter et y répondre dans les plus brefs délais.');
             $mymail = new PlMailer();
-            // TODO(vzanotti): trash the 'bestalias' bits when support of bestalias will be gone.
-            if (S::user()) {
-                $mymail->setFrom(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail()));
-                $mymail->addCc(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail()));
-            } else {
-                $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>');
-                $mymail->addCc('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>');
-            }
+            $mymail->setFrom(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail()));
+            $mymail->addCc(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail()));
             $mymail->addTo('support+platal@' . $globals->mail->domain);
             $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary'));
             $mymail->setTxtBody($body);
@@ -193,19 +177,18 @@ class CoreModule extends PLModule
         exit;
     }
 
-    function handler_sqlerror(&$page, $clear = null) {
+    function handler_sqlerror(&$page) {
         global $globals;
+        $page->coreTpl('sql_errors.tpl');
         $file = @fopen($globals->spoolroot . '/spool/tmp/query_errors', 'r');
         if ($file !== false) {
-            echo '<html><body>';
-            fpassthru($file);
+            $page->assign('errors', fpassthru($file));
             fclose($file);
-            echo '</html></body>';
         }
-        if ($clear == 'clear') {
+        if (Post::has('clear')) {
             @unlink($globals->spoolroot . '/spool/tmp/query_errors');
+            $page->trigSuccess("Erreurs MySQL effacées.");
         }
-        exit;
     }
 }