X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=26445c9ac721ac9cb0ffc1c5901b8ead563a4bb8;hb=b631d8034a2ef2f092d6b29dfdb327182ebf1f6e;hp=2dacba426ecfe10c5d4c0303f46e602112f01b96;hpb=380e2a5ab0f7c9edbf73c76259cb0c38119e53af;p=platal.git

diff --git a/classes/plpage.php b/classes/plpage.php
index 2dacba4..26445c9 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -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   *
@@ -19,7 +19,9 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'smarty/libs/Smarty.class.php';
+if (!@include_once 'smarty/libs/Smarty.class.php') {
+    require_once 'smarty/Smarty.class.php';
+}
 
 abstract class PlPage extends Smarty
 {
@@ -54,11 +56,10 @@ abstract class PlPage extends Smarty
         $this->_failure   = false;
 
         if ($globals->mode != 'rw') {
-            $this->trigError("En raison d'une maintenance, une partie des fonctionnalités du site sont"
-                             . " actuellement désactivée, en particuliers aucune donnée ne sera sauvegardée");
+            $this->trigError("En raison d'une maintenance, une partie des fonctionnalités du site est"
+                             . " actuellement désactivée, en particulier aucune donnée ne sera sauvegardée");
         }
         $this->register_prefilter('at_to_globals');
-        $this->addJsLink('xorg.js');
         $this->addJsLink('jquery.js');
     }
 
@@ -73,6 +74,26 @@ abstract class PlPage extends Smarty
     }
 
     // }}}
+    // {{{ function getCoreTpl()
+
+    public static function getCoreTpl($tpl)
+    {
+        global $globals;
+        return $globals->spoolroot . '/core/templates/' . $tpl;
+    }
+
+    // }}}
+    // {{{ function coreTpl()
+
+    /** Use a template from the core.
+     */
+    public function coreTpl($tpl, $type = SKINNED)
+    {
+        global $globals;
+        $this->changeTpl(self::getCoreTpl($tpl), $type);
+    }
+
+    // }}}
     // {{{ function raw()
 
     public function raw()
@@ -87,17 +108,19 @@ abstract class PlPage extends Smarty
 
     protected function _run($skin)
     {
-        global $globals, $TIME_BEGIN;
+        global $globals, $platal, $TIME_BEGIN;
 
         Platal::session()->close();
 
         $this->register_prefilter('trimwhitespace');
         $this->register_prefilter('form_force_encodings');
         $this->register_prefilter('wiki_include');
+        $this->register_prefilter('core_include');
         $this->register_prefilter('if_has_perms');
         $this->assign('pl_triggers', $this->_errors);
         $this->assign('pl_errors', $this->nb_errs());
         $this->assign('pl_failure', $this->_failure);
+        $this->assign_by_ref('platal', $platal);
         $this->assign_by_ref('globals', $globals);
 
         if (Env::has('json') && count($this->_jsonVars)) {
@@ -154,7 +177,9 @@ abstract class PlPage extends Smarty
         if ($globals->debug & DEBUG_BT) {
             PlBacktrace::clean();
             $this->assign_by_ref('backtraces', PlBacktrace::$bt);
-            $result = str_replace('@@BACKTRACE@@', $this->fetch('skin/common.backtrace.tpl'), $result);
+            $result = str_replace('@@BACKTRACE@@',
+                                  $this->fetch(self::getCoreTpl('backtrace.tpl')),
+                                  $result);
         } else {
             $result = str_replace('@@BACKTRACE@@', '', $result);
         }
@@ -231,7 +256,6 @@ abstract class PlPage extends Smarty
 
         global $platal;
 
-        $this->assign('platal', $platal);
         $this->trigError($msg);
         $this->_failure = true;
         $this->run();
@@ -266,6 +290,15 @@ abstract class PlPage extends Smarty
     }
 
     // }}}
+    // {{{ function addLink
+
+    public function addLink($rel, $path)
+    {
+        $this->append('pl_link', array('rel' => $rel, 'href' => $path));
+    }
+
+
+    // }}}
     // {{{ function addCssInline
 
     public function addCssInline($css)
@@ -313,7 +346,7 @@ abstract class PlPage extends Smarty
 
 function escape_xorgDB(&$item, $key)
 {
-    if (is_a($item, 'XOrgDBIterator')) {
+    if ($item instanceof XOrgDBIterator) {
         $expanded = array();
         while ($a = $item->next()) {
             $expanded[] = $a;
@@ -365,32 +398,41 @@ function _to_globals($s) {
 function at_to_globals($tpl_source, &$smarty)
 {
     return preg_replace('/#globals\.([a-zA-Z0-9_.]+?)#/e', '_to_globals(\'\\1\')', $tpl_source);
-                        }
+}
 
-                        // }}}
-                        // {{{  function trimwhitespace
+// }}}
+// {{{  function trimwhitespace
 
-                        function trimwhitespace($source, &$smarty)
-                        {
-                        $tags = '(script|pre|textarea)';
-                        preg_match_all("!<$tags.*?>.*?</(\\1)>!ius", $source, $tagsmatches);
-                        $source = preg_replace("!<$tags.*?>.*?</(\\1)>!ius", "&&&tags&&&", $source);
+function trimwhitespace($source, &$smarty)
+{
+    $tags = '(script|pre|textarea)';
+    preg_match_all("!<$tags.*?>.*?</(\\1)>!ius", $source, $tagsmatches);
+    $source = preg_replace("!<$tags.*?>.*?</(\\1)>!ius", "&&&tags&&&", $source);
 
-                        // remove all leading spaces, tabs and carriage returns NOT
-                        // preceeded by a php close tag.
-                        $source = preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source);
-                        $source = preg_replace("!&&&tags&&&!e",  'array_shift($tagsmatches[0])', $source);
+    // remove all leading spaces, tabs and carriage returns NOT
+    // preceeded by a php close tag.
+    $source = preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source);
+    $source = preg_replace("!&&&tags&&&!e",  'array_shift($tagsmatches[0])', $source);
 
-                        return $source;
-                        }
+    return $source;
+}
 
-                        // }}}
-                        // {{{ function wiki_include
+// }}}
+// {{{ function wiki_include
 
 function wiki_include($source, &$smarty)
 {
+    global $globals;
     return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
-                        '{include\1 file="../spool/wiki.d/cache_\2.tpl"\3 included=1}',
+                        '{include\1 file="' . $globals->spoolroot . '/spool/wiki.d/cache_\2.tpl"\3 included=1}',
+                        $source);
+}
+
+function core_include($source, &$smarty)
+{
+    global $globals;
+    return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui',
+                        '{include\1 file="' . $globals->spoolroot . '/core/templates/\2"\3}',
                         $source);
 }
 
@@ -400,11 +442,11 @@ function wiki_include($source, &$smarty)
 function if_has_perms($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}',
-       $source);
+                           '{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}',
+                        $source);
 }
 
 // }}}