X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplpage.php;h=56b0c8a17907189e02ec96469d5797809642ec40;hb=aa2ac7586d7bb1e1479e65a0adef781395fdc57c;hp=49d49550716c38bc2678e607bb354984350d011a;hpb=e92ecb8c24421ca1dd4f87ad7478d0d8277e1f60;p=platal.git
diff --git a/classes/plpage.php b/classes/plpage.php
index 49d4955..56b0c8a 100644
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -132,7 +132,7 @@ abstract class PlPage extends Smarty
} elseif ($display == 'raw') {
$this->_page_type = NO_SKIN;
} elseif ($display == 'full') {
- $this->_page_typ = SKINNED;
+ $this->_page_type = SKINNED;
}
if ($this->_page_type == SIMPLE) {
@@ -190,21 +190,14 @@ abstract class PlPage extends Smarty
$replc = "VALIDATION HTML INACTIVE
";
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 = 'HTML OK
';
- if ($m[1]) {
- $replc = "{$m[1]} ERREUR(S) !!!
";
- }
- break;
- }
- }
+ $replc = 'VALIDATION HTML EN COURS'
+ . ''
+ . '
';
}
echo str_replace("@HOOK@", $ttime.$replc, $result);
@@ -460,7 +453,7 @@ function _to_globals($s) {
* 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);
}
@@ -468,7 +461,7 @@ function at_to_globals($tpl_source, &$smarty)
// }}}
// {{{ function trimwhitespace
-function trimwhitespace($source, &$smarty)
+function trimwhitespace($source, $smarty)
{
$tags = '(script|pre|textarea)';
preg_match_all("!<$tags.*?>.*?(\\1)>!ius", $source, $tagsmatches);
@@ -485,7 +478,7 @@ function trimwhitespace($source, &$smarty)
// }}}
// {{{ function wiki_include
-function wiki_include($source, &$smarty)
+function wiki_include($source, $smarty)
{
global $globals;
return preg_replace('/\{include( [^}]*)? wiki=([^} ]+)(.*?)\}/ui',
@@ -493,7 +486,7 @@ function wiki_include($source, &$smarty)
$source);
}
-function core_include($source, &$smarty)
+function core_include($source, $smarty)
{
global $globals;
return preg_replace('/\{include( [^}]*)? core=([^} ]+)(.*?)\}/ui',
@@ -504,7 +497,7 @@ function core_include($source, &$smarty)
// }}}
//{{{ function hasPerm
-function if_rewrites($source, &$smarty)
+function if_rewrites($source, $smarty)
{
$perms = 'isset($smarty.session.user|smarty:nodefaults) && $smarty.session.user';
return preg_replace(array('/\{(else)?if([^}]*) (\!?)hasPerms?\(([^)]+)\)([^}]*)\}/',
@@ -517,7 +510,7 @@ function if_rewrites($source, &$smarty)
// }}}
// {{{
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
{
return preg_replace('/