<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
$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)) {
exit;
case SIMPLE:
- $this->assign('simple', true);
-
case SKINNED:
$this->register_modifier('escape_html', 'escape_html');
$this->default_modifiers = Array('@escape_html');
if (!$globals->debug) {
error_reporting(0);
$this->display($skin);
+ pl_print_errors(true);
exit;
}
}
// }}}
+ // {{{ 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, $type = 'errors')
// PHP is used on command line... do not run the whole page stuff.
if (php_sapi_name() == 'cli') {
echo $msg . "\n";
- exit;
+ exit(-1);
}
global $platal;
// }}}
// {{{ function addJsLink
- public function addJsLink($filename)
+ public function addJsLink($filename, $static_content = true)
{
- $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+ if ($static_content) {
+ $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+ } else {
+ $this->append('pl_js', "javascript/$filename");
+ }
}
// }}}
protected function jsonDisplay()
{
pl_content_headers("text/javascript");
- array_walk_recursive($this->_jsonVars, "escape_xorgDB");
+ 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')) {
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)
{
// }}}
}
-function escape_xorgDB(&$item, $key)
+function escape_XDB(&$item, $key)
{
- if ($item instanceof XOrgDBIterator) {
+ if ($item instanceof XDBIterator) {
$expanded = array();
while ($a = $item->next()) {
$expanded[] = $a;
function if_rewrites($source, &$smarty)
{
- $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}'),
+ $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);
}