From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 29 Sep 2016 12:08:57 +0000 (+0000)
Subject: done #757 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=043d93f5a41f13aec68b336c692d3aaa1728f725;p=cubeextranet.git

done #757 @2
---

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 37c58c737..87a88a37c 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -169,7 +169,6 @@ class wsServices extends cubeFlashGateway {
 
 		$book = $dao->selectById($this->args['id']);
 
-
 		if (isset($book->parametres->facebook_image) && $book->parametres->facebook_image != '') {
 			$c = WS_BOOKS . '/working/' . $this->args['id'] . '/' . $book->parametres->facebook_image;
 			if (file_exists($c)) {
@@ -178,11 +177,26 @@ class wsServices extends cubeFlashGateway {
 		}
 		if (!isset($cover)) {
 			$pages = $dao->getPagesOfBook($this->args['id']);
-			$cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/html/t36-' . $pages[1]['document_page'] . '.jpg';
+			$dir = wsDocument::getDir($pages[1]['document_id']);
+			$cover = $dir . '/html/t150-' . $pages[1]['document_page'] . '.jpg';
 			if (!file_exists($cover)) {
-				$cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/p' . $pages[1]['document_page'] . '.jpg';
+				$cover = $dir . '/p' . $pages[1]['document_page'] . '.jpg';
 			}
+
+			$i = WS_FILES . '/cover/' . $this->args['id'] . '.jpg';
+
+			if (!file_exists($i) || filemtime(__FILE__) > filemtime($i) || filemtime($cover) > filemtime($i)) {
+				$it = new imageTools();
+				$it->loadImage($cover);
+
+				$it->resize(1200, 1000000, 'ratio', false);
+				$it->output('jpeg', $i, 85);
+				$it->close();
+			}
+			$cover = $i;
 		}
+
+
 		cubeHTTP::relayFile($cover);
 		exit;
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 5227b36e9..2706ddf3d 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1308,13 +1308,12 @@ html{height:100%}' . "\n";
 		$res .= '<meta name="google" value="notranslate">';
 		$res .= '<style type="text/css" media="print">*{ visibility: hidden; display: none }</style>';
 		// 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;
 			}
 			$meta['og:image'] = 'https://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id . '&j=' . TIME;
-		}
+
 
 		$redirectPDF = 'window.location="data/document.pdf"';
 
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 5774d2500..d45f85201 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -63,7 +63,11 @@ class wsPackagerHTML extends wsPackager {
 			if ($this->book->parametres->facebook_description != '') {
 				$facebook .= '<meta property="og:description" content="' . self::escape($this->book->parametres->facebook_description) . '" />';
 			}
-			$facebook .= '<meta property="og:image" content="https://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '&amp;time=' . time() . '" />';
+			$t = 'https://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '&j=' . time();
+			$dim = getimagesize($t);
+			$facebook .= '<meta property="og:image" content="' . $t . '" />';
+			$facebook .= '<meta property="og:image:width" content="' . $dim[0] . '" />';
+			$facebook .= '<meta property="og:image:height" content="' . $dim[1] . '" />';
 		}
 
 		$favicon = '';