(no commit message)

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 5a6ab5891340de47ba6c78e4d97c2ff7450d7de2..9660bd8a5375ee198bf2baa941da0aefa0a0e307 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -429,10 +429,11 @@ class commonTools {
                $upload = $tmp . '/upload.png';
                move_uploaded_file($_FILES['file']['tmp_name'], $upload);
 
+               $dim = getimagesize($upload);
+
                if (!isset($_POST['round']) || $_POST['round'] == 0) {
                        $round = $upload;
                } else {
-                       $dim = getimagesize($upload);
                        $w = $dim[0];
                        $ra = round($w * ($_POST['round'] / 100));
                        $round = $tmp . '/round.png';
@@ -476,9 +477,12 @@ class commonTools {
                        if (in_array($s, $apple)) {
                                continue;
                        }
-                       $icotool->setArg(null, $r);
-                       if (in_array($s, $icns)) {
-                               $png2icns->setArg(null, $r);
+
+                       if ($s <= $dim[0]) {
+                               $icotool->setArg(null, $r);
+                               if (in_array($s, $icns)) {
+                                       $png2icns->setArg(null, $r);
+                               }
                        }
                }
 

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 43aeb626e1398132cc198e7e8045ea885158f93c..11a6805784270c0f6d5ee5964c3653a8f15d2d6b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -158,7 +158,10 @@ class wsServices extends cubeFlashGateway {
                }\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
+                       $cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/html/t36-' . $pages[1]['document_page'] . '.jpg';\r
+                       if (!file_exists($cover)) {\r
+                               $cover = WS_DOCS . '/' . $pages[1]['document_id'] . '/p' . $pages[1]['document_page'] . '.jpg';\r
+                       }\r
                }\r
 \r
 \r
@@ -371,7 +374,7 @@ class wsServices extends cubeFlashGateway {
        }\r
 \r
        public function grdfValidForm() {\r
-               $notempty = array('civilite', 'prenom', 'nom',  'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');\r
+               $notempty = array('civilite', 'prenom', 'nom', 'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');\r
                $error = false;\r
                $errors = array();\r
                foreach ($notempty as $f) {\r
@@ -381,10 +384,10 @@ class wsServices extends cubeFlashGateway {
                        }\r
                }\r
 \r
-               /*if (!cubeMail::isEmail($this->args['email'])) {\r
-                       $error = true;\r
-                       $errors[] = 'email_valid';\r
-               } */\r
+               /* if (!cubeMail::isEmail($this->args['email'])) {\r
+                 $error = true;\r
+                 $errors[] = 'email_valid';\r
+                 } */\r
 \r
                $this->xml->addChild('ok', $error ? '0' : '1');\r
                $this->xml->addChild('errors', implode(',', $errors));\r
@@ -403,8 +406,8 @@ class wsServices extends cubeFlashGateway {
                $mail->subject = '[Chéquier avantages] Validation de coupon';\r
                $mail->from = 'noreply@chequieravantages.fr';\r
                $mail->replyTo = 'noreply@chequiavantages.fr';\r
-               $mail->cc = 'gerald@sensoa.fr';\r
-               $mail->to = 'chequieravantages@gmail.com';\r
+               $mail->to = 'projetrenogaz@grdf.fr';\r
+               $mail->bcc = 'test@cubedesigners.com';\r
                $body = '';\r
 \r
                foreach ($fields as $k => $f) {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 59352ac75fbadcc971d29c58498f8ab33909d441..c03469e24a66ab3490bf0ca2f0614d8afede6d38 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1166,7 +1166,7 @@ html{height:100%}' . "\n";
                        if ($book->parametres->facebook_description != '') {\r
                                $meta['og:description'] = $book->parametres->facebook_description;\r
                        }\r
-                       $meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;\r
+                       $meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id . '&j=' . TIME;\r
                }\r
 \r
                $redirectPDF = 'window.location="data/document.pdf"';\r
@@ -1181,7 +1181,7 @@ html{height:100%}' . "\n";
 \r
                $res .= '</head>';\r
                $res .= '<body style="background-color:#' . $theme->parametres->loadingBackColor . '" onload="this.focus();">';\r
-               $res .= '<div id="fluidbook"><div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img src="http://static.workshop.fluidbook.com/fluidbook/compile/getflash.gif" alt="" width="734" height="409"/></a></div></div>';\r
+               $res .= '<div id="fluidbook"><div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank"></a></div></div>';\r
                $res .= "\n" . '<script type="text/javascript">' . "\n";\r
                $res.='if(isMobile()){' . "\n";\r
                $res.="\t" . $redirectMobile . "\n";\r