X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fplpage.php;h=a38a0769f2a544d00ba8526a54e043816f452e36;hb=e8e034fd9237000dba475f8ed890bc52115963d5;hp=15c81bfdcbacd30a2d1c957d58d959795bb44fa4;hpb=bf9d90c0821df2c226822c4691ef5e8ec633490d;p=platal.git

diff --git a/classes/plpage.php b/classes/plpage.php
index 15c81bf..a38a076 100644
--- 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   *
@@ -134,6 +134,12 @@ abstract class PlPage extends Smarty
             $this->_page_typ = SKINNED;
         }
 
+        if ($this->_page_type == SIMPLE) {
+            $this->assign('simple', true);
+        } else {
+            $this->assign('simple', false);
+        }
+
         switch ($this->_page_type) {
           case NO_SKIN:
             if (!($globals->debug & DEBUG_SMARTY)) {
@@ -143,8 +149,6 @@ abstract class PlPage extends Smarty
             exit;
 
           case SIMPLE:
-            $this->assign('simple', true);
-
           case SKINNED:
             $this->register_modifier('escape_html', 'escape_html');
             $this->default_modifiers = Array('@escape_html');
@@ -242,6 +246,34 @@ abstract class PlPage extends Smarty
     }
 
     // }}}
+    // {{{ function trigRedirect
+
+    // Acts as trig(), but replaces the template with a simple one displaying
+    // the error messages and a "continue" link.
+    private function trigRedirect($msg, $continue, $type = 'errors')
+    {
+        $this->trig($msg, $type);
+        $this->coreTpl('msgredirect.tpl');
+        $this->assign('continue', $continue);
+        $this->run();
+    }
+
+    public function trigErrorRedirect($msg, $continue)
+    {
+        $this->trigRedirect($msg, $continue, 'errors');
+    }
+
+    public function trigWarningRedirect($msg, $continue)
+    {
+        $this->trigRedirect($msg, $continue, 'warnings');
+    }
+
+    public function trigSuccessRedirect($msg, $continue)
+    {
+        $this->trigRedirect($msg, $continue, 'success');
+    }
+
+    // }}}
     // {{{ function kill()
 
     public function kill($msg, $type = 'errors')
@@ -249,7 +281,7 @@ abstract class PlPage extends Smarty
         // 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;
@@ -289,9 +321,13 @@ abstract class PlPage extends Smarty
     // }}}
     // {{{ function addJsLink
 
-    public function addJsLink($filename)
+    public function addJsLink($filename, $static_content = true)
     {
-        $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+        if ($static_content) {
+            $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+        } else {
+            $this->append('pl_js', "javascript/$filename");
+        }
     }
 
     // }}}