X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=55442d0ebe82f56f51309d0488ea2545454e6293;hb=88541046480799a8d92eba186f22e22c0c64efb0;hp=da24f3d1d88cfac345ed0aadc69cf7c977dfe988;hpb=04334c61ffd1e63616503bf52e90174adaa3cc86;p=platal.git diff --git a/classes/plpage.php b/classes/plpage.php index da24f3d..55442d0 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->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->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'); } // }}} @@ -66,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); } // }}} @@ -86,31 +107,40 @@ 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(); } - if (Env::v('display') == 'light') { + $display = Env::s('display'); + if ($display == 'light' && $this->_page_type == SKINNED) { $this->_page_type = SIMPLE; - } elseif (Env::v('display') == 'raw') { + } elseif ($display == 'raw') { $this->_page_type = NO_SKIN; - } elseif (Env::v('display') == 'full') { + } elseif ($display == 'full') { $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)) { @@ -120,8 +150,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'); @@ -129,15 +157,15 @@ 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) { error_reporting(0); $this->display($skin); + pl_print_errors(true); exit; } @@ -153,7 +181,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); } @@ -218,24 +248,88 @@ 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(-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"); + } } // }}} @@ -243,16 +337,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); } } @@ -261,15 +364,18 @@ 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"); - array_walk_recursive($this->_jsonVars, "escape_xorgDB"); + pl_content_headers("text/javascript"); + if (!empty(PlBacktrace::$bt)) { + $this->jsonAssign('pl_backtraces', PlBacktrace::$bt); + } + array_walk_recursive($this->_jsonVars, "escape_XDB"); $jsonbegin = Env::v('jsonBegin'); $jsonend = Env::v('jsonEnd'); if (Env::has('jsonVar')) { @@ -283,6 +389,17 @@ abstract class PlPage extends Smarty exit; } // }}} + + public function runJSon() + { + pl_content_headers("text/javascript"); + if (!empty(PlBacktrace::$bt)) { + $this->jsonAssign('pl_backtraces', PlBacktrace::$bt); + } + echo json_encode($this->_jsonVars); + exit; + } + // {{{ function jsonAssign public function jsonAssign($var, $value) { @@ -292,9 +409,9 @@ abstract class PlPage extends Smarty // }}} } -function escape_xorgDB(&$item, $key) +function escape_XDB(&$item, $key) { - if (is_a($item, 'XOrgDBIterator')) { + if ($item instanceof XDBIterator) { $expanded = array(); while ($a = $item->next()) { $expanded[] = $a; @@ -370,21 +487,30 @@ 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.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); } @@ -405,8 +531,8 @@ function _hide_email($source) { $source = str_replace("\n", '', $source); return ''; + 'Nix.decode("' . addslashes(str_rot13($source)) . '");' . "\n" . + '//]]>'; } function hide_emails($source, &$smarty)