X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=c13410e063b96e31d56f3df73825abcb1802377b;hb=c504af53e5b3e13f19039f1ab03cd16279ce4967;hp=62602b0e4531f4b4f2d23617908dbf1f62fb627d;hpb=1e9a1d9943b72c5ef31f888e6266dc6322504fee;p=platal.git diff --git a/classes/plpage.php b/classes/plpage.php index 62602b0..c13410e 100644 --- a/classes/plpage.php +++ b/classes/plpage.php @@ -1,6 +1,6 @@ spoolroot . '/plugins/'); $this->config_dir = $globals->spoolroot . '/configs/'; - $this->compile_check = !empty($globals->debug); + $this->compile_check = !empty($globals->debug) || $globals->smarty_autocompile; $this->_errors = array('errors' => array()); $this->_jsonVars = array(); $this->_failure = false; if ($globals->mode != 'rw') { - $this->trigError("En raison d'une maintenance, une partie des fonctionnalités du site sont" - . " actuellement désactivée, en particuliers aucune donnée ne sera sauvegardée"); + $this->trigError("En raison d'une maintenance, une partie des fonctionnalités du site est" + . " actuellement désactivée, en particulier aucune donnée ne sera sauvegardée"); } $this->register_prefilter('at_to_globals'); - $this->addJsLink('jquery.js'); } // }}} @@ -106,7 +107,7 @@ abstract class PlPage extends Smarty protected function _run($skin) { - global $globals, $TIME_BEGIN; + global $globals, $platal, $TIME_BEGIN; Platal::session()->close(); @@ -114,10 +115,11 @@ abstract class PlPage extends Smarty $this->register_prefilter('form_force_encodings'); $this->register_prefilter('wiki_include'); $this->register_prefilter('core_include'); - $this->register_prefilter('if_has_perms'); + $this->register_prefilter('if_rewrites'); $this->assign('pl_triggers', $this->_errors); $this->assign('pl_errors', $this->nb_errs()); $this->assign('pl_failure', $this->_failure); + $this->assign_by_ref('platal', $platal); $this->assign_by_ref('globals', $globals); if (Env::has('json') && count($this->_jsonVars)) { @@ -132,6 +134,12 @@ abstract class PlPage extends Smarty $this->_page_typ = SKINNED; } + if ($this->_page_type == SIMPLE) { + $this->assign('simple', true); + } else { + $this->assign('simple', false); + } + switch ($this->_page_type) { case NO_SKIN: if (!($globals->debug & DEBUG_SMARTY)) { @@ -141,8 +149,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'); @@ -150,15 +156,15 @@ abstract class PlPage extends Smarty if (S::i('auth') <= AUTH_PUBLIC) { $this->register_outputfilter('hide_emails'); } - $this->addJsLink('wiki.js'); header("Accept-Charset: utf-8"); if (Env::v('forceXml')) { - header("Content-Type: text/xml; charset=utf-8"); + pl_content_headers("text/xml"); } if (!$globals->debug) { error_reporting(0); $this->display($skin); + pl_print_errors(true); exit; } @@ -241,24 +247,66 @@ 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) + public function kill($msg, $type = 'errors') { // 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; - $this->assign('platal', $platal); - $this->trigError($msg); + $this->trig($msg, $type); $this->_failure = true; $this->run(); } + public function killError($msg) + { + $this->kill($msg, 'errors'); + } + + public function killWarning($msg) + { + $this->kill($msg, 'warnings'); + } + + public function killSuccess($msg) + { + $this->kill($msg, 'success'); + } + // }}} // {{{ function setTitle @@ -274,9 +322,13 @@ abstract class PlPage extends Smarty // }}} // {{{ function addJsLink - public function addJsLink($path) + public function addJsLink($filename, $static_content = true) { - $this->append('pl_js', $path); + if ($static_content) { + $this->append('pl_js', pl_static_content_path("javascript/", $filename)); + } else { + $this->append('pl_js', "javascript/$filename"); + } } // }}} @@ -318,8 +370,11 @@ abstract class PlPage extends Smarty // {{{ function jsonDisplay protected function jsonDisplay() { - header("Content-type: text/javascript; charset=utf-8"); - array_walk_recursive($this->_jsonVars, "escape_xorgDB"); + pl_content_headers("text/javascript"); + 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')) { @@ -333,6 +388,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) { @@ -342,9 +408,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; @@ -437,13 +503,13 @@ function core_include($source, &$smarty) // }}} //{{{ function hasPerm -function if_has_perms($source, &$smarty) +function if_rewrites($source, &$smarty) { - $source = preg_replace('/\{if([^}]*) (\!?)hasPerms\(([^)]+)\)([^}]*)\}/', - '{if\1 \2$smarty.session.perms->hasFlagCombination(\3)\4}', - $source); - return preg_replace('/\{if([^}]*) (\!?)hasPerm\(([^)]+)\)([^}]*)\}/', - '{if\1 \2($smarty.session.perms && $smarty.session.perms->hasFlag(\3))\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); }