X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fplpage.php;h=56b0c8a17907189e02ec96469d5797809642ec40;hb=cab6c1c15dfa75c04b433447e608edb59171c376;hp=1fbbe23ed4968749f6a692792a2b1b047d4b15ca;hpb=b00a702a623367b9647e12732a2533f65871cf3c;p=platal.git
diff --git a/classes/plpage.php b/classes/plpage.php
index 1fbbe23..56b0c8a 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -1,6 +1,6 @@
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 = "VALIDATION HTML INACTIVE
";
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 = 'HTML OK
';
- if ($m[1]) {
- $replc = "{$m[1]} ERREUR(S) !!!
";
- }
- break;
- }
- }
+ $replc = 'VALIDATION HTML EN COURS'
+ . ''
+ . '
';
}
echo str_replace("@HOOK@", $ttime.$replc, $result);
@@ -370,9 +365,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');
@@ -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)
{
@@ -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,7 +497,7 @@ function core_include($source, &$smarty)
// }}}
//{{{ 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?\(([^)]+)\)([^}]*)\}/',
@@ -505,7 +510,7 @@ function if_rewrites($source, &$smarty)
// }}}
// {{{
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
{
return preg_replace('/