(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 434499d13b72808987548ba286f2dc91f7341b78..e4b3de71730d14c76b622f60c11413929bd4ffa3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -387,7 +387,6 @@ html{height:100%}' . "\n";
                // Entêtes Facebook\r
                if ($book->parametres->facebook) {\r
                        $meta['og:title'] = ($book->parametres->facebook_title == '')?$book->parametres->title:$book->parametres->facebook_title;\r
-\r
                        if ($book->parametres->facebook_description != '') {\r
                                $meta['og:description'] = $book->parametres->facebook_description;\r
                        }\r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.html.php b/inc/ws/Controlleur/packager/class.ws.packager.html.php
index b2e01a2e5baae769dd80a00d8c1f50431a098752..6e4d0fca4ba9f008a2ee25b8e89acba13f0e6505 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.html.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.html.php
@@ -25,17 +25,17 @@ class wsPackagerHTML extends wsPackager {
                $facebook = '';\r
                if ($this->book->parametres->facebook) {\r
                        if ($this->book->parametres->facebook_title != '') {\r
-                               $facebook .= '<meta property="og:title" content="' . $this->book->parametres->facebook_title . '" />';\r
+                               $facebook .= '<meta property="og:title" content="' . self::escape($this->book->parametres->facebook_title) . '" />';\r
                        } else {\r
-                               $facebook .= '<meta property="og:title" content="' . $this->book->parametres->title . '" />';\r
+                               $facebook .= '<meta property="og:title" content="' . self::escape($this->book->parametres->title) . '" />';\r
                        }\r
                        if ($this->book->parametres->facebook_description != '') {\r
-                               $facebook .= '<meta property="og:description" content="' . $this->book->parametres->facebook_description . '" />';\r
+                               $facebook .= '<meta property="og:description" content="' . self::escape($this->book->parametres->facebook_description) . '" />';\r
                        }\r
                        $facebook .= '<meta property="og:image" content="http://dev.ws.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '" />';\r
                }\r
                // Stuffs to replace in html\r
-               $toReplace = array('lang' => strtolower($this->book->lang), 'title' => htmlentities($this->book->parametres->title, ENT_COMPAT, 'UTF-8'), 'ga' => $ga, 'facebook' => $facebook, 'bgcolor' => $this->theme->parametres->loadingBackColor);\r
+               $toReplace = array('lang' => strtolower($this->book->lang), 'title' => self::escape($this->book->parametres->title), 'ga' => $ga, 'facebook' => $facebook, 'bgcolor' => $this->theme->parametres->loadingBackColor);\r
 \r
                $this->origHTML = file_get_contents($this->vdir . '/index.html');\r
                $this->origHTML = $this->replaceHTML($toReplace);\r
@@ -52,7 +52,7 @@ class wsPackagerHTML extends wsPackager {
                        } else {\r
                                $dest = 'pages/page' . $page . '.html';\r
                                $pathToIndex = '../index.swf';\r
-                               $redirectScript = '<script type="text/javascript">window.location=\'../index.html#' . $page . '\';</script>';\r
+                               $redirectScript = '<script type="text/javascript">window.location=\'../index.html#/' . $page . '\';</script>';\r
                        }\r
                        $alt = '';\r
 \r
@@ -110,6 +110,11 @@ class wsPackagerHTML extends wsPackager {
                return $res;\r
        }\r
 \r
+       protected function escape($txt)\r
+       {\r
+               return htmlentities($txt, ENT_COMPAT, 'UTF-8');\r
+       }\r
+\r
        protected function makeHTMLFooter()\r
        {\r
                $res = '<div class="footer">';\r