X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=875981e674af398446983a1985c80ef609b4dbff;hb=fc2cfa65c5e0d22fb1711827009064bc1909c1c6;hp=30a29b3e3ea5c662eacd795a07a465f6877b3bde;hpb=abde67b15ea173b2fd8f5a194eb6e0f72d332661;p=platal.git diff --git a/classes/plpage.php b/classes/plpage.php index 30a29b3..875981e 100644 --- a/classes/plpage.php +++ b/classes/plpage.php @@ -1,6 +1,6 @@ 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/"); - $this->config_dir = $globals->spoolroot."/configs/"; + $this->template_dir = $globals->spoolroot . '/templates/'; + $this->compile_dir = $globals->spoolroot . '/spool/templates_c/'; + array_unshift($this->plugins_dir, + $globals->spoolroot . '/core/plugins/', + $globals->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('xorg.js'); - $this->addJsLink('jquery.js'); } // }}} @@ -65,9 +67,29 @@ abstract class PlPage 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('pl_tpl', $tpl); + } + + // }}} + // {{{ function getCoreTpl() + + public static function getCoreTpl($tpl) + { + global $globals; + return $globals->spoolroot . '/core/templates/' . $tpl; + } + + // }}} + // {{{ function coreTpl() + + /** Use a template from the core. + */ + public function coreTpl($tpl, $type = SKINNED) + { + global $globals; + $this->changeTpl(self::getCoreTpl($tpl), $type); } // }}} @@ -85,18 +107,20 @@ abstract class PlPage extends Smarty protected function _run($skin) { - global $globals, $TIME_BEGIN; + global $globals, $platal, $TIME_BEGIN; - session_write_close(); + Platal::session()->close(); $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); + $this->register_prefilter('core_include'); + $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)) { return $this->jsonDisplay(); @@ -128,10 +152,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) { @@ -152,7 +175,9 @@ abstract class PlPage extends Smarty 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); + $result = str_replace('@@BACKTRACE@@', + $this->fetch(self::getCoreTpl('backtrace.tpl')), + $result); } else { $result = str_replace('@@BACKTRACE@@', '', $result); } @@ -219,22 +244,58 @@ abstract class PlPage extends Smarty // }}} // {{{ 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(-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 + + public function setTitle($title) + { + global $globals; + if (isset($globals->core->sitename)) { + $title = $globals->core->sitename . ' :: ' . $title; + } + $this->assign('pl_title', $title); + } + // }}} // {{{ function addJsLink - public function addJsLink($path) + public function addJsLink($filename, $static_content = true) { - $this->append('xorg_js', $path); + if ($static_content) { + $this->append('pl_js', pl_static_content_path("javascript/", $filename)); + } else { + $this->append('pl_js', "javascript/$filename"); + } } // }}} @@ -242,16 +303,25 @@ abstract class PlPage extends Smarty public function addCssLink($path) { - $this->append('xorg_css', $path); + $this->append('pl_css', $path); } // }}} + // {{{ function addLink + + public function addLink($rel, $path) + { + $this->append('pl_link', array('rel' => $rel, 'href' => $path)); + } + + + // }}} // {{{ function addCssInline public function addCssInline($css) { if (!empty($css)) { - $this->append('xorg_inline_css', $css); + $this->append('pl_inline_css', $css); } } @@ -260,14 +330,14 @@ abstract class PlPage extends Smarty public function setRssLink($title, $path) { - $this->assign('xorg_rss', array('title' => $title, 'href' => $path)); + $this->assign('pl_rss', array('title' => $title, 'href' => $path)); } // }}} // {{{ function jsonDisplay protected function jsonDisplay() { - header("Content-type: text/javascript; charset=utf-8"); + pl_content_headers("text/javascript"); array_walk_recursive($this->_jsonVars, "escape_xorgDB"); $jsonbegin = Env::v('jsonBegin'); $jsonend = Env::v('jsonEnd'); @@ -293,7 +363,7 @@ abstract class PlPage extends Smarty function escape_xorgDB(&$item, $key) { - if (is_a($item, 'XOrgDBIterator')) { + if ($item instanceof XOrgDBIterator) { $expanded = array(); while ($a = $item->next()) { $expanded[] = $a; @@ -369,21 +439,32 @@ function trimwhitespace($source, &$smarty) function wiki_include($source, &$smarty) { + global $globals; return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui', - '{include\1 file="../spool/wiki.d/cache_\2.tpl"\3 included=1}', + '{include\1 file="' . $globals->spoolroot . '/spool/wiki.d/cache_\2.tpl"\3 included=1}', + $source); +} + +function core_include($source, &$smarty) +{ + global $globals; + return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui', + '{include\1 file="' . $globals->spoolroot . '/core/templates/\2"\3}', $source); } // }}} //{{{ 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.perms|smarty:nodefaults) && $smarty.session.perms|smarty:nodefaults && $smarty.session.perms'; + return preg_replace(array('/\{if([^}]*) (\!?)hasPerms\(([^)]+)\)([^}]*)\}/', + '/\{if([^}]*) (\!?)hasPerm\(([^)]+)\)([^}]*)\}/', + '/\{if([^}]*) (\!?)t\(([^)]+)\)([^}]*)\}/'), + array('{if\1 \2(' . $perms . '->hasFlagCombination(\3))\4}', + '{if\1 \2(' . $perms . '->hasFlag(\3))\4}', + '{if\1 \2(isset(\3|smarty:nodefaults) && (\3|smarty:nodefaults))\4}'), $source); } @@ -404,8 +485,8 @@ function _hide_email($source) { $source = str_replace("\n", '', $source); return ''; + 'Nix.decode("' . addslashes(str_rot13($source)) . '");' . "\n" . + '//]]>'; } function hide_emails($source, &$smarty)