(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 5771be61ded50aef9882d1d62f57d80e9e3dc6a9..b0c622d41955f7c62584e44fddcfceeea78d20b5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -713,6 +713,8 @@ class wsAjax extends cubeAjax {
        public static function restoreLinksVersion($args, &$x) {\r
                global $core;\r
 \r
+               set_time_limit(0);\r
+               \r
                $book_id = $args[1];\r
                $time = $args[2];\r
 \r
@@ -722,7 +724,7 @@ class wsAjax extends cubeAjax {
 \r
                self::getLinksFromExcel($xls, $links, $rulers);\r
 \r
-\r
+               \r
 \r
                $dao = new wsDAODocument($core->con);\r
                $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 9b2ad9027805ff6df1c0c6c20bc0be29a77e3df9..4968148b11604799cde705283933388dc742025b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -762,6 +762,12 @@ html{height:100%}' . "\n";
                        $meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;\r
                }\r
 \r
+               if ($book->parametres->mobileVersion == 'pdf') {\r
+                       $redirectMobile = 'window.location="data/document.pdf";';\r
+               } else {\r
+                       $redirectMobile = 'window.location="/viewerh/' . $book_id . '_' . $hash . '_' . TIME . '/";';\r
+               }\r
+\r
                $alt = '<div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank">' . cubeMedia::image($webcompile . 'getflash.gif', 734, 409, '') . '</a></div>';\r
 \r
                $res .= '</head>';\r
@@ -769,7 +775,7 @@ html{height:100%}' . "\n";
                $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 .= '<script type="text/javascript">';\r
                $res.='if(isMobile()){' . "\n";\r
-               $res.="\t" . 'window.location="data/document.pdf"' . "\n";\r
+               $res.="\t" . $redirectMobile . "\n";\r
                $res.='} else {' . "\n";\r
                $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",';\r
                $res .= '"", ' . json_encode($fv) . ',';\r

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 0391ec9c81c474bba9c8ecb202eeb9e7419e46d7..e587f089df1f739e01cf7587c8c3de5b6ce8595c 100644 (file)
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -42,10 +42,15 @@ class wsLinks {
                foreach ($links as $l) {
                        $i = 0;
                        foreach ($cols as $id => $label) {
-                               if (!is_null($pages) && ($id == 'document_id' || $id == 'document_page')) {
-                                       $infos = $pages[$l['page']];
-                                       $value = $infos[$id];
+                               if (($id == 'document_id' || $id == 'document_page')) {
+                                       if (!is_null($pages)) {
+                                               $infos = $pages[$l['page']];
+                                               $value = $infos[$id];
+                                       }else{
+                                               $value='';
+                                       }
                                } else {
+
                                        if (is_bool($l[$id])) {
                                                $l[$id] = $l[$id] ? 1 : 0;
                                        }

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index eed282310b335d1374033d61a7e1314765eed01a..ba929d7b0802ef72c0b8e84047a219d1d9b598db 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -386,9 +386,6 @@ class wsHTML5Compiler {
                                $fontforge->setArg(null, '-');
                                $fontforge->setArg(null, $this->vdir . '/data/style/F' . $index . '.' . $format);
                                $fontforge->execute();
-                               
-                               fb($fontforge->commande);
-                               fb($fontforge->output);
                        }
                }
        }