From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 8 Feb 2011 10:41:23 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dd084755502333f707539d86be0ffd5ad005f5fe;p=cubeextranet.git

---

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