[SPIP][PLUGINS] v3.0-->v3.2

[lhc/web/www.git] / www / ecrire / xml / indenter.php

diff --git a/www/ecrire/xml/indenter.php b/www/ecrire/xml/indenter.php
index 459fb8d..d00aa70 100644 (file)
--- a/www/ecrire/xml/indenter.php
+++ b/www/ecrire/xml/indenter.php
@@ -3,63 +3,69 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2016                                                *
+ *  Copyright (c) 2001-2017                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
 
 class IndenteurXML {
 
-// http://doc.spip.org/@debutElement
-function debutElement($phraseur, $name, $attrs)
-{ xml_debutElement($this, $name, $attrs);}
+       // http://code.spip.net/@debutElement
+       public function debutElement($phraseur, $name, $attrs) {
+               xml_debutElement($this, $name, $attrs);
+       }
 
-// http://doc.spip.org/@finElement
-function finElement($phraseur, $name)
-{ xml_finElement($this, $name);}
+       // http://code.spip.net/@finElement
+       public function finElement($phraseur, $name) {
+               xml_finElement($this, $name);
+       }
 
-// http://doc.spip.org/@textElement
-function textElement($phraseur, $data)
-{ xml_textElement($this, $data);}
+       // http://code.spip.net/@textElement
+       public function textElement($phraseur, $data) {
+               xml_textElement($this, $data);
+       }
 
-function piElement($phraseur, $target, $data)
-{ xml_PiElement($this, $target, $data);}
+       public function piElement($phraseur, $target, $data) {
+               xml_PiElement($this, $target, $data);
+       }
 
-// http://doc.spip.org/@defautElement
-function defaultElement($phraseur, $data)
-{  xml_defaultElement($this, $data);}
+       // http://code.spip.net/@defautElement
+       public function defaultElement($phraseur, $data) {
+               xml_defaultElement($this, $data);
+       }
 
-// http://doc.spip.org/@phraserTout
-function phraserTout($phraseur, $data)
-{
-       xml_parsestring($this, $data);
-}
+       // http://code.spip.net/@phraserTout
+       public function phraserTout($phraseur, $data) {
+               xml_parsestring($this, $data);
+       }
 
- var $depth = "";
- var $res = "";
- var $err = array();
- var $contenu = array();
- var $ouvrant = array();
- var $reperes = array();
- var $entete = '';
- var $page = '';
- var $dtc = NULL;
- var $sax = NULL;
+       public $depth = "";
+       public $res = "";
+       public $err = array();
+       public $contenu = array();
+       public $ouvrant = array();
+       public $reperes = array();
+       public $entete = '';
+       public $page = '';
+       public $dtc = null;
+       public $sax = null;
 }
 
-// http://doc.spip.org/@xml_indenter_dist
-function xml_indenter_dist($page, $apply=false)
-{
+// http://code.spip.net/@xml_indenter_dist
+function xml_indenter_dist($page, $apply = false) {
        $sax = charger_fonction('sax', 'xml');
        $f = new IndenteurXML();
        $sax($page, $apply, $f);
-       if (!$f->err) return $f->entete . $f->res;
+       if (!$f->err) {
+               return $f->entete . $f->res;
+       }
        spip_log("indentation impossible " . count($f->err) . " erreurs de validation");
+
        return $f->entete . $f->page;
 }
-
-?>