<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
. " actuellement désactivée, en particulier aucune donnée ne sera sauvegardée");
}
$this->register_prefilter('at_to_globals');
- $this->addJsLink('jquery.js');
}
// }}}
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') {
- $this->_page_typ = SKINNED;
+ } elseif ($display == 'full') {
+ $this->_page_type = SKINNED;
+ }
+
+ if ($this->_page_type == SIMPLE) {
+ $this->assign('simple', true);
+ } else {
+ $this->assign('simple', false);
}
switch ($this->_page_type) {
exit;
case SIMPLE:
- $this->assign('simple', true);
-
case SKINNED:
$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->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;
}
$replc = "<span class='erreur'>VALIDATION HTML INACTIVE</span><br />";
if ($globals->debug & DEBUG_VALID) {
+ global $platal;
$fd = fopen($this->compile_dir."/valid.html","w");
fwrite($fd, $result);
fclose($fd);
- exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$this->compile_dir."/valid.html", $val);
- foreach ($val as $h) {
- if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) {
- $replc = '<span style="color: #080;">HTML OK</span><br />';
- if ($m[1]) {
- $replc = "<span class='erreur'><a href='http://validator.w3.org/check?uri={$globals->baseurl}"
- ."/valid.html&ss=1#result'>{$m[1]} ERREUR(S) !!!</a></span><br />";
- }
- break;
- }
- }
+ $replc = '<span id="html_valid"><span style="color: #860">VALIDATION HTML EN COURS</span></span>'
+ . '<script type="text/javascript">$("#html_valid").updateHtml("validator");</script>'
+ . '<br />';
}
echo str_replace("@HOOK@", $ttime.$replc, $result);
}
// }}}
+ // {{{ 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($path)
+ public function addJsLink($filename, $static_content = true)
{
- $this->append('pl_js', $path);
+ if ($static_content) {
+ $this->append('pl_js', pl_static_content_path("javascript/", $filename));
+ } else {
+ $this->append('pl_js', "javascript/$filename");
+ }
}
// }}}
// {{{ 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')) {
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;
* compilation plugin used to import $globals confing through #globals.foo.bar# directives
*/
-function at_to_globals($tpl_source, &$smarty)
+function at_to_globals($tpl_source, $smarty)
{
return preg_replace('/#globals\.([a-zA-Z0-9_.]+?)#/e', '_to_globals(\'\\1\')', $tpl_source);
}
// }}}
// {{{ function trimwhitespace
-function trimwhitespace($source, &$smarty)
+function trimwhitespace($source, $smarty)
{
$tags = '(script|pre|textarea)';
preg_match_all("!<$tags.*?>.*?</(\\1)>!ius", $source, $tagsmatches);
// }}}
// {{{ function wiki_include
-function wiki_include($source, &$smarty)
+function wiki_include($source, $smarty)
{
global $globals;
return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
$source);
}
-function core_include($source, &$smarty)
+function core_include($source, $smarty)
{
global $globals;
return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui',
// }}}
//{{{ function hasPerm
-function if_rewrites($source, &$smarty)
+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);
}
// }}}
// {{{
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
{
return preg_replace('/<form[^\w]/',
'\0 accept-charset="utf-8" ',
'//]]></script>';
}
-function hide_emails($source, &$smarty)
+function hide_emails($source, $smarty)
{
if (!strpos($source, '@')) {
return $source;
projects / platal.git / blobdiff