Merge remote branch 'origin/core/1.1.2/maint' into core/master

[platal.git] / classes / plpage.php

diff --git a/classes/plpage.php b/classes/plpage.php
index c13410e..56b0c8a 100644 (file)
--- a/classes/plpage.php
+++ b/classes/plpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -126,12 +126,13 @@ abstract class PlPage extends Smarty
             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) {
@@ -189,21 +190,14 @@ abstract class PlPage extends Smarty
 
         $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&amp;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);
@@ -459,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);
 }
@@ -467,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);
@@ -484,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',
@@ -492,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',
@@ -503,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?\(([^)]+)\)([^}]*)\}/',
@@ -516,7 +510,7 @@ function if_rewrites($source, &$smarty)
 // }}}
 // {{{
 
-function form_force_encodings($source, &$smarty)
+function form_force_encodings($source, $smarty)
 {
     return preg_replace('/<form[^\w]/',
                         '\0 accept-charset="utf-8" ',
@@ -534,7 +528,7 @@ function _hide_email($source)
         '//]]></script>';
 }
 
-function hide_emails($source, &$smarty)
+function hide_emails($source, $smarty)
 {
     if (!strpos($source, '@')) {
         return $source;