X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=b79fa1c169b5bb10f7109e2319f2319843a98a67;hb=c478640f940abe008fdcee0a9f04ea99faf50a22;hp=516378b29ce7d66dad9649e80e0fca462e336034;hpb=ed4f7de016bb136fae9f72256c827ef09d4ea863;p=platal.git

diff --git a/classes/plpage.php b/classes/plpage.php
index 516378b..b79fa1c 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -45,7 +45,7 @@ abstract class PlPage extends Smarty
         $this->template_dir  = $globals->spoolroot . '/templates/';
         $this->compile_dir   = $globals->spoolroot . '/spool/templates_c/';
         array_unshift($this->plugins_dir,
-                      $globals->spoolroot . '/core/plugins/',
+                      $globals->coreroot . '/plugins/',
                       $globals->spoolroot . '/plugins/');
         $this->config_dir    = $globals->spoolroot . '/configs/';
 
@@ -60,6 +60,7 @@ 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->register_prefilter('get_class_constants');
     }
 
     // }}}
@@ -78,7 +79,7 @@ abstract class PlPage extends Smarty
     public static function getCoreTpl($tpl)
     {
         global $globals;
-        return $globals->spoolroot . '/core/templates/' . $tpl;
+        return $globals->coreroot . '/templates/' . $tpl;
     }
 
     // }}}
@@ -88,7 +89,6 @@ abstract class PlPage extends Smarty
      */
     public function coreTpl($tpl, $type = SKINNED)
     {
-        global $globals;
         $this->changeTpl(self::getCoreTpl($tpl), $type);
     }
 
@@ -132,7 +132,7 @@ abstract class PlPage extends Smarty
         } elseif ($display == 'raw') {
             $this->_page_type = NO_SKIN;
         } elseif ($display == 'full') {
-            $this->_page_typ = SKINNED;
+            $this->_page_type = SKINNED;
         }
 
         if ($this->_page_type == SIMPLE) {
@@ -316,12 +316,16 @@ abstract class PlPage extends Smarty
     // }}}
     // {{{ function addJsLink
 
-    public function addJsLink($filename, $static_content = true)
+    public function addJsLink($filename, $internal = true, $static_content = true)
     {
-        if ($static_content) {
-            $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+        if ($internal) {
+            if ($static_content) {
+                $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+            } else {
+                $this->append('pl_js', "javascript/$filename");
+            }
         } else {
-            $this->append('pl_js', "javascript/$filename");
+            $this->append('pl_js', $filename);
         }
     }
 
@@ -459,6 +463,27 @@ function at_to_globals($tpl_source, $smarty)
 }
 
 // }}}
+// {{{ function get_class_constants()
+
+/**
+ * helper
+ */
+
+function _get_class_const($class, $const)
+{
+    return var_export(constant($class . '::' . $const), true);
+}
+
+/**
+ * Compilation plugin used to import class constants through calls to #Class::CONSTANT#
+ */
+
+function get_class_constants($tpl_source, $smarty)
+{
+    return preg_replace('/#([a-zA-Z0-9_]+)::([A-Z0-9_]+)#/e', '_get_class_const(\'\\1\',\'\\2\')', $tpl_source);
+}
+
+// }}}
 // {{{  function trimwhitespace
 
 function trimwhitespace($source, $smarty)
@@ -490,7 +515,7 @@ function core_include($source, $smarty)
 {
     global $globals;
     return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui',
-                        '{include\1 file="' . $globals->spoolroot . '/core/templates/\2"\3}',
+                        '{include\1 file="' . $globals->coreroot . '/templates/\2"\3}',
                         $source);
 }
 
@@ -560,5 +585,5 @@ function hide_emails($source, $smarty)
 
 // }}}
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>