From 68286ceb7045084a126aa2de162e3e337bf98643 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 1 Sep 2020 18:05:53 +0000
Subject: [PATCH] wip #3733 @14

---
 inc/commons/class.common.tools.php            |  26 +-
 inc/ws/Metier/class.ws.book.parametres.php    |   6 +-
 inc/ws/Util/_common.php                       |  37 +--
 inc/ws/Util/class.ws.articles.php             | 291 ++++++++++++++++++
 .../html5/master/class.ws.html5.compiler.php  | 238 +++++++-------
 5 files changed, 463 insertions(+), 135 deletions(-)
 create mode 100644 inc/ws/Util/class.ws.articles.php

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 217b0e622..1ed6ffa44 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -1443,20 +1443,18 @@ class commonTools
         exit;
     }
 
-    public static function quizUpdater($args)
+    public static function articles($args)
     {
-        header('Location: https://toolbox.fluidbook.com/quiz/');
-        exit;
         global $core;
         $res = commonPage::barre();
         $res .= commonPage::tMain();
         $res .= commonPage::bh();
-        $res .= '<form action="' . SITE_PATH . 'tools/updateQuiz" method="post" class="notajax" enctype="multipart/form-data">';
+        $res .= '<form action="' . SITE_PATH . 'tools/articlesFixer" method="post" class="notajax" enctype="multipart/form-data">';
         $res .= '<table class="liste">';
-        $res .= '<tr><th><strong>' . __('Update your quiz') . '</strong></th></tr>';
-        $res .= '<tr><td>Please upload your quiz (ZIP file expected)</td></tr>';
-        $res .= '<tr class="odd"><td><input type="file" name="file[]" multiple /></td></tr>';
-        $res .= '<tr><td class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Proceed to update')) . '</a></td></td>';
+        $res .= '<tr><th colspan="2"><strong>' . __('Convertir les articles') . '</strong></th></tr>';
+        $res .= '<tr><td>Charger le zip contenant les xml et images</td><td ><input type="file" name="file" /></td></tr>';
+        $res .= '<tr class="odd"><td>Format d\'entrée</td><td><select name="format"><option value="business-immo">Business Immo</option></select></td></tr>';
+        $res .= '<tr><td colspan="2" class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Convertir')) . '</a></td></td>';
         $res .= '</table>';
         $res .= '</form>';
         $res .= '</div>';
@@ -1465,6 +1463,18 @@ class commonTools
         return $res;
     }
 
+    public static function articlesFixer()
+    {
+        $a = new wsArticles($_FILES['file']['tmp_name'], $_POST['format']);
+        $a->fix();
+        $a->outputZip();
+    }
+
+    public static function quizUpdater($args)
+    {
+        header('Location: https://toolbox.fluidbook.com/quiz/');
+    }
+
     /**
      * @param $tmp_name
      * @param $name
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 9197bd8e3..d146ad8c2 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -33,8 +33,8 @@ class wsBookParametres extends wsParametres
         $basketFilter->extensions = '*.xml;*.xlsx';
 
         $articlesFilter = new stdClass();
-        $articlesFilter->name = __('Liste d\'articles') . ' (*.xml, *.zip)';
-        $articlesFilter->extensions = '*.xml;*.zip';
+        $articlesFilter->name = __('Liste d\'articles') . ' (*.xml)';
+        $articlesFilter->extensions = '*.xml';
 
         $htmlFilter = new stdClass();
         $htmlFilter->name = __('Fichier HTML') . ' (*.html)';
@@ -495,7 +495,7 @@ class wsBookParametres extends wsParametres
         $this->fields['articlesShare'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le partage'), 'grade' => 3];
         $this->fields['articlesStyle'] = ['type' => 'combo', 'default' => true, 'editable' => true, 'label' => __('Style'), 'grade' => 3, 'datas' => ['Défaut' => 'default', 'Atlantic' => 'atlantic', 'Harmonie Mutuelle' => 'harmonie-mutuelle', 'Business Immo' => 'business-immo']];
 
-        $this->forms['articles'] = ['label' => __('Articles'), 'fieldsnames' => ['articlesFile', 'articlesFormat', 'articlesImages', '|', 'articlesShare', '|', 'articlesStyle', 'articlesFont']];
+        $this->forms['articles'] = ['label' => __('Articles'), 'fieldsnames' => ['articlesFile',  'articlesImages', '|', 'articlesShare', '|', 'articlesStyle', 'articlesFont']];
 
         //.
         $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
diff --git a/inc/ws/Util/_common.php b/inc/ws/Util/_common.php
index 6ed480908..da09712d9 100644
--- a/inc/ws/Util/_common.php
+++ b/inc/ws/Util/_common.php
@@ -1,21 +1,22 @@
 <?php
 
-include_once(dirname(__FILE__) . '/packager/_common.php');
-$__autoload['wsSWF2HTML'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSWF2HTMLTag'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSWF2HTMLText'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSWF2HTMLFont'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSWF2HTMLParagraph'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSWF2HTMLMatrix'] = dirname(__FILE__) . '/class.ws.swf2html.php';
-$__autoload['wsSecureSWF'] = dirname(__FILE__) . '/class.ws.secure.swf.php';
-$__autoload['wsTools'] = dirname(__FILE__) . '/class.ws.tools.php';
-$__autoload['wsHTML5AppCompiler'] = dirname(__FILE__) . '/html5/app/class.ws.html5.app.compiler.php';
-$__autoload['wsPDFFontExtractor'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.fontextractor.php';
-$__autoload['wsPDFFont'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.font.php';
-$__autoload['wsSVN'] = dirname(__FILE__) . '/class.ws.svn.php';
-$__autoload['wsLinks'] = dirname(__FILE__) . '/class.ws.links.php';
-$__autoload['wsExporter'] = dirname(__FILE__) . '/class.ws.exporter.php';
-$__autoload['wsPDFConvert'] = dirname(__FILE__) . '/class.ws.pdf.convert.php';
-$__autoload['wsUtil'] = dirname(__FILE__) . '/class.ws.util.php';
+include_once(__DIR__ . '/packager/_common.php');
+$__autoload['wsSWF2HTML'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSWF2HTMLTag'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSWF2HTMLText'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSWF2HTMLFont'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSWF2HTMLParagraph'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSWF2HTMLMatrix'] = __DIR__. '/class.ws.swf2html.php';
+$__autoload['wsSecureSWF'] = __DIR__. '/class.ws.secure.swf.php';
+$__autoload['wsTools'] = __DIR__. '/class.ws.tools.php';
+$__autoload['wsHTML5AppCompiler'] = __DIR__. '/html5/app/class.ws.html5.app.compiler.php';
+$__autoload['wsPDFFontExtractor'] = __DIR__. '/fontextractor/class.ws.pdf.fontextractor.php';
+$__autoload['wsPDFFont'] = __DIR__. '/fontextractor/class.ws.pdf.font.php';
+$__autoload['wsSVN'] = __DIR__. '/class.ws.svn.php';
+$__autoload['wsLinks'] = __DIR__. '/class.ws.links.php';
+$__autoload['wsExporter'] = __DIR__. '/class.ws.exporter.php';
+$__autoload['wsPDFConvert'] = __DIR__. '/class.ws.pdf.convert.php';
+$__autoload['wsUtil'] = __DIR__. '/class.ws.util.php';
+$__autoload['wsArticles'] = __DIR__. '/class.ws.articles.php';
 
-$__autoload['wsHTML5'] = dirname(__FILE__) . '/html5/class.ws.html5.php';
+$__autoload['wsHTML5'] = __DIR__. '/html5/class.ws.html5.php';
diff --git a/inc/ws/Util/class.ws.articles.php b/inc/ws/Util/class.ws.articles.php
new file mode 100644
index 000000000..0bc9c1517
--- /dev/null
+++ b/inc/ws/Util/class.ws.articles.php
@@ -0,0 +1,291 @@
+<?php
+
+class wsArticles
+{
+    /**
+     * @var string
+     */
+    protected $_file;
+
+    /**
+     * @var string
+     */
+    protected $_format;
+
+
+    /**
+     * @var ZipArchive
+     */
+    protected $_zip;
+
+    /**
+     * @var string
+     */
+    protected $_wdir;
+
+    /**
+     * @var string
+     */
+    protected $_outzip;
+
+    public function __construct($file, $format)
+    {
+        $this->setFile($file);
+        $this->setFormat($format);
+        $this->_wdir = CubeIT_Files::tmpdir();
+        if (!file_exists($this->_wdir)) {
+            mkdir($this->_wdir, 0777, true);
+        }
+    }
+
+    /**
+     * @param string $file
+     */
+    public function setFile(string $file): void
+    {
+        $this->_file = $file;
+        $this->_zip = new ZipArchive();
+        $this->_zip->open($this->_file);
+    }
+
+    /**
+     * @param string $format
+     */
+    public function setFormat(string $format): void
+    {
+        $this->_format = $format;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFile(): string
+    {
+        return $this->_file;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFormat(): string
+    {
+        return $this->_format;
+    }
+
+    public function fix()
+    {
+        if ($this->getFormat() === 'business-immo') {
+            $this->parseArticlesBusinessImmo();
+        }
+    }
+
+    public function outputZip()
+    {
+        $this->_outzip = CubeIT_Files::tempnam() . '.zip';
+        CubeIT_Util_Zip::archive($this->_wdir, $this->_outzip);
+
+        cubeHTTP::relayFile($this->_outzip);
+    }
+
+    public function parseArticlesBusinessImmo()
+    {
+        $assets = [];
+        $xmls = [];
+
+        for ($i = 0; $i <= $this->_zip->numFiles; $i++) {
+            $fname = $this->_zip->getNameIndex($i);
+            if (stristr($fname, '__MACOSX')) {
+                continue;
+            }
+            if (!preg_match('/\.xml$/', $fname)) {
+                $c = $this->_zip->getFromIndex($i);
+                if (!$c) {
+                    continue;
+                }
+                $e = explode('/', $fname);
+                array_pop($e);
+                $dir = implode('/', $e);
+                $fname = $this->_normalizeAssetName($fname, false);
+                $final = $i . '-' . $fname;
+                $assets[$fname] = ['index' => $i, 'dir' => $dir, 'final' => $final];
+                file_put_contents($this->_wdir . '/' . $final, $c);
+            } else {
+                $xmls[$fname] = $i;
+            }
+        }
+
+        $resdom = new DOMDocument('1.0', 'UTF-8');
+        $resdom->loadXML('<articles></articles>');
+
+        foreach ($xmls as $name => $index) {
+            $e = explode('/', $name);
+            array_pop($e);
+            $dir = implode('/', $e);
+            $dirassets = $dir . '/images';
+
+            $thisassets = [];
+
+            foreach ($assets as $aname => $asset) {
+                if ($asset['dir'] !== $dirassets) {
+                    continue;
+                }
+                $thisassets[$aname] = $asset;
+            }
+
+            $xmlContent = $this->_zip->getFromIndex($index);
+            $xmlContent = preg_replace_callback('/\<\/?[A-Za-z]+\/?\>/u', function ($w) {
+                return mb_strtolower($w[0]);
+            }, $xmlContent);
+
+            $xmlContent = preg_replace_callback('/&#(x?)([0-9a-fA-F]+);/', function ($w) {
+                if ($w[1] === 'x') {
+                    return mb_chr(hexdec($w[2]));
+                } else {
+                    return mb_chr($w[2]);
+                }
+            }, $xmlContent);
+            $xmlContent = preg_replace('/\<image\>([^\>]*)\<\/image\>/', '<legend>$1</legend>', $xmlContent);
+            $xmlContent = preg_replace_callback('/\<image([^>]*)link="(https:\/\/youtu\.be[^"]+)"([^\>]*)\>(\<\/image\>)?/', function ($w) {
+                return '<youtube link="' . $w[2] . '" />';
+            }, $xmlContent);
+            $xmlContent = str_replace(' ', ' ', $xmlContent);
+            $xmlContent = $this->_normalizeAssetNameInXML($xmlContent, $thisassets);
+            $sx = simplexml_load_string($xmlContent);
+
+            foreach ($sx->xpath('//article') as $k => $item) {
+                if ($item->count()) {
+                    $dom = dom_import_simplexml($item);
+                    $this->_fixNested($dom);
+                    $clone = $resdom->importNode($dom, true);
+
+                    $resdom->documentElement->appendChild($clone);
+
+                    $xpath = new DOMXPath($resdom);
+                    $titles = $xpath->query('./title', $clone);
+                    if ($titles->count() > 0) {
+                        foreach ($titles as $title) {
+                            $id = mb_strtolower(trim(mb_substr(CubeIT_Text::str2URL(trim($title->nodeValue)), 0, 100), '-'));
+                            break;
+                        }
+                    } else {
+                        $id = 'article-' . $index . '-' . $k;
+                    }
+                    $url = $id . '.html';
+                    $clone->setAttribute('id', $id);
+                    $clone->setAttribute('url', $url);
+
+                    $dom->parentNode->removeChild($dom);
+                }
+            }
+        }
+
+        $file = $this->_wdir . '/articles.xml';
+        $resdom->encoding = 'UTF-8';
+        $xml = tidy_repair_string($resdom->saveXML(), ['input-xml' => 1, 'indent' => 1, 'wrap' => 0], 'UTF-8');
+        file_put_contents($file, $xml);
+    }
+
+    /**
+     * @param $article DOMElement
+     */
+    protected function _fixNested(&$article)
+    {
+
+        $count = $article->childNodes->count();
+        for ($i = 0; $i < $count; $i++) {
+            $child = $article->childNodes->item($i);
+            if ($this->_hasNested($child)) {
+                $scount = $child->childNodes->count();
+                for ($j = 0; $j < $scount; $j++) {
+                    $schild = $child->childNodes->item($j);
+                    $article->insertBefore($schild, $child);
+                    $j--;
+                    $scount--;
+                }
+
+                if ($child->childNodes->count() === 0) {
+                    $article->removeChild($child);
+                }
+                $i = 0;
+                $count = $article->childNodes->count();
+            } else {
+            }
+        }
+    }
+
+    protected function _hasNested($child)
+    {
+        if ($this->_isText($child, true)) {
+            return false;
+        }
+        if ($child->tagName === 'encadre') {
+            return false;
+        }
+        $count = $child->childNodes->count();
+        if ($count > 1) {
+            return true;
+        }
+        if (!$count) {
+            return false;
+        }
+        return $count === 1 && !($child->childNodes->item(0) instanceof DOMText);
+    }
+
+    /**
+     * @param $node DOMNode
+     */
+    protected function _isText($node, $strict = false)
+    {
+        if ($node->nodeType === XML_TEXT_NODE || $node instanceof DOMText) {
+            return true;
+        }
+        if ($strict) {
+            return false;
+        }
+
+        if (null === $node->childNodes) {
+            return true;
+        }
+
+        $count = $node->childNodes->count();
+        for ($i = 0; $i < $count; $i++) {
+            $child = $node->childNodes->item($i);
+            if (!$this->_isText($child, true)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected function _normalizeAssetNameInXML($xml, $assets)
+    {
+        return preg_replace_callback('/file:\/\/\/[^\"]*/um', function ($matches) use ($assets) {
+            $aname = $this->_normalizeAssetName($matches[0], false);
+            return $assets[$aname]['final'];
+        }, $xml);
+    }
+
+    protected function _normalizeAssetName($fname, $withDir = false)
+    {
+        if (!$withDir) {
+            $e = explode('/', $fname);
+            $fname = array_pop($e);
+        }
+        $fname = rawurldecode($fname);
+        $fname = str_replace('_opt.', '.', $fname);
+        $fname = CubeIT_Text::removeAccents($fname, true);
+        $fname = str_replace('é', 'e', $fname);
+        $fname = str_replace('ç', 'c', $fname);
+        $fname = preg_replace("/[\s©\(\)\&]/u", "_", $fname);
+        $fname = trim(mb_strtolower($fname));
+        return $fname;
+    }
+
+    public function __destruct()
+    {
+        CubeIT_Files::rmdir($this->_wdir);
+        if ($this->_outzip && file_exists($this->_outzip)) {
+            unlink($this->_outzip);
+        }
+    }
+}
\ No newline at end of file
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 40c484c4f..f2ad47d26 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -2523,51 +2523,6 @@ class wsHTML5Compiler
         return $innerXML;
     }
 
-
-    public function parseArticlesBusinessImmo($file)
-    {
-        $zip = new ZipArchive();
-        $zip->open($file);
-        $assets = [];
-        $xmls = [];
-        for ($i = 0; $i <= $zip->numFiles; $i++) {
-            $fname = $zip->getNameIndex($i);
-            if (stristr($fname, '__MACOSX')) {
-                continue;
-            }
-            if (!preg_match('/\.xml$/', $fname)) {
-                $assets[$this->_normalizeAssetName($fname, true)] = $i;
-            } else {
-                $xmls[$fname] = $i;
-            }
-        }
-
-        foreach ($xmls as $name => $index) {
-            $e = explode('/', $name);
-            array_pop($e);
-            $dir = implode('/', $e);
-            $xmlContent = $zip->getFromIndex($index);
-            $xmlContent = preg_replace_callback('/\<\/?[A-Za-z]+\/?\>/', function($w){
-                return mb_strtolower($w[0]);
-            }, $xmlContent);
-            $sx = simplexml_load_string($xmlContent);
-        }
-
-    }
-
-    protected function _normalizeAssetName($fname, $withDir = false)
-    {
-        if (!$withDir) {
-            $e = explode('/', $fname);
-            $fname = array_pop($e);
-        }
-        $fname = rawurldecode($fname);
-        $fname = trim(mb_strtolower($fname));
-        $fname = str_replace('_opt.', '.', $fname);
-        $fname = CubeIT_Text::removeAccents($fname);
-        return $fname;
-    }
-
     public function writeArticles()
     {
         $mapFonts = ['OpenSans' => 'Open Sans'];
@@ -2588,10 +2543,6 @@ class wsHTML5Compiler
             return;
         }
 
-        if ($this->book->parametres->articlesFormat === 'business-immo') {
-            $this->parseArticlesBusinessImmo($f);
-        }
-
         $this->addLess('articles');
         if ($this->book->parametres->articlesStyle !== 'default') {
             $this->lessVariables['articles-styles'] = $this->book->parametres->articlesStyle;
@@ -2601,88 +2552,72 @@ class wsHTML5Compiler
         $this->lessVariables['articles-font'] = $mapFonts[$this->book->parametres->articlesFont] ?? $this->book->parametres->articlesFont;
         $fontPath = $this->addFontKit($this->book->parametres->articlesFont);
 
-
         $svg = '<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="nav-print" viewBox="0 0 512 512">
         <path d="m424 186l-39 0 0-114c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 114-39 0c-22 0-41 19-41 41l0 121c0 23 19 41 41 41l39 0 0 49c0 8 6 15 14 15l230 0c8 0 14-7 14-15l0-49 39 0c22 0 41-18 41-41l0-121c0-22-19-41-41-41z m-268-100l200 0 0 100-200 0z m200 340l-200 0 0-88 200 0z m80-76c0 6-6 12-12 12l-39 0 0-38c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 38-39 0c-6 0-12-6-12-12l0-121c0-6 6-12 12-12l336 0c6 0 12 6 12 12z m-278-96l-33 0c-8 0-14 6-14 14 0 8 6 15 14 15l35 0c8 0 14-7 14-15 0-8-8-14-16-14z m32 139l132 0c8 0 14-6 14-14 0-8-6-14-14-14l-132 0c-8 0-14 6-14 14 0 8 6 14 14 14z"/>
     </symbol></svg>';
 
-        $markupMap = ['category' => 'h3', 'subtitle' => 'h2', 'title' => 'h1', 'lead' => 'div.chapo', 'paragraph' => 'p', 'note' => 'div.note', 'quote' => 'blockquote', 'signature' => 'div.author', 'intertitle' => 'h2.inter', 'separator' => 'hr'];
 
         $x = simplexml_load_string(file_get_contents($f));
         $prevurl = '';
         foreach ($x->xpath('/articles/article') as $k => $a) {
             $url = (string)$a['url'];
-            $article = ['id' => (string)$a['id'],
-                'url' => $url,
-                'color' => (string)$a['color'],
-                'contents' => '',
-                'prev' => $prevurl,
-                'next' => ''];
-
-            if ($prevurl !== '') {
-                $list[count($list) - 1]['next'] = $url;
-            } else {
-                $firsturl = $url;
+            $id = (string)$a['id'];
+            $color = (string)$a['color'];
+            if (!$color) {
+                $color = '#000';
             }
 
-            $prevurl = $url;
-
-            $specificStyles = '## h3, ## figure figcaption{background-color:' . $article['color'] . '}';
-            $specificStyles .= '## .chapo, ## blockquote, ## a{color:' . $article['color'] . ';}';
+            $specificStyles = '## h3, ## figure figcaption{background-color:' . $color . '}';
+            $specificStyles .= '## .chapo, ## blockquote, ## a{color:' . $color . ';}';
 
-            $inner = '<article data-id="' . $article['id'] . '" class="menu-article" id="article_' . $article['id'] . '">';
-            $inner .= '<style type="text/css">' . str_replace('##', '#article_' . $article['id'], $specificStyles) . '</style>';
+            $inner = '<article data-id="$id" class="menu-article" id="article_$id">';
+            $inner .= '<style type="text/css">' . str_replace('##', '#article_$id', $specificStyles) . '</style>';
             $inner .= '<div class="actions">';
             if ($this->book->parametres->articlesShare && $this->book->parametres->share) {
-                $inner .= '<a data-id="' . $article['id'] . '" data-url="' . $url . '" href="#" class="articlesShare"><svg viewBox="0 0 512 512" class="nav-share nav-icon svg-icon"><use xlink:href="#nav-share"></use></svg></a>';
+                $inner .= '<a data-id="$id" data-url="$url" href="#" class="articlesShare"><svg viewBox="0 0 512 512" class="nav-share nav-icon svg-icon"><use xlink:href="#nav-share"></use></svg></a>';
             }
             $inner .= '<a href="#" class="articlesPrint"><svg viewBox="0 0 512 512" class="nav-print nav-icon svg-icon"><use xlink:href="#nav-print"></use></svg></a>';
             $inner .= '</div>';
 
+            $inner .= '<div class="articleBody">';
+
             $title = '';
             $lead = '';
             $image = '';
 
             foreach ($a->children() as $child) {
-                $tag = $child->getName();
-                if ($tag === 'image') {
+                $inner .= $this->_articleToHTML($child, $title, $lead, $image);
+            }
+            $inner .= '</div></article>';
 
-                    $file = (string)$child['file'];
-                    if ($image === '') {
-                        $image = 'articles/' . $file;
-                    }
-                    $filepath = $this->wdir . '/articles/' . $file;
-                    $this->vdir->copy($filepath, 'data/articles/' . $file);
-                    $legend = (string)$child;
-                    $caption = $legend ? '<figcaption>' . $legend . '</figcaption>' : '';
-                    if (file_exists($filepath)) {
-                        $dim = getimagesize($filepath);
-                    } else {
-                        $dim = [0 => 1024, 1 => 10];
-                    }
-                    $inner .= '<figure><img src="data/articles/' . $file . '" alt="' . $legend . '" width="' . $dim[0] . '" height="' . $dim[1] . '">' . $caption . '</figure>';
-                } else {
-                    $c = trim($this->SimpleXMLElement_innerXML($child));
-                    if (!$c) {
-                        continue;
-                    }
-                    if (!$title && $tag === 'title') {
-                        $title = $c;
-                    }
-                    if (!$lead && $tag === 'lead') {
-                        $lead = $c;
-                    }
-                    $m = $markupMap[$tag] ?? $tag;
-                    $e = explode('.', $m);
-                    $markup = $e[0];
-                    $class = '';
-                    if (count($e) === 2) {
-                        $class = ' class="' . $e[1] . '"';
-                    }
-                    $inner .= '<' . $markup . $class . '>' . $c . '</' . $markup . '>';
-                }
+            if (!$title) {
+                $title = 'Article sans titre ' . $k;
             }
-            $inner .= '</article>';
+
+            if (!$id) {
+                $id = CubeIT_Text::str2URL($title);
+            }
+
+            if (!$url) {
+                $url = $id . '.html';
+            }
+
+            $inner = str_replace(array('$id', '$url'), array($id, $url), $inner);
+
+            $article = ['id' => $id,
+                'url' => $url,
+                'color' => $color,
+                'contents' => '',
+                'prev' => $prevurl,
+                'next' => ''];
+
+            if ($prevurl !== '') {
+                $list[count($list) - 1]['next'] = $url;
+            } else {
+                $firsturl = $url;
+            }
+
+            $prevurl = $url;
 
             $article['contents'] = $inner;
             $content = '<html><head>';
@@ -2711,8 +2646,99 @@ class wsHTML5Compiler
         $this->config->articlesList = $idlist;
     }
 
+    /**
+     * @param $child SimpleXMLElement
+     * @param $title
+     * @param $lead
+     * @param $image
+     * @return string|void
+     * @throws Zend_Filter_Exception
+     */
+    protected function _articleToHTML($child, &$title, &$lead, &$image)
+    {
+        $markupMap = ['category' => 'h3',
+            'subtitle' => 'h2',
+            'legend' => 'figcaption',
+            'title' => 'h1',
+            'lead' => 'div.chapo',
+            'paragraph' => 'p',
+            'note' => 'div.note',
+            'quote' => 'blockquote',
+            'signature' => 'div.author',
+            'intertitle' => 'h2.inter',
+            'bigfont' => 'h2.bigfont',
+            'separator' => 'hr',
+            'link' => 'a'];
+
+        $attrsmap = ['a' => ['link' => 'href']];
+
+        $res = '';
+        $tag = $child->getName();
+        if ($tag === 'encadre') {
+            $res .= '<aside>';
+            foreach ($child->children() as $sub) {
+                $res .= $this->_articleToHTML($sub, $a1, $a2, $a3);
+            }
+            $res .= '</aside>';
+        } else if ($tag === 'youtube') {
+            $filter = new CubeIT_Filter_WebVideo();
+            $e = explode(':', $filter->filter((string)$child['link']));
+            $res .= '<div class="youtube"><iframe width="800" height="450" src="https://www.youtube.com/embed/' . $e[1] . '" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>';
+        } else if ($tag === 'image') {
+            $srcattrs = ['href', 'src', 'file'];
+            $file = '';
+            foreach ($srcattrs as $srcattr) {
+                if (isset($child[$srcattr])) {
+                    $file = (string)$child[$srcattr];
+                    break;
+                }
+            }
+            if ($image === '') {
+                $image = 'articles/' . $file;
+            }
+            $filepath = $this->wdir . '/articles/' . $file;
+            $this->vdir->copy($filepath, 'data/articles/' . $file);
+            $legend = (string)$child;
+            $caption = $legend ? '<figcaption>' . $legend . '</figcaption>' : '';
+            if (file_exists($filepath)) {
+                $dim = getimagesize($filepath);
+            } else {
+                $dim = [0 => 1024, 1 => 10];
+            }
+            $res .= '<figure><img src="data/articles/' . $file . '" alt="' . $legend . '" width="' . $dim[0] . '" height="' . $dim[1] . '">' . $caption . '</figure>';
+        } else {
+            $c = trim($this->SimpleXMLElement_innerXML($child));
+            if (!$c) {
+                return;
+            }
+            if ($title === '' && $tag === 'title') {
+                $title = $c;
+            }
+            if ($lead === '' && $tag === 'lead') {
+                $lead = $c;
+            }
+            $m = $markupMap[$tag] ?? $tag;
+            $e = explode('.', $m);
+            $markup = $e[0];
+            $attrs = '';
+            if (count($e) === 2) {
+                $attrs .= ' class="' . $e[1] . '"';
+            }
+            if ($m === 'a') {
+                $attrs .= ' target="_blank"';
+            }
+            foreach ($child->attributes() as $name => $v) {
+                $n = $attrsmap[$m][$name] ?? $name;
+                $attrs .= ' ' . $n . '="' . htmlspecialchars($v) . '"';
+            }
+            $res .= '<' . $markup . $attrs . '>' . $c . '</' . $markup . '>';
+        }
+        return $res;
+    }
+
 }
 
+
 if (!function_exists('is_countable')) {
 
     function is_countable($c)
-- 
2.39.5