(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 17e039e76b4212ff27f7e0eb25f55eb4f4b3ed5a..fed98616336c95d77b713b2cc66bdf95fc9319df 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -12,15 +12,61 @@ class wsServices extends cubeFlashGateway {
        }\r
 \r
        public function sendEmail() {\r
+               if (!$this->_checkHash()) {\r
+                       return;\r
+               }\r
+               // Send the email\r
+               $mail = new cubeMail();\r
+               $mail->returnPath = 'postmaster@fluidbook.com';\r
+               $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];\r
+               $mail->charset = 'UTF-8';\r
+               $mail->to = $this->args['email'];\r
+               $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';\r
+               $mail->subject = $this->args['subject'];\r
+               $mail->body = $this->args['body'];\r
+               $this->xml->addChild('ok', $mail->send() ? '1' : '0');\r
+       }\r
+\r
+       protected function _checkHash() {\r
                // Check protection hash\r
                $hash = md5(substr($this->args['fromemail'], 2, 6) . substr($this->args['email'], 3, 5) . 'SFGHF566!S' . $this->args['id']);\r
                if ($hash != $this->args['hash']) {\r
                        $this->xml->addChild('hashOK', '0');\r
                        $this->xml->addChild('ok', '0');\r
+                       return false;\r
+               }\r
+               $this->xml->addChild('hashOK', '1');\r
+               return true;\r
+       }\r
+\r
+       public function sendBookmarks() {\r
+               if (!$this->_checkHash()) {\r
                        return;\r
-               } else {\r
-                       $this->xml->addChild('hashOK', '1');\r
                }\r
+\r
+               $bookmarks = json_decode(base64_decode($this->args['bookmarks']));\r
+               $files = array();\r
+               foreach ($bookmarks as $b) {\r
+                       $file = $this->getPDFComplex($this->args['book_id'], $b['page'] . '-' . $b['page'] + $b['nb']);\r
+                       $files[] = array('name' => $b['name'], 'file' => $file['file']);\r
+               }\r
+\r
+               $limit = 5 * 1024 * 1024;\r
+               $groups = array();\r
+               $group = array();\r
+               $groupsize=array();\r
+               foreach ($files as $f) {\r
+                       $group[]=$f;\r
+                       $groupsize+=filesize($f['file']);\r
+                       \r
+                       if($groupsize>$limit){\r
+                               \r
+                       }\r
+               }\r
+\r
+\r
+\r
+\r
                // Send the email\r
                $mail = new cubeMail();\r
                $mail->returnPath = 'postmaster@fluidbook.com';\r
@@ -29,15 +75,6 @@ class wsServices extends cubeFlashGateway {
                $mail->to = $this->args['email'];\r
                $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';\r
                $mail->subject = $this->args['subject'];\r
-               if (isset($this->args['bookmarks'])) {\r
-                       $pdf = $this->getPDFComplex($this->args['id'], $this->args['bookmarks']);\r
-                       $mail->addFile('bookmarks.pdf', $pdf['file']);\r
-               }\r
-               /* if ($this->args['attachPDFInEmail'] == '1') {\r
-                 $doc_name = isset($this->args['attachmentName'])?$this->args['attachmentName']:'document.pdf';\r
-                 $file = fwsConverter::extractPages($this->args['id'], $this->args['attachPDFInEmail'], false);\r
-                 $mail->addFile($doc_name, $file);\r
-                 } */\r
                $mail->body = $this->args['body'];\r
                $this->xml->addChild('ok', $mail->send() ? '1' : '0');\r
        }\r