From 77d0af52183a3427680cb3d388e4de678b0d0eaf Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 7 Jun 2011 10:31:54 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.services.php |  2 +-
 inc/ws/Controlleur/class.ws.url.php      | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 8b521b9df..7694bbca0 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -96,7 +96,7 @@ class wsServices extends cubeFlashGateway {
 
 	public function facebookShare()
 	{
-		http::redirect('http://www.facebook.com/sharer.php?u=' . $this->args['url']);
+		http::redirect('http://www.facebook.com/sharer/sharer.php?u=' . urlencode($this->args['url']));
 		exit;
 	}
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index b0b6ddc58..1f96de1cc 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -608,13 +608,10 @@ html{height:100%}' . "\n";
 		$wmode = isset($args[1]) ? $args[1] : '';
 
 		$e = explode('_', $args[0]);
+		$newurl=null;
 		if (count($e) == 2 || $e[2] < TIME - 10) {
 			$e[2] = TIME;
-			//http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);
-			$url = SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode . '/';
-			$url = rtrim($url, '/') . '/';
-			ob_end_clean();
-			echo '<script type="text/javascript">window.location=\'' . $url . '\'+window.location.hash;</script>';
+			http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);
 			exit;
 		}
 
@@ -625,7 +622,7 @@ html{height:100%}' . "\n";
 		self::checkDocumentVersionOfBook($book_id);
 		wsSecureSWF::checkProtectedSWF();
 
-		echo self::commonViewer($book_id, $e[1], false, $wmode);
+		echo self::commonViewer($book_id, $e[1], false, $wmode,$newurl);
 	}
 
 	public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') {
@@ -682,7 +679,7 @@ html{height:100%}' . "\n";
 			if ($book->parametres->facebook_description != '') {
 				$meta['og:description'] = $book->parametres->facebook_description;
 			}
-			$meta['og:image'] = 'http://dev.ws.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;
+			$meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;
 		}
 
 		$alt = '<div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank">' . cubeMedia::image($webcompile . 'getflash.gif', 734, 409, '') . '</a></div>';
-- 
2.39.5