From: vincent@cubedesigners.com Date: Mon, 17 Dec 2012 12:47:45 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b4d73e8b42f785f14a22a092bcac503dadfefcbf;p=cubeextranet.git --- diff --git a/fluidbook/icones/1/mobile/help-fingers.svg b/fluidbook/icones/1/mobile/help-fingers.svg index ae43ddb39..f45e6d2fe 100644 --- a/fluidbook/icones/1/mobile/help-fingers.svg +++ b/fluidbook/icones/1/mobile/help-fingers.svg @@ -1,39 +1,70 @@ - - + + + + + + + + + + + - + - + - - + l2.058,6.843l6.844,2.058c2.367,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.548,3.455-3.455,3.455l-10.922-1.4 + c0,0-1.663-0.125-2.512-0.974S51.244,116.586,51.244,116.586z"/> + diff --git a/fluidbook/icones/1/nav-bookmark.png b/fluidbook/icones/1/nav-bookmark.png index 924300308..871f0558e 100644 Binary files a/fluidbook/icones/1/nav-bookmark.png and b/fluidbook/icones/1/nav-bookmark.png differ diff --git a/fluidbook/icones/2/mobile/nav-bookmark.svg b/fluidbook/icones/2/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/2/mobile/nav-bookmark.svg +++ b/fluidbook/icones/2/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/2/mobile/nav-email.svg b/fluidbook/icones/2/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/2/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/2/mobile/nav-twitter.svg b/fluidbook/icones/2/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/2/mobile/nav-twitter.svg +++ b/fluidbook/icones/2/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/3/mobile/nav-bookmark.svg b/fluidbook/icones/3/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/3/mobile/nav-bookmark.svg +++ b/fluidbook/icones/3/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/3/mobile/nav-email.svg b/fluidbook/icones/3/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/3/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/3/mobile/nav-twitter.svg b/fluidbook/icones/3/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/3/mobile/nav-twitter.svg +++ b/fluidbook/icones/3/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/3/nav-bookmark.png b/fluidbook/icones/3/nav-bookmark.png index 111b08bfb..871f0558e 100644 Binary files a/fluidbook/icones/3/nav-bookmark.png and b/fluidbook/icones/3/nav-bookmark.png differ diff --git a/fluidbook/icones/3/nav-email.png b/fluidbook/icones/3/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/3/nav-email.png differ diff --git a/fluidbook/icones/3/nav-facebook.png b/fluidbook/icones/3/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/3/nav-facebook.png differ diff --git a/fluidbook/icones/3/nav-twitter.png b/fluidbook/icones/3/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/3/nav-twitter.png differ diff --git a/fluidbook/icones/4/mobile/nav-bookmark.svg b/fluidbook/icones/4/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/4/mobile/nav-bookmark.svg +++ b/fluidbook/icones/4/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/4/mobile/nav-email.svg b/fluidbook/icones/4/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/4/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/4/mobile/nav-twitter.svg b/fluidbook/icones/4/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/4/mobile/nav-twitter.svg +++ b/fluidbook/icones/4/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/4/nav-bookmark.png b/fluidbook/icones/4/nav-bookmark.png index 111b08bfb..871f0558e 100644 Binary files a/fluidbook/icones/4/nav-bookmark.png and b/fluidbook/icones/4/nav-bookmark.png differ diff --git a/fluidbook/icones/4/nav-email.png b/fluidbook/icones/4/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/4/nav-email.png differ diff --git a/fluidbook/icones/4/nav-facebook.png b/fluidbook/icones/4/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/4/nav-facebook.png differ diff --git a/fluidbook/icones/4/nav-twitter.png b/fluidbook/icones/4/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/4/nav-twitter.png differ diff --git a/fluidbook/icones/5/mobile/nav-bookmark.svg b/fluidbook/icones/5/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/5/mobile/nav-bookmark.svg +++ b/fluidbook/icones/5/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/5/mobile/nav-email.svg b/fluidbook/icones/5/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/5/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/5/mobile/nav-twitter.svg b/fluidbook/icones/5/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/5/mobile/nav-twitter.svg +++ b/fluidbook/icones/5/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/5/nav-bookmark.png b/fluidbook/icones/5/nav-bookmark.png index 9b2a206e3..871f0558e 100644 Binary files a/fluidbook/icones/5/nav-bookmark.png and b/fluidbook/icones/5/nav-bookmark.png differ diff --git a/fluidbook/icones/5/nav-email.png b/fluidbook/icones/5/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/5/nav-email.png differ diff --git a/fluidbook/icones/5/nav-facebook.png b/fluidbook/icones/5/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/5/nav-facebook.png differ diff --git a/fluidbook/icones/5/nav-twitter.png b/fluidbook/icones/5/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/5/nav-twitter.png differ diff --git a/fluidbook/icones/6/mobile/nav-bookmark.svg b/fluidbook/icones/6/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/6/mobile/nav-bookmark.svg +++ b/fluidbook/icones/6/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/6/mobile/nav-email.svg b/fluidbook/icones/6/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/6/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/6/mobile/nav-twitter.svg b/fluidbook/icones/6/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/6/mobile/nav-twitter.svg +++ b/fluidbook/icones/6/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/6/nav-bookmark.png b/fluidbook/icones/6/nav-bookmark.png index 111b08bfb..871f0558e 100644 Binary files a/fluidbook/icones/6/nav-bookmark.png and b/fluidbook/icones/6/nav-bookmark.png differ diff --git a/fluidbook/icones/6/nav-email.png b/fluidbook/icones/6/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/6/nav-email.png differ diff --git a/fluidbook/icones/6/nav-facebook.png b/fluidbook/icones/6/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/6/nav-facebook.png differ diff --git a/fluidbook/icones/6/nav-twitter.png b/fluidbook/icones/6/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/6/nav-twitter.png differ diff --git a/fluidbook/icones/7/mobile/nav-bookmark.svg b/fluidbook/icones/7/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/7/mobile/nav-bookmark.svg +++ b/fluidbook/icones/7/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/7/mobile/nav-email.svg b/fluidbook/icones/7/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-twitter.svg b/fluidbook/icones/7/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/7/mobile/nav-twitter.svg +++ b/fluidbook/icones/7/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/7/nav-email.png b/fluidbook/icones/7/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/7/nav-email.png differ diff --git a/fluidbook/icones/7/nav-facebook.png b/fluidbook/icones/7/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/7/nav-facebook.png differ diff --git a/fluidbook/icones/7/nav-twitter.png b/fluidbook/icones/7/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/7/nav-twitter.png differ diff --git a/fluidbook/icones/8/mobile/nav-bookmark.svg b/fluidbook/icones/8/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/8/mobile/nav-bookmark.svg +++ b/fluidbook/icones/8/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/8/mobile/nav-email.svg b/fluidbook/icones/8/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/8/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/8/mobile/nav-twitter.svg b/fluidbook/icones/8/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/8/mobile/nav-twitter.svg +++ b/fluidbook/icones/8/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/8/nav-bookmark.png b/fluidbook/icones/8/nav-bookmark.png index 111b08bfb..871f0558e 100644 Binary files a/fluidbook/icones/8/nav-bookmark.png and b/fluidbook/icones/8/nav-bookmark.png differ diff --git a/fluidbook/icones/8/nav-email.png b/fluidbook/icones/8/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/8/nav-email.png differ diff --git a/fluidbook/icones/8/nav-facebook.png b/fluidbook/icones/8/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/8/nav-facebook.png differ diff --git a/fluidbook/icones/8/nav-twitter.png b/fluidbook/icones/8/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/8/nav-twitter.png differ diff --git a/fluidbook/icones/9/mobile/nav-bookmark.svg b/fluidbook/icones/9/mobile/nav-bookmark.svg index 0ff3bd47d..fdd257a7c 100644 --- a/fluidbook/icones/9/mobile/nav-bookmark.svg +++ b/fluidbook/icones/9/mobile/nav-bookmark.svg @@ -2,7 +2,14 @@ - + width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve"> + diff --git a/fluidbook/icones/9/mobile/nav-email.svg b/fluidbook/icones/9/mobile/nav-email.svg new file mode 100644 index 000000000..03b44dc63 --- /dev/null +++ b/fluidbook/icones/9/mobile/nav-email.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/fluidbook/icones/9/mobile/nav-twitter.svg b/fluidbook/icones/9/mobile/nav-twitter.svg index 97bcabe54..6ba481de5 100644 --- a/fluidbook/icones/9/mobile/nav-twitter.svg +++ b/fluidbook/icones/9/mobile/nav-twitter.svg @@ -1,15 +1,17 @@ - - + + + + diff --git a/fluidbook/icones/9/nav-bookmark.png b/fluidbook/icones/9/nav-bookmark.png index 111b08bfb..871f0558e 100644 Binary files a/fluidbook/icones/9/nav-bookmark.png and b/fluidbook/icones/9/nav-bookmark.png differ diff --git a/fluidbook/icones/9/nav-email.png b/fluidbook/icones/9/nav-email.png new file mode 100644 index 000000000..9aad18194 Binary files /dev/null and b/fluidbook/icones/9/nav-email.png differ diff --git a/fluidbook/icones/9/nav-facebook.png b/fluidbook/icones/9/nav-facebook.png new file mode 100644 index 000000000..7dcb71312 Binary files /dev/null and b/fluidbook/icones/9/nav-facebook.png differ diff --git a/fluidbook/icones/9/nav-twitter.png b/fluidbook/icones/9/nav-twitter.png new file mode 100644 index 000000000..a4ad9ad0f Binary files /dev/null and b/fluidbook/icones/9/nav-twitter.png differ diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index fed986163..662bf63b7 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -44,39 +44,67 @@ class wsServices extends cubeFlashGateway { return; } - $bookmarks = json_decode(base64_decode($this->args['bookmarks'])); + $bookmarks = json_decode(base64_decode($this->args['bookmarks']), true); $files = array(); foreach ($bookmarks as $b) { - $file = $this->getPDFComplex($this->args['book_id'], $b['page'] . '-' . $b['page'] + $b['nb']); + $file = $this->getPDFComplex($this->args['id'], $b['page'] . '-' . $b['page'] + $b['nb']); $files[] = array('name' => $b['name'], 'file' => $file['file']); } - $limit = 5 * 1024 * 1024; + $limit = 5 * 1024 * 1024 * 0.8; $groups = array(); $group = array(); - $groupsize=array(); + $groupsize = 0; foreach ($files as $f) { - $group[]=$f; - $groupsize+=filesize($f['file']); - - if($groupsize>$limit){ - + $size = filesize($f['file']); + + if ($groupsize + $size > $limit) { + if (count($group)) { + $groups[] = $group; + $group = array(); + $groupsize = 0; + } + + $group[] = $f; + $groupsize = $size; + + if ($groupsize > $limit) { + $groups[] = $group; + $group = array(); + $groupsize = 0; + } + } else { + $group[] = $f; + $groupsize+=$size; } } + if (count($group)) { + $groups[] = $group; + } + $total = count($groups); + foreach ($groups as $i => $g) { + $s = ''; + if ($total > 0) { + $s = ' (' . ($i + 1) . '/' . $total . ')'; + } - // Send the email - $mail = new cubeMail(); - $mail->returnPath = 'postmaster@fluidbook.com'; - $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge']; - $mail->charset = 'UTF-8'; - $mail->to = $this->args['email']; - $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>'; - $mail->subject = $this->args['subject']; - $mail->body = $this->args['body']; - $this->xml->addChild('ok', $mail->send() ? '1' : '0'); + // Send the email + $mail = new cubeMail(); + $mail->returnPath = 'postmaster@fluidbook.com'; + $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge']; + $mail->charset = 'UTF-8'; + $mail->to = $this->args['email']; + $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>'; + $mail->subject = $this->args['subject'] . $s; + $mail->body = $this->args['body']; + foreach ($g as $f) { + $mail->addFile($f['name'] . '.pdf', $f['file']); + } + $this->xml->addChild('ok', $mail->send() ? '1' : '0'); + } } protected function shortenURL($url, $id) {