(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 01d3d38980f85e8b74fdc1bf873732bb0e4b2c01..ffc3b7a4ed6a4d34ea29ae9be308d84eacf41ee9 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -45,7 +45,6 @@ class wsServices extends cubeFlashGateway {
                }\r
 \r
                $bookmarks = json_decode(base64_decode($this->args['bookmarks']), true);\r
-               fb($bookmarks);\r
                $files = array();\r
                foreach ($bookmarks as $b) {\r
                        $range = $b['page'];\r
@@ -145,26 +144,23 @@ class wsServices extends cubeFlashGateway {
        public function facebook_thumbnail() {\r
                $this->outputXML = false;\r
                $dao = new wsDAOBook($this->con);\r
-               $pages = $dao->getPagesOfBook($this->args['id']);\r
 \r
-               $dest = WS_CACHE . '/thumbnails/' . $this->args['id'] . '_' . $pages[1]['document_id'] . '_' . $pages[1]['document_page'] . '.jpg';\r
-               $cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/p' . $pages[1]['document_page'] . '.jpg';\r
+               $book = $dao->selectById($this->args['id']);\r
 \r
-               if (!file_exists($dest) || filemtime($dest) < filemtime($cover)) {\r
-                       $it = new imageTools();\r
-                       $ratio = $it->getW() / $it->getH();\r
-                       $method = 'ratio';\r
-                       if ($ratio > 3 || (1 / $ratio) > 3) {\r
-                               $method = 'crop';\r
-                       }\r
-\r
-                       $it->loadImage($cover);\r
-                       $it->resize(141, 200, $method, true);\r
 \r
-                       $it->output('jpeg', $dest, 100);\r
+               if (isset($book->parametres->facebook_image) && $book->parametres->facebook_image != '') {\r
+                       $c = WS_BOOKS . '/working/' . $this->args['id'] . '/' . $book->parametres->facebook_image;\r
+                       if (file_exists($c)) {\r
+                               $cover = $c;\r
+                       }\r
                }\r
+               if (!isset($cover)) {\r
+                       $pages = $dao->getPagesOfBook($this->args['id']);\r
+                       $cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/p' . $pages[1]['document_page'] . '.jpg';\r
+               }\r
+\r
 \r
-               cubeHTTP::relayFile($dest);\r
+               cubeHTTP::relayFile($cover);\r
 \r
                exit;\r
        }\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 7260e2e80380abff006b4c6ff0809620f310b459..9f3ce1b50f61c37b3026a0ef9b435542e6c54c91 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -54,6 +54,8 @@ class wsBookParametres extends wsParametres {
                $this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));\r
                $this->fields['facebook_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre facebook"), 'hint' => __('Titre proposé sur la fonction de partage facebook (par défaut, titre de la publication)'));\r
                $this->fields['facebook_description'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Description facebook"), 'grade' => 1, 'hint' => __('Description proposée sur la fonction de partage facebook (par défaut, vide)'));\r
+               $this->fields['facebook_image'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
+                       'label' => __('Miniature affichée'), 'fileFilter' => $imageFilter);\r
                $this->fields['twitter'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Twitter'));\r
                $this->fields['twitter_description'] = array('type' => 'textarea', 'default' => '%title% : %short%', 'editable' => true, 'label' => __("Contenu Twitter"), 'hint' => __('Contenu du Twit'));\r
                $this->fields['customSharer'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Classe personnalisée de partage"), 'grade' => 5);\r
@@ -61,7 +63,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['friendHeight'] = array('type' => 'integer', 'default' => 500, 'editable' => true, 'label' => __('Largeur du menu'), 'grade' => 5);\r
                $this->forms['share'] = array('label' => __('Fonctions de partage'),\r
                        'fieldsnames' => array('friend', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', '|',\r
-                               'facebook', 'facebook_title', 'facebook_description', '|',\r
+                               'facebook', 'facebook_title', 'facebook_description', 'facebook_image', '|',\r
                                'twitter', 'twitter_description', '|', 'customSharer', '|', 'friendWidth', 'friendHeight'));\r
                // .\r
                $this->fields['pages'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Nombre de pages'));\r