X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatalpage.php;h=f3661d72c8ad0f59323084e92b0c496de8f37a6c;hb=30c895bee78befef50a6b99a585b5cec52cc0ede;hp=57e112f31acfa564ac174c7dbe774ed5083dc5d9;hpb=81e9c63f59b2f7040556d4f9232462e25a3d9f57;p=platal.git diff --git a/classes/platalpage.php b/classes/platalpage.php index 57e112f..f3661d7 100644 --- a/classes/platalpage.php +++ b/classes/platalpage.php @@ -1,6 +1,6 @@ _jsonVars = array(); $this->_failure = false; + if ($globals->mode != 'rw') { + $this->_errors[] = "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'); } @@ -61,9 +65,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,6 +92,7 @@ abstract class PlatalPage extends Smarty $this->register_prefilter('trimwhitespace'); $this->register_prefilter('form_force_encodings'); $this->register_prefilter('wiki_include'); + $this->register_prefilter('if_has_perms'); $this->assign('xorg_errors', $this->_errors); $this->assign('xorg_failure', $this->_failure); $this->assign('globals', $globals); @@ -95,7 +100,7 @@ abstract class PlatalPage extends Smarty if (Env::has('json') && count($this->_jsonVars)) { return $this->jsonDisplay(); } - + if (Env::v('display') == 'light') { $this->_page_type = SIMPLE; } elseif (Env::v('display') == 'raw') { @@ -116,10 +121,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')) { @@ -132,20 +139,24 @@ abstract class PlatalPage extends Smarty exit; } - if ($globals->debug & DEBUG_BT) { - PlBacktrace::clean(); - $this->assign_by_ref('backtraces', PlBacktrace::$bt); - } - $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 - Mémoire totale : %dKo
', microtime(true) - $TIME_BEGIN - , memory_get_peak_usage(true) / 1024); - $replc = "VALIDATION HTML INACTIVE
"; + $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); + } + $replc = "VALIDATION HTML INACTIVE
"; if ($globals->debug & DEBUG_VALID) { $fd = fopen($this->compile_dir."/valid.html","w"); fwrite($fd, $result); @@ -222,7 +233,7 @@ abstract class PlatalPage extends Smarty { if (!empty($css)) { $this->append('xorg_inline_css', $css); - } + } } // }}} @@ -276,7 +287,7 @@ function escape_xorgDB(&$item, $key) /** * default smarty plugin, used to auto-escape dangerous html. - * + * * < --> < * > --> > * " --> " @@ -285,10 +296,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; } } @@ -332,7 +342,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; } // }}} @@ -346,6 +356,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) @@ -363,11 +386,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