X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fplatalpage.php;h=f3bb2fa760d3225c9af81d673484f937d4bce242;hb=92c3f9e5a1c480d9c25dd98aff56e792c378d0fe;hp=ab830665982f105feb8606419168b5383a1cd41f;hpb=2456ea61eabd3791d810516c615afa0ad967b86c;p=platal.git
diff --git a/classes/platalpage.php b/classes/platalpage.php
index ab83066..f3bb2fa 100644
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -1,6 +1,6 @@
Smarty();
+ global $globals;
+ $this->caching = false;
+ $this->config_overwrite = false;
+ $this->use_sub_dirs = false;
$this->template_dir = $globals->spoolroot."/templates/";
$this->compile_dir = $globals->spoolroot."/spool/templates_c/";
array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/");
@@ -48,42 +47,75 @@ class PlatalPage extends Smarty
$this->compile_check = !empty($globals->debug);
- $this->_page_type = $type;
- $this->_tpl = $tpl;
- $this->_errors = array();
+ $this->changeTpl($tpl, $type);
+ $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->register_prefilter('trimwhitespace');
$this->addJsLink('xorg.js');
+ $this->addJsLink('jquery.js');
}
// }}}
// {{{ function changeTpl()
- function changeTpl($tpl, $type = SKINNED)
+ 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);
+ }
+
+ // }}}
+ // {{{ function raw()
+
+ public function raw()
+ {
+ global $globals;
+ $this->assign('globals', $globals);
+ return $this->fetch($this->_tpl);
}
// }}}
// {{{ function _run()
- function _run($skin)
+ protected function _run($skin)
{
global $globals, $TIME_BEGIN;
session_write_close();
- $this->assign('xorg_errors', $this->_errors);
+ $this->register_prefilter('trimwhitespace');
+ $this->register_prefilter('form_force_encodings');
+ $this->register_prefilter('wiki_include');
+ $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') {
+ $this->_page_type = NO_SKIN;
+ } elseif (Env::v('display') == 'full') {
+ $this->_page_typ = SKINNED;
+ }
+
switch ($this->_page_type) {
case NO_SKIN:
- error_reporting(0);
+ if (!($globals->debug & DEBUG_SMARTY)) {
+ error_reporting(0);
+ }
$this->display($this->_tpl);
exit;
@@ -91,11 +123,17 @@ 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')) {
+ header("Content-Type: text/xml; charset=utf-8");
+ }
if (!$globals->debug) {
error_reporting(0);
@@ -103,18 +141,25 @@ class PlatalPage extends Smarty
exit;
}
- if ($globals->debug & 1) {
- $this->assign('db_trace', XDB::trace_format($this, 'database-debug.tpl'));
- }
-
$this->assign('validate', true);
- error_reporting(0);
+ if (!($globals->debug & DEBUG_SMARTY)) {
+ error_reporting(0);
+ }
+ $START_SMARTY = microtime(true);
$result = $this->fetch($skin);
- $ttime = sprintf('Temps total: %.02fs
', microtime_float() - $TIME_BEGIN);
- $replc = "VALIDATION HTML INACTIVE
";
-
- if ($globals->debug & 2) {
+ $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);
fclose($fd);
@@ -136,31 +181,51 @@ class PlatalPage extends Smarty
exit;
}
+ abstract public function run();
+
// }}}
// {{{ function nb_errs()
- function nb_errs()
+ public function nb_errs()
{
- return count($this->_errors);
+ return count($this->_errors['errors']);
}
// }}}
// {{{ function trig()
- function trig($msg)
+ private function trig($msg, $type = 'errors')
{
- $this->_errors[] = $msg;
+ if (!isset($this->_errors[$type])) {
+ $this->_errors[$type] = array();
+ }
+ $this->_errors[$type][] = $msg;
+ }
+
+ public function trigError($msg)
+ {
+ $this->trig($msg, 'errors');
+ }
+
+ public function trigWarning($msg)
+ {
+ $this->trig($msg, 'warnings');
+ }
+
+ public function trigSuccess($msg)
+ {
+ $this->trig($msg, 'success');
}
// }}}
// {{{ function kill()
- function kill($msg)
+ public function kill($msg)
{
global $platal;
$this->assign('platal', $platal);
- $this->trig($msg);
+ $this->trigError($msg);
$this->_failure = true;
$this->run();
}
@@ -168,7 +233,7 @@ class PlatalPage extends Smarty
// }}}
// {{{ function addJsLink
- function addJsLink($path)
+ public function addJsLink($path)
{
$this->append('xorg_js', $path);
}
@@ -176,27 +241,73 @@ class PlatalPage extends Smarty
// }}}
// {{{ function addCssLink
- function addCssLink($path)
+ public function addCssLink($path)
{
$this->append('xorg_css', $path);
}
// }}}
+ // {{{ function addCssInline
+
+ public function addCssInline($css)
+ {
+ if (!empty($css)) {
+ $this->append('xorg_inline_css', $css);
+ }
+ }
+
+ // }}}
// {{{ function setRssLink
- function setRssLink($title, $path)
+ public function setRssLink($title, $path)
{
$this->assign('xorg_rss', array('title' => $title, 'href' => $path));
}
// }}}
+ // {{{ function jsonDisplay
+ protected function jsonDisplay()
+ {
+ header("Content-type: text/javascript; charset=utf-8");
+ array_walk_recursive($this->_jsonVars, "escape_xorgDB");
+ $jsonbegin = Env::v('jsonBegin');
+ $jsonend = Env::v('jsonEnd');
+ if (Env::has('jsonVar')) {
+ $jsonbegin = Env::v('jsonVar').' = ';
+ $jsonend = ';';
+ } elseif (Env::has('jsonFunc')) {
+ $jsonbegin = Env::v('jsonFunc').'(';
+ $jsonend = ');';
+ }
+ echo $jsonbegin, json_encode($this->_jsonVars), $jsonend;
+ exit;
+ }
+ // }}}
+ // {{{ function jsonAssign
+ public function jsonAssign($var, $value)
+ {
+ $this->_jsonVars[$var] = $value;
+ }
+
+ // }}}
+}
+
+function escape_xorgDB(&$item, $key)
+{
+ if (is_a($item, 'XOrgDBIterator')) {
+ $expanded = array();
+ while ($a = $item->next()) {
+ $expanded[] = $a;
+ }
+ $item = $expanded;
+ }
}
// {{{ function escape_html ()
/**
* default smarty plugin, used to auto-escape dangerous html.
- *
+ *
* < --> <
* > --> >
* " --> "
@@ -205,10 +316,9 @@ class PlatalPage extends Smarty
function escape_html($string)
{
if (is_string($string)) {
- $transtbl = Array('<' => '<', '>' => '>', '"' => '"', '\'' => ''');
- return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,4};)/", "&" , strtr($string, $transtbl));
+ return htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
} else {
- return $string;
+ return $string;
}
}
@@ -243,22 +353,49 @@ function at_to_globals($tpl_source, &$smarty)
function trimwhitespace($source, &$smarty)
{
- $tags = array('script', 'pre', 'textarea');
-
- foreach ($tags as $tag) {
- preg_match_all("!<{$tag}[^>]+>.*?{$tag}>!is", $source, ${$tag});
- $source = preg_replace("!<{$tag}[^>]+>.*?{$tag}>!is", "&&&{$tag}&&&", $source);
- }
+ $tags = '(script|pre|textarea)';
+ preg_match_all("!<$tags.*?>.*?(\\1)>!ius", $source, $tagsmatches);
+ $source = preg_replace("!<$tags.*?>.*?(\\1)>!ius", "&&&tags&&&", $source);
// remove all leading spaces, tabs and carriage returns NOT
// preceeded by a php close tag.
$source = preg_replace('/((?)\n)[\s]+/m', '\1', $source);
+ $source = preg_replace("!&&&tags&&&!e", 'array_shift($tagsmatches[0])', $source);
- foreach ($tags as $tag) {
- $source = preg_replace("!&&&{$tag}&&&!e", 'array_shift(${$tag}[0])', $source);
- }
+ return $source;
+}
+
+// }}}
+// {{{ function wiki_include
+
+function wiki_include($source, &$smarty)
+{
+ return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
+ '{include\1 file="../spool/wiki.d/cache_\2.tpl"\3 included=1}',
+ $source);
+}
+
+// }}}
+//{{{ 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);
+}
- return $source;
+// }}}
+// {{{
+
+function form_force_encodings($source, &$smarty)
+{
+ return preg_replace('/