Set error return code when PlPage::kill() is called from CLI.

[platal.git] / classes / plpage.php

diff --git a/classes/plpage.php b/classes/plpage.php
index 26445c9..875981e 100644 (file)
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -49,7 +49,7 @@ abstract class PlPage extends Smarty
                       $globals->spoolroot . '/plugins/');
         $this->config_dir    = $globals->spoolroot . '/configs/';
 
-        $this->compile_check = !empty($globals->debug);
+        $this->compile_check = !empty($globals->debug) || $globals->smarty_autocompile;
 
         $this->_errors    = array('errors' => array());
         $this->_jsonVars  = array();
@@ -60,7 +60,6 @@ abstract class PlPage extends Smarty
                              . " actuellement désactivée, en particulier aucune donnée ne sera sauvegardée");
         }
         $this->register_prefilter('at_to_globals');
-        $this->addJsLink('jquery.js');
     }
 
     // }}}
@@ -116,7 +115,7 @@ abstract class PlPage extends Smarty
         $this->register_prefilter('form_force_encodings');
         $this->register_prefilter('wiki_include');
         $this->register_prefilter('core_include');
-        $this->register_prefilter('if_has_perms');
+        $this->register_prefilter('if_rewrites');
         $this->assign('pl_triggers', $this->_errors);
         $this->assign('pl_errors', $this->nb_errs());
         $this->assign('pl_failure', $this->_failure);
@@ -153,10 +152,9 @@ abstract class PlPage extends Smarty
         if (S::i('auth') <= AUTH_PUBLIC) {
             $this->register_outputfilter('hide_emails');
         }
-        $this->addJsLink('wiki.js');
         header("Accept-Charset: utf-8");
         if (Env::v('forceXml')) {
-            header("Content-Type: text/xml; charset=utf-8");
+            pl_content_headers("text/xml");
         }
 
         if (!$globals->debug) {
@@ -246,21 +244,36 @@ abstract class PlPage extends Smarty
     // }}}
     // {{{ function kill()
 
-    public function kill($msg)
+    public function kill($msg, $type = 'errors')
     {
         // PHP is used on command line... do not run the whole page stuff.
         if (php_sapi_name() == 'cli') {
             echo $msg . "\n";
-            exit;
+            exit(-1);
         }
 
         global $platal;
 
-        $this->trigError($msg);
+        $this->trig($msg, $type);
         $this->_failure = true;
         $this->run();
     }
 
+    public function killError($msg)
+    {
+        $this->kill($msg, 'errors');
+    }
+
+    public function killWarning($msg)
+    {
+        $this->kill($msg, 'warnings');
+    }
+
+    public function killSuccess($msg)
+    {
+        $this->kill($msg, 'success');
+    }
+
     // }}}
     // {{{ function setTitle
 
@@ -276,9 +289,13 @@ abstract class PlPage extends Smarty
     // }}}
     // {{{ function addJsLink
 
-    public function addJsLink($path)
+    public function addJsLink($filename, $static_content = true)
     {
-        $this->append('pl_js', $path);
+        if ($static_content) {
+            $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+        } else {
+            $this->append('pl_js', "javascript/$filename");
+        }
     }
 
     // }}}
@@ -320,7 +337,7 @@ abstract class PlPage extends Smarty
     // {{{ function jsonDisplay
     protected function jsonDisplay()
     {
-        header("Content-type: text/javascript; charset=utf-8");
+        pl_content_headers("text/javascript");
         array_walk_recursive($this->_jsonVars, "escape_xorgDB");
         $jsonbegin = Env::v('jsonBegin');
         $jsonend = Env::v('jsonEnd');
@@ -439,13 +456,15 @@ function core_include($source, &$smarty)
 // }}}
 //{{{ function hasPerm
 
-function if_has_perms($source, &$smarty)
+function if_rewrites($source, &$smarty)
 {
-    $source = preg_replace('/\{if([^}]*) (\!?)hasPerms\(([^)]+)\)([^}]*)\}/',
-                           '{if\1 \2$smarty.session.perms->hasFlagCombination(\3)\4}',
-                           $source);
-    return preg_replace('/\{if([^}]*) (\!?)hasPerm\(([^)]+)\)([^}]*)\}/',
-                        '{if\1 \2($smarty.session.perms && $smarty.session.perms->hasFlag(\3))\4}',
+    $perms = 'isset($smarty.session.perms|smarty:nodefaults) && $smarty.session.perms|smarty:nodefaults && $smarty.session.perms';
+    return preg_replace(array('/\{if([^}]*) (\!?)hasPerms\(([^)]+)\)([^}]*)\}/',
+                              '/\{if([^}]*) (\!?)hasPerm\(([^)]+)\)([^}]*)\}/',
+                              '/\{if([^}]*) (\!?)t\(([^)]+)\)([^}]*)\}/'),
+                        array('{if\1 \2(' . $perms . '->hasFlagCombination(\3))\4}',
+                              '{if\1 \2(' . $perms . '->hasFlag(\3))\4}',
+                              '{if\1 \2(isset(\3|smarty:nodefaults) && (\3|smarty:nodefaults))\4}'),
                         $source);
 }