]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a2c209e)
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 19 Oct 2011 16:17:42 +0000 (16:17 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 19 Oct 2011 16:17:42 +0000 (16:17 +0000)
fluidbook/compile/_js/fluidbook.js patch | blob | history
fluidbook/compile/index.html patch | blob | history
inc/ws/Controlleur/class.ws.ajax.php patch | blob | history
inc/ws/DAO/class.ws.dao.document.php patch | blob | history
inc/ws/Metier/class.ws.book.parametres.php patch | blob | history
inc/ws/Util/html5/class.ws.html5.compiler.php patch | blob | history
inc/ws/Util/packager/class.ws.packager.html.php patch | blob | history
js/ws.js patch | blob | history

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index ce4bedb54a210f2a46696c67411fff6dc42da730..6926e86cf86b45ca667944c82c5efda7063b4c66 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -10,7 +10,7 @@ function getWmode(){
 function getLocation(){\r
        return window.location.toString();\r
 }\r
-function parseGet(){\r
+function getFlashvars(junk){\r
        var couples=window.location.search.substr(1).split('&');\r
        var res=new Array();\r
        var couple=new Array();\r
@@ -18,6 +18,7 @@ function parseGet(){
                couple=couples[i].split('=');\r
                res[couple[0]]=couple[1];\r
        }\r
+       res['junk']=junk;\r
        return res;\r
 }\r
 function getLang(){\r
diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 6cf5466cbba0c16c13e7244796d497ac96c2b3d4..210f8a3e06cca393b29b50756979fc49e3565b54 100644 (file)
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -2,10 +2,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$lang" lang="$lang">\r
 <head>\r
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta http-equiv="Cache-Control" content="max-age=0" />\r
+<meta http-equiv="Cache-Control" content="no-cache" />\r
+<meta http-equiv="Expires" content="0" />\r
+<meta http-equiv="Expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />\r
+<meta http-equiv="Pragma" content="no-cache" />\r
+$robots\r
 $facebook\r
 <title>$title</title>\r
-<link href="style.css" rel="stylesheet" type="text/css" />\r
-<script type="text/javascript" src="fluidbook.js"></script>\r
+<link href="style.css?junk=$junk" rel="stylesheet" type="text/css" />\r
+<script type="text/javascript" src="fluidbook.js?junk=$junk"></script>\r
 <script type="text/javascript">FB_DEFAULT_LANG='$lang';</script>\r
 $redirectScript\r
 </head>\r
@@ -18,7 +24,7 @@ $redirectScript
 if(isMobile()){\r
        $redirectMobile\r
 }else{\r
-       swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.22","", parseGet(),       {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
+       swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "10.0.22","", getFlashvars($junk),   {"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});\r
 }\r
 </script>\r
 $ga\r
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 9858110c4f34433ce7fae92b8324fdaa85788fc2..19d5da350b4873acb36be18a8f5560c14eedbf32 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -790,6 +790,26 @@ class wsAjax extends cubeAjax {
 \r
                $dao = new wsDAODocument($core->con);\r
                $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Import from excel', $core->user->utilisateur_id);\r
+               \r
+               $specialLinks=array();\r
+               foreach($links as $l){\r
+                       if(is_int($l['page'])){\r
+                               continue;\r
+                       }\r
+                       $specialLinks[]=$l;\r
+               }\r
+               $specialRulers=array();\r
+               foreach($rulers as $r){\r
+                       if(is_int($r['page'])){\r
+                               continue;\r
+                       }\r
+                       $specialRulers[]=$r;\r
+               }\r
+               \r
+               \r
+               $daoBook = new wsDAOBook($core->con);\r
+               $daoBook->setSpecialLinksAndRulers($book_id, json_encode($specialLinks), json_encode($specialRulers));\r
+               \r
        }\r
 \r
 }\r
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index a033e292ea5c431677a9654aba7458efe277a905..f894effe9c03347860f8dc9039796b953ebcbcf5 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -139,6 +139,9 @@ class wsDAODocument extends commonDAO {
                $rulers = array();\r
 \r
                foreach ($t as $page => $tt) {\r
+                       if(!is_int($page)){\r
+                               continue;\r
+                       }\r
                        $infos = $pages[$page];\r
                        $doc_id = $infos['document_id'];\r
                        $doc_page = $infos['document_page'];\r
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 88f18ada9409bc13b4dc543aee7c726a35c72197..714092c35437cd82f9b6b97bfa0038b2f1e3dd76 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -186,6 +186,11 @@ class wsBookParametres extends wsParametres {
                $this->forms['secure'] = array('label' => __('Sécurisation'),\r
                        'fieldsnames' => array('secureURL', 'secureURLRedirect'));\r
 \r
+               $this->fields['seoVersion'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Générer une version pour les moteurs de recherche'));\r
+               $this->fields['seoRobots'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Autoriser le parcours par les moteurs de recherche'));\r
+\r
+               $this->forms['seo'] = array('label' => __('Optimisation pour les moteurs de recherche'),\r
+                       'fieldsnames' => array('seoVersion', 'seoRobots'));\r
 \r
                $this->fields['widget'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Générer le widget'), 'grade' => 5);\r
                $this->fields['widgetCover'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher la couverture') . ')', 'grade' => 5);\r
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b53239b29ee50142150737bf6ea664d34e21fff9..eed282310b335d1374033d61a7e1314765eed01a 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -1031,7 +1031,7 @@ class wsHTML5Compiler {
                $origDir = WS_BOOKS . '/working/' . $this->book_id . '/';
                $types = array('mp4', 'ogv', 'webm', 'jpg');
                if ($video) {
-                       wsTools::encodeWebVideos($origDir . $source, null, false);
+                       wsTools::encodeWebVideos($origDir . $source, null, true);
                        $e = explode('.', $source);
                        array_pop($e);
                        $base = implode('.', $e);
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index fe2092c098a6fdfbc5e293f9c4572a669a527add..475cbe1345f91c596cdda75fae1af6e50efa779a 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -53,13 +53,29 @@ class wsPackagerHTML extends wsPackager {
                        $this->prepareHTML5();\r
                }\r
 \r
+               $seoVersion = true;\r
+               if (isset($this->book->parametres->seoVersion)) {\r
+                       $seoVersion = $this->book->parametres->seoVersion;\r
+               }\r
+\r
+               $seoRobot = true;\r
+               if (isset($this->book->parametres->seoRobot)) {\r
+                       $seoRobot = $this->book->parametres->seoRobot;\r
+               }\r
+\r
+               $robots = '';\r
+               if (!$seoRobot) {\r
+                       $robots='<meta name="robots" content="noindex, nofollow" />';\r
+               }\r
 \r
                // Stuffs to replace in html\r
                $toReplace = array('lang' => strtolower($this->book->lang),\r
                        'title' => self::escape($this->book->parametres->title),\r
                        'ga' => $ga, 'facebook' => $facebook,\r
                        'bgcolor' => $this->theme->parametres->loadingBackColor,\r
-                       'redirectMobile' => $redirectMobile);\r
+                       'redirectMobile' => $redirectMobile,\r
+                       'junk' => TIME,\r
+                       'robots' => $robots);\r
 \r
                $this->origHTML = file_get_contents($this->vdir . '/index.html');\r
                $this->origHTML = $this->replaceHTML($toReplace);\r
@@ -84,16 +100,19 @@ class wsPackagerHTML extends wsPackager {
 \r
                        $htmlfile = WS_DOCS . '/' . $infos['document_id'] . '/h' . $infos['document_page'] . '.txt';\r
 \r
-                       if (file_exists($htmlfile)) {\r
+                       if ($seoVersion && file_exists($htmlfile)) {\r
                                $html = file_get_contents($htmlfile);\r
                                $alt .= "\n" . $html . "\n";\r
-                       }\r
 \r
-                       if ($page == 1) {\r
-                               $alt .= $nav1;\r
-                       } else {\r
-                               $alt .= $nav;\r
+\r
+                               if ($page == 1) {\r
+                                       $alt .= $nav1;\r
+                               } else {\r
+                                       $alt .= $nav;\r
+                               }\r
                        }\r
+\r
+\r
                        $alt .= $footer;\r
 \r
                        $data = str_replace('$alt', $alt, $this->origHTML);\r
@@ -102,6 +121,10 @@ class wsPackagerHTML extends wsPackager {
                        $data = str_replace('$redirectScript', $redirectScript, $data);\r
 \r
                        file_put_contents($this->vdir . $dest, $data);\r
+\r
+                       if (!$seoVersion) {\r
+                               break;\r
+                       }\r
                }\r
        }\r
 \r
@@ -112,8 +135,8 @@ class wsPackagerHTML extends wsPackager {
                $cp = new cubeCommandLine('cp');\r
                $cp->setPath(CONVERTER_PATH);\r
                $cp->setArg('r');\r
-               $cp->setArg(null,WS_BOOKS . '/html5/' . $this->book_id . '/*');\r
-               $cp->setArg(null,$dest);\r
+               $cp->setArg(null, WS_BOOKS . '/html5/' . $this->book_id . '/*');\r
+               $cp->setArg(null, $dest);\r
                $cp->execute();\r
 \r
                $filesToDelete = array('indext.html', 'indexu.html', 'data/datas.js');\r
@@ -126,7 +149,7 @@ class wsPackagerHTML extends wsPackager {
                $rm = new cubeCommandLine('rm');\r
                $rm->setPath(CONVERTER_PATH);\r
                foreach ($filesToDelete as $f) {\r
-                       $rm->setArg(null, $dest.'/'.$f);\r
+                       $rm->setArg(null, $dest . '/' . $f);\r
                }\r
                $rm->execute();\r
        }\r
diff --git a/js/ws.js b/js/ws.js
index b9b8693d4875d1b77736d639c879207d8b3810b9..431c9727f15f5940d9e2873c9a8fc37686dcc64b 100644 (file)
--- a/js/ws.js
+++ b/js/ws.js
@@ -36,7 +36,7 @@ function load_ws(){
                        url             :       SITE_PATH+'ajax/'+$(this).attr('action'),\r
                        success :       function(data){\r
                                window.opener.document.getElementById("composerSwf").reloadLinks();\r
-                               window.close(); \r
+                               //window.close();       \r
                        }\r
                });\r
                return false;\r
@@ -57,7 +57,6 @@ function restoreLink(){
        $.ajax({\r
                url             :       SITE_PATH+'ajax/restoreLinksVersion/'+$(this).attr('rel'),\r
                success :       function(data){\r
-                       //window.opener.location=window.opener.location;\r
                        window.opener.document.getElementById("composerSwf").reloadLinks();\r
                        window.close();\r
                }\r
Unnamed repository; edit this file 'description' to name the repository.