X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=56b0c8a17907189e02ec96469d5797809642ec40;hb=1623168586bac6073585130fc2aa864345463ac6;hp=15c81bfdcbacd30a2d1c957d58d959795bb44fa4;hpb=bf9d90c0821df2c226822c4691ef5e8ec633490d;p=platal.git diff --git a/classes/plpage.php b/classes/plpage.php index 15c81bf..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) { + $this->assign('simple', true); + } else { + $this->assign('simple', false); } switch ($this->_page_type) { @@ -143,8 +150,6 @@ abstract class PlPage extends Smarty exit; case SIMPLE: - $this->assign('simple', true); - case SKINNED: $this->register_modifier('escape_html', 'escape_html'); $this->default_modifiers = Array('@escape_html'); @@ -160,6 +165,7 @@ abstract class PlPage extends Smarty if (!$globals->debug) { error_reporting(0); $this->display($skin); + pl_print_errors(true); exit; } @@ -184,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); @@ -242,6 +241,34 @@ abstract class PlPage extends Smarty } // }}} + // {{{ function trigRedirect + + // Acts as trig(), but replaces the template with a simple one displaying + // the error messages and a "continue" link. + private function trigRedirect($msg, $continue, $type = 'errors') + { + $this->trig($msg, $type); + $this->coreTpl('msgredirect.tpl'); + $this->assign('continue', $continue); + $this->run(); + } + + public function trigErrorRedirect($msg, $continue) + { + $this->trigRedirect($msg, $continue, 'errors'); + } + + public function trigWarningRedirect($msg, $continue) + { + $this->trigRedirect($msg, $continue, 'warnings'); + } + + public function trigSuccessRedirect($msg, $continue) + { + $this->trigRedirect($msg, $continue, 'success'); + } + + // }}} // {{{ function kill() public function kill($msg, $type = 'errors') @@ -249,7 +276,7 @@ abstract class PlPage extends Smarty // PHP is used on command line... do not run the whole page stuff. if (php_sapi_name() == 'cli') { echo $msg . "\n"; - exit; + exit(-1); } global $platal; @@ -289,9 +316,13 @@ abstract class PlPage extends Smarty // }}} // {{{ function addJsLink - public function addJsLink($filename) + public function addJsLink($filename, $static_content = true) { - $this->append('pl_js', pl_static_content_path("javascript/", $filename)); + if ($static_content) { + $this->append('pl_js', pl_static_content_path("javascript/", $filename)); + } else { + $this->append('pl_js', "javascript/$filename"); + } } // }}} @@ -334,7 +365,10 @@ abstract class PlPage extends Smarty protected function jsonDisplay() { pl_content_headers("text/javascript"); - array_walk_recursive($this->_jsonVars, "escape_xorgDB"); + if (!empty(PlBacktrace::$bt)) { + $this->jsonAssign('pl_backtraces', PlBacktrace::$bt); + } + array_walk_recursive($this->_jsonVars, "escape_XDB"); $jsonbegin = Env::v('jsonBegin'); $jsonend = Env::v('jsonEnd'); if (Env::has('jsonVar')) { @@ -348,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) { @@ -357,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; @@ -408,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); } @@ -416,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.*?>.*?!ius", $source, $tagsmatches); @@ -433,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', @@ -441,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', @@ -452,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('/'; } -function hide_emails($source, &$smarty) +function hide_emails($source, $smarty) { if (!strpos($source, '@')) { return $source;