X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatalpage.php;h=f3bb2fa760d3225c9af81d673484f937d4bce242;hb=06df222b7962dd5b71b34ec1dd078276d7327dbc;hp=096c39d34cfb2cf3e032d5c961987823f0d32b09;hpb=7a3f546bc4d1a0577f0ffbc2adf106ddab377749;p=platal.git diff --git a/classes/platalpage.php b/classes/platalpage.php index 096c39d..f3bb2fa 100644 --- a/classes/platalpage.php +++ b/classes/platalpage.php @@ -1,6 +1,6 @@ compile_check = !empty($globals->debug); $this->changeTpl($tpl, $type); - $this->_errors = array(); + $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->register_prefilter('at_to_globals'); $this->addJsLink('xorg.js'); + $this->addJsLink('jquery.js'); } // }}} @@ -61,9 +66,9 @@ abstract class PlatalPage extends Smarty public function changeTpl($tpl, $type = SKINNED) { - $this->_tpl = $tpl; - $this->_page_type = $type; - $this->assign('xorg_tpl', $tpl); + $this->_tpl = $tpl; + $this->_page_type = $type; + $this->assign('xorg_tpl', $tpl); } // }}} @@ -88,14 +93,16 @@ abstract class PlatalPage extends Smarty $this->register_prefilter('trimwhitespace'); $this->register_prefilter('form_force_encodings'); $this->register_prefilter('wiki_include'); - $this->assign('xorg_errors', $this->_errors); + $this->register_prefilter('if_has_perms'); + $this->assign('xorg_triggers', $this->_errors); + $this->assign('xorg_errors', $this->nb_errs()); $this->assign('xorg_failure', $this->_failure); $this->assign('globals', $globals); if (Env::has('json') && count($this->_jsonVars)) { return $this->jsonDisplay(); } - + if (Env::v('display') == 'light') { $this->_page_type = SIMPLE; } elseif (Env::v('display') == 'raw') { @@ -106,7 +113,9 @@ abstract class PlatalPage extends Smarty switch ($this->_page_type) { case NO_SKIN: - error_reporting(0); + if (!($globals->debug & DEBUG_SMARTY)) { + error_reporting(0); + } $this->display($this->_tpl); exit; @@ -114,10 +123,12 @@ abstract class PlatalPage extends Smarty $this->assign('simple', true); case SKINNED: - $this->register_modifier('escape_html', 'escape_html'); - $this->default_modifiers = Array('@escape_html'); + $this->register_modifier('escape_html', 'escape_html'); + $this->default_modifiers = Array('@escape_html'); + } + if (S::i('auth') <= AUTH_PUBLIC) { + $this->register_outputfilter('hide_emails'); } - $this->register_outputfilter('hide_emails'); $this->addJsLink('wiki.js'); header("Accept-Charset: utf-8"); if (Env::v('forceXml')) { @@ -130,19 +141,25 @@ abstract class PlatalPage extends Smarty exit; } - if ($globals->debug & 1) { + $this->assign('validate', true); + if (!($globals->debug & DEBUG_SMARTY)) { + error_reporting(0); + } + $START_SMARTY = microtime(true); + $result = $this->fetch($skin); + $ttime = sprintf('Temps total: %.02fs (Smarty %.02fs) - Mémoire totale : %dKo
', + microtime(true) - $TIME_BEGIN, microtime(true) - $START_SMARTY, + memory_get_peak_usage(true) / 1024); + if ($globals->debug & DEBUG_BT) { PlBacktrace::clean(); $this->assign_by_ref('backtraces', PlBacktrace::$bt); + $result = str_replace('@@BACKTRACE@@', $this->fetch('skin/common.backtrace.tpl'), $result); + } else { + $result = str_replace('@@BACKTRACE@@', '', $result); } - $this->assign('validate', true); - error_reporting(0); - $result = $this->fetch($skin); - $ttime = sprintf('Temps total: %.02fs - Mémoire totale : %dKo
', microtime(true) - $TIME_BEGIN - , memory_get_peak_usage(true) / 1024); $replc = "VALIDATION HTML INACTIVE
"; - - if ($globals->debug & 2) { + if ($globals->debug & DEBUG_VALID) { $fd = fopen($this->compile_dir."/valid.html","w"); fwrite($fd, $result); fclose($fd); @@ -171,15 +188,33 @@ abstract class PlatalPage extends Smarty public function nb_errs() { - return count($this->_errors); + return count($this->_errors['errors']); } // }}} // {{{ function trig() - public function trig($msg) + private function trig($msg, $type = 'errors') + { + if (!isset($this->_errors[$type])) { + $this->_errors[$type] = array(); + } + $this->_errors[$type][] = $msg; + } + + public function trigError($msg) { - $this->_errors[] = $msg; + $this->trig($msg, 'errors'); + } + + public function trigWarning($msg) + { + $this->trig($msg, 'warnings'); + } + + public function trigSuccess($msg) + { + $this->trig($msg, 'success'); } // }}} @@ -190,7 +225,7 @@ abstract class PlatalPage extends Smarty global $platal; $this->assign('platal', $platal); - $this->trig($msg); + $this->trigError($msg); $this->_failure = true; $this->run(); } @@ -218,7 +253,7 @@ abstract class PlatalPage extends Smarty { if (!empty($css)) { $this->append('xorg_inline_css', $css); - } + } } // }}} @@ -272,7 +307,7 @@ function escape_xorgDB(&$item, $key) /** * default smarty plugin, used to auto-escape dangerous html. - * + * * < --> < * > --> > * " --> " @@ -281,10 +316,9 @@ function escape_xorgDB(&$item, $key) function escape_html($string) { if (is_string($string)) { - $transtbl = Array('<' => '<', '>' => '>', '"' => '"', '\'' => '''); - return strtr($string, $transtbl); + return htmlspecialchars($string, ENT_QUOTES, 'UTF-8'); } else { - return $string; + return $string; } } @@ -328,7 +362,7 @@ function trimwhitespace($source, &$smarty) $source = preg_replace('/((?)\n)[\s]+/m', '\1', $source); $source = preg_replace("!&&&tags&&&!e", 'array_shift($tagsmatches[0])', $source); - return $source; + return $source; } // }}} @@ -342,6 +376,19 @@ function wiki_include($source, &$smarty) } // }}} +//{{{ function hasPerm + +function if_has_perms($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}', + $source); +} + +// }}} // {{{ function form_force_encodings($source, &$smarty) @@ -359,11 +406,15 @@ function _hide_email($source) $source = str_replace("\n", '', $source); return ''; + '//]]>'; } function hide_emails($source, &$smarty) { + if (!strpos($source, '@')) { + return $source; + } + //prevent email replacement in