X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=b79fa1c169b5bb10f7109e2319f2319843a98a67;hb=75b5406387c0c362517dd905d561f7b616dddc96;hp=8cbbf13386c0ce3f7f6c7bf6344b7b0a45f01f51;hpb=7299bfcef8ccaffa52ecd0ca3adf92c84f79c248;p=platal.git

diff --git a/classes/plpage.php b/classes/plpage.php
index 8cbbf13..b79fa1c 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -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) {
@@ -165,6 +165,7 @@ abstract class PlPage extends Smarty
         if (!$globals->debug) {
             error_reporting(0);
             $this->display($skin);
+            pl_print_errors(true);
             exit;
         }
 
@@ -189,21 +190,14 @@ abstract class PlPage extends Smarty
 
         $replc  = "<span class='erreur'>VALIDATION HTML INACTIVE</span><br />";
         if ($globals->debug & DEBUG_VALID) {
+            global $platal;
             $fd = fopen($this->compile_dir."/valid.html","w");
             fwrite($fd, $result);
             fclose($fd);
 
-            exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$this->compile_dir."/valid.html", $val);
-            foreach ($val as $h) {
-                if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) {
-                    $replc = '<span style="color: #080;">HTML OK</span><br />';
-                    if ($m[1]) {
-                        $replc = "<span class='erreur'><a href='http://validator.w3.org/check?uri={$globals->baseurl}"
-                            ."/valid.html&amp;ss=1#result'>{$m[1]} ERREUR(S) !!!</a></span><br />";
-                    }
-                    break;
-                }
-            }
+            $replc = '<span id="html_valid"><span style="color: #860">VALIDATION HTML EN COURS</span></span>'
+                   . '<script type="text/javascript">$("#html_valid").updateHtml("validator");</script>'
+                   . '<br />';
         }
 
         echo str_replace("@HOOK@", $ttime.$replc, $result);
@@ -322,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);
         }
     }
 
@@ -371,9 +369,8 @@ abstract class PlPage extends Smarty
     protected function jsonDisplay()
     {
         pl_content_headers("text/javascript");
-        if (!empty($GLOBALS['pl_errors'])) {
-            $this->jsonAssign('pl_errors', join("\n", $GLOBALS['pl_errors']));
-            $GLOBALS['pl_errors'] = array();
+        if (!empty(PlBacktrace::$bt)) {
+            $this->jsonAssign('pl_backtraces', PlBacktrace::$bt);
         }
         array_walk_recursive($this->_jsonVars, "escape_XDB");
         $jsonbegin = Env::v('jsonBegin');
@@ -389,6 +386,17 @@ abstract class PlPage extends Smarty
         exit;
     }
     // }}}
+
+    public function runJSon()
+    {
+        pl_content_headers("text/javascript");
+        if (!empty(PlBacktrace::$bt)) {
+            $this->jsonAssign('pl_backtraces', PlBacktrace::$bt);
+        }
+        echo json_encode($this->_jsonVars);
+        exit;
+    }
+
     // {{{ function jsonAssign
     public function jsonAssign($var, $value)
     {
@@ -449,15 +457,36 @@ function _to_globals($s) {
  * compilation plugin used to import $globals confing through #globals.foo.bar# directives
  */
 
-function at_to_globals($tpl_source, &$smarty)
+function at_to_globals($tpl_source, $smarty)
 {
     return preg_replace('/#globals\.([a-zA-Z0-9_.]+?)#/e', '_to_globals(\'\\1\')', $tpl_source);
 }
 
 // }}}
+// {{{ 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)
+function trimwhitespace($source, $smarty)
 {
     $tags = '(script|pre|textarea)';
     preg_match_all("!<$tags.*?>.*?</(\\1)>!ius", $source, $tagsmatches);
@@ -474,7 +503,7 @@ function trimwhitespace($source, &$smarty)
 // }}}
 // {{{ function wiki_include
 
-function wiki_include($source, &$smarty)
+function wiki_include($source, $smarty)
 {
     global $globals;
     return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
@@ -482,18 +511,18 @@ function wiki_include($source, &$smarty)
                         $source);
 }
 
-function core_include($source, &$smarty)
+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);
 }
 
 // }}}
 //{{{ function hasPerm
 
-function if_rewrites($source, &$smarty)
+function if_rewrites($source, $smarty)
 {
     $perms = 'isset($smarty.session.user|smarty:nodefaults) && $smarty.session.user';
     return preg_replace(array('/\{(else)?if([^}]*) (\!?)hasPerms?\(([^)]+)\)([^}]*)\}/',
@@ -506,7 +535,7 @@ function if_rewrites($source, &$smarty)
 // }}}
 // {{{
 
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
 {
     return preg_replace('/<form[^\w]/',
                         '\0 accept-charset="utf-8" ',
@@ -524,7 +553,7 @@ function _hide_email($source)
         '//]]></script>';
 }
 
-function hide_emails($source, &$smarty)
+function hide_emails($source, $smarty)
 {
     if (!strpos($source, '@')) {
         return $source;
@@ -556,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:
 ?>