X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=56b0c8a17907189e02ec96469d5797809642ec40;hb=1623168586bac6073585130fc2aa864345463ac6;hp=63ece95d1ca64b1b8cd74a6a57d3e8c01c7137d7;hpb=641802fe13bbd3812e39a0151392179eba580162;p=platal.git

diff --git a/classes/plpage.php b/classes/plpage.php
index 63ece95..56b0c8a 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   *
@@ -126,12 +126,13 @@ abstract class PlPage extends Smarty
             return $this->jsonDisplay();
         }
 
-        if (Env::v('display') == 'light') {
+        $display = Env::s('display');
+        if ($display == 'light' && $this->_page_type == SKINNED) {
             $this->_page_type = SIMPLE;
-        } elseif (Env::v('display') == 'raw') {
+        } elseif ($display == 'raw') {
             $this->_page_type = NO_SKIN;
-        } elseif (Env::v('display') == 'full') {
-            $this->_page_typ = SKINNED;
+        } elseif ($display == 'full') {
+            $this->_page_type = SKINNED;
         }
 
         if ($this->_page_type == SIMPLE) {
@@ -164,6 +165,7 @@ abstract class PlPage extends Smarty
         if (!$globals->debug) {
             error_reporting(0);
             $this->display($skin);
+            pl_print_errors(true);
             exit;
         }
 
@@ -188,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);
@@ -370,11 +365,10 @@ 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_xorgDB");
+        array_walk_recursive($this->_jsonVars, "escape_XDB");
         $jsonbegin = Env::v('jsonBegin');
         $jsonend = Env::v('jsonEnd');
         if (Env::has('jsonVar')) {
@@ -388,6 +382,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)
     {
@@ -397,9 +402,9 @@ abstract class PlPage extends Smarty
     // }}}
 }
 
-function escape_xorgDB(&$item, $key)
+function escape_XDB(&$item, $key)
 {
-    if ($item instanceof XOrgDBIterator) {
+    if ($item instanceof XDBIterator) {
         $expanded = array();
         while ($a = $item->next()) {
             $expanded[] = $a;
@@ -448,7 +453,7 @@ 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);
 }
@@ -456,7 +461,7 @@ function at_to_globals($tpl_source, &$smarty)
 // }}}
 // {{{  function trimwhitespace
 
-function trimwhitespace($source, &$smarty)
+function trimwhitespace($source, $smarty)
 {
     $tags = '(script|pre|textarea)';
     preg_match_all("!<$tags.*?>.*?</(\\1)>!ius", $source, $tagsmatches);
@@ -473,7 +478,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',
@@ -481,7 +486,7 @@ function wiki_include($source, &$smarty)
                         $source);
 }
 
-function core_include($source, &$smarty)
+function core_include($source, $smarty)
 {
     global $globals;
     return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui',
@@ -492,22 +497,20 @@ function core_include($source, &$smarty)
 // }}}
 //{{{ function hasPerm
 
-function if_rewrites($source, &$smarty)
+function if_rewrites($source, $smarty)
 {
-    $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}'),
+    $perms = 'isset($smarty.session.user|smarty:nodefaults) && $smarty.session.user';
+    return preg_replace(array('/\{(else)?if([^}]*) (\!?)hasPerms?\(([^)]+)\)([^}]*)\}/',
+                              '/\{(else)?if([^}]*) (\!?)t\(([^)]+)\)([^}]*)\}/'),
+                        array('{\1if\2 \3(' . $perms . '->checkPerms(\4))\5}',
+                              '{\1if\2 \3(isset(\4|smarty:nodefaults) && (\4|smarty:nodefaults))\5}'),
                         $source);
 }
 
 // }}}
 // {{{
 
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
 {
     return preg_replace('/<form[^\w]/',
                         '\0 accept-charset="utf-8" ',
@@ -525,7 +528,7 @@ function _hide_email($source)
         '//]]></script>';
 }
 
-function hide_emails($source, &$smarty)
+function hide_emails($source, $smarty)
 {
     if (!strpos($source, '@')) {
         return $source;