(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 8b521b9dfa84ec58beb33b7ad1314f85fea199e5..7694bbca0123e0732b2296e71949fd371fed3139 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -96,7 +96,7 @@ class wsServices extends cubeFlashGateway {
 \r
        public function facebookShare()\r
        {\r
-               http::redirect('http://www.facebook.com/sharer.php?u=' . $this->args['url']);\r
+               http::redirect('http://www.facebook.com/sharer/sharer.php?u=' . urlencode($this->args['url']));\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index b0b6ddc58958a12e3b0699833c41c7a59d0771dd..1f96de1ccf89edbcfdc6dae1cf7d0c8bd2620e23 100644 (file)
--- 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] : '';\r
 \r
                $e = explode('_', $args[0]);\r
+               $newurl=null;\r
                if (count($e) == 2 || $e[2] < TIME - 10) {\r
                        $e[2] = TIME;\r
-                       //http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);\r
-                       $url = SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode . '/';\r
-                       $url = rtrim($url, '/') . '/';\r
-                       ob_end_clean();\r
-                       echo '<script type="text/javascript">window.location=\'' . $url . '\'+window.location.hash;</script>';\r
+                       http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);\r
                        exit;\r
                }\r
 \r
@@ -625,7 +622,7 @@ html{height:100%}' . "\n";
                self::checkDocumentVersionOfBook($book_id);\r
                wsSecureSWF::checkProtectedSWF();\r
 \r
-               echo self::commonViewer($book_id, $e[1], false, $wmode);\r
+               echo self::commonViewer($book_id, $e[1], false, $wmode,$newurl);\r
        }\r
 \r
        public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') {\r
@@ -682,7 +679,7 @@ html{height:100%}' . "\n";
                        if ($book->parametres->facebook_description != '') {\r
                                $meta['og:description'] = $book->parametres->facebook_description;\r
                        }\r
-                       $meta['og:image'] = 'http://dev.ws.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;\r
+                       $meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;\r
                }\r
 \r
                $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>';\r