X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=258a8c3c474ef2deedc0be1436a765af3347c527;hb=f23d33e1b114e9032b4b966baebdeb14b4215313;hp=94ea220f6fa2b02063d96de17d0bac68ce276548;hpb=5640f0939025e7741d40ec18577a9aae8c2f80a5;p=platal.git diff --git a/classes/plpage.php b/classes/plpage.php index 94ea220..258a8c3 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(); @@ -60,7 +60,6 @@ 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->addJsLink('jquery.js'); } // }}} @@ -108,7 +107,7 @@ abstract class PlPage extends Smarty protected function _run($skin) { - global $globals, $TIME_BEGIN; + global $globals, $platal, $TIME_BEGIN; Platal::session()->close(); @@ -116,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)) { @@ -134,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)) { @@ -143,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'); @@ -152,10 +156,9 @@ 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) { @@ -243,24 +246,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 @@ -276,9 +321,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"); + } } // }}} @@ -320,7 +369,11 @@ abstract class PlPage extends Smarty // {{{ function jsonDisplay protected function jsonDisplay() { - header("Content-type: text/javascript; charset=utf-8"); + pl_content_headers("text/javascript"); + if (!empty($GLOBALS['pl_errors'])) { + $this->jsonAssign('pl_errors', join("\n", $GLOBALS['pl_errors'])); + $GLOBALS['pl_errors'] = array(); + } array_walk_recursive($this->_jsonVars, "escape_xorgDB"); $jsonbegin = Env::v('jsonBegin'); $jsonend = Env::v('jsonEnd'); @@ -439,13 +492,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); }