wait #5795 @2

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 8d5113abf6ff7979e1596e58f8e89f939f14baab..e44ded5acb2669cf87129e6be93f677b4f19daa1 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1497,9 +1497,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                     if ($page == '' || $text == '') {
                         continue;
                     }
-                    $data=['text' => $text];
-                    if($voice){
-                        $data['voice']=$voice;
+                    $data = ['text' => $text];
+                    if ($voice) {
+                        $data['voice'] = $voice;
                     }
                     $this->audioDescriptionTextsList[$page] = $data;
                 }
@@ -1624,13 +1624,13 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     }
 
-    protected function _writeIndex($page)
+    protected function _writeIndex($page, $iv = [])
     {
         if (!isset($this->seo->pages[$page])) {
             return;
         }
         $seo = $this->seo->pages[$page];
-        $html = $seo->getHTML();
+        $html = $seo->getHTML($iv);
 
         if ($this->book->parametres->seoVersion) {
             $seo->writePage($html, $this->vdir);
@@ -1870,11 +1870,8 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
             $res = [];
             foreach ($vars as $v) {
-                if (isset($$v)) {
-                    $res['<!-- $' . $v . ' -->'] = $$v;
-                } else {
-                    $res['<!-- $' . $v . ' -->'] = '';
-                }
+                $res[$v] = $$v ?? '';
+
             }
             $this->_indexVars = $res;
             $this->log('Got index vars 6');
@@ -1913,19 +1910,15 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     protected function writeIndex()
     {
-
-
         $iv = $this->getIndexVars();
         $this->log('Got index vars');
-        foreach ($iv as $k => $v) {
-            $this->seo->html = str_replace($k, $v, $this->seo->html);
-        }
+
         if ($this->book->parametres->seoVersion) {
             foreach ($this->pages as $page => $infos) {
-                $this->_writeIndex($page);
+                $this->_writeIndex($page, $iv);
             }
         } else {
-            $this->_writeIndex(1);
+            $this->_writeIndex(1, $iv);
         }
     }
 

diff --git a/inc/ws/Util/html5/master/class.ws.html5.seo.php b/inc/ws/Util/html5/master/class.ws.html5.seo.php
index 12e34329ba18931e612fe7176e93b43a5441479d..66ee35b6e3c594c7539793aeb1de187b4aa9fbe7 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.seo.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.seo.php
@@ -34,7 +34,7 @@ class wsHTML5Seo
 \r
             foreach ($a as $item) {\r
                 $page = $item['page'] + $offsetPage;\r
-                $item['url'] = trim(CubeIT_Text::removeAccents($item['url'])," '");\r
+                $item['url'] = trim(CubeIT_Text::removeAccents($item['url']), " '");\r
                 if (!$item['url']) {\r
                     continue;\r
                 }\r
@@ -47,6 +47,7 @@ class wsHTML5Seo
             }\r
         }\r
 \r
+\r
         $this->html = file_get_contents($this->compiler->assets . '/_index.html');\r
     }\r
 \r
@@ -192,7 +193,7 @@ class wsHTML5SeoPage
         $this->_container = $container;\r
     }\r
 \r
-    public function getHTML()\r
+    public function getHTML($iv = [])\r
     {\r
         $html = $this->_container->html;\r
 \r
@@ -222,10 +223,11 @@ class wsHTML5SeoPage
             $vars['canonical'] = $vars['next'] = $vars['prev'] = '';\r
         }\r
 \r
+        $vars = array_merge($iv, $vars);\r
+\r
         foreach ($vars as $k => $var) {\r
             $html = str_replace('<!-- $' . $k . ' -->', $var, $html);\r
         }\r
-\r
         return $html;\r
     }\r
 \r