done #3042 @0:10

diff --git a/inc/commons/DAO/class.common.dao.fichier.php b/inc/commons/DAO/class.common.dao.fichier.php
index 24cba5aab347b363dc0421108742c02c9bb1c714..fefe3f9db8790bf9b3ac1b7e986a020cd8c2a986 100644 (file)
--- a/inc/commons/DAO/class.common.dao.fichier.php
+++ b/inc/commons/DAO/class.common.dao.fichier.php
@@ -129,7 +129,7 @@ class commonDAOFichier extends commonDAO
 \r
        public function deleteOldFiles()\r
        {\r
-               cubeFiles::deleteFilesOlderThan(FTPROOT, 60, array('(.*)\.ipa', '(.*)\.apk'));\r
+               //cubeFiles::deleteFilesOlderThan(FTPROOT, 60, array('(.*)\.ipa', '(.*)\.apk'));\r
        }\r
 \r
 }
\ No newline at end of file

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 33566e2a2e6f584082bda2478aec69dd4109d219..2525e2a1a448b8538d717c6f2424350f868cf2f0 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -25,7 +25,7 @@ if ($_SERVER['SERVER_ADDR'] == '91.121.74.76') {
 } else {\r
 \r
        define('SERVER', 'alien');\r
-       define('DB_HOST', 'localhost');\r
+       define('DB_HOST', '127.0.0.1');\r
        define('AMARCORD', false);\r
 \r
 }\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index b3760528b1254cc90f6cb54f80af31edbcc291c6..d56f06741e11875dbcf74791381a53fbd3786d63 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -16,7 +16,7 @@ class wsFlash extends cubeFlashGateway
         $gateway->addAttribute('creation', $droits->creation ? '1' : '0');
         $gateway->addAttribute('revendeur', $droits->revendeur ? '1' : '0');
         $gateway->addAttribute('admin', $droits->admin ? '1' : '0');
-        if (null !== $core->user) {
+        if (null !== $core->user || !is_object($core->user)) {
             $grade = -1;
         } else {
             $grade = $core->user->ws_grade;

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index a7b024bcf47b4f8596f7a10e03ed9004da33ea7d..48a41a42315b1c1be66c6ebacf3da245c03a39db 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -624,6 +624,7 @@ class wsMaintenance
 
                self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 250);
                self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 2000);
+               self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 7000);
        }
 
        protected static function _moveDocs($from, $to, $keep, $batch = 250)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 2c74f16add4e49b9c95cd6a18dd73b64be6c6ca1..acc6c5564997d7b70fa0921122678dc8992676a4 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -1418,6 +1418,9 @@ class wsServices extends cubeFlashGateway
             $xml = simplexml_import_dom($doc);
 
             $links = $xml->xpath("//a");
+            if(null===$xml){
+
+            }
             foreach ($links as $link) {
                 $h = parse_url($link['href']);
                 if (trim($h['path']) != 'subtest_results_of_device.jsp') {

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 2894b2a759c1add8a16cff8e3eaa037e0b8d1439..cdab98dfd2cb35705387c959e910e7d71eac041d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -56,7 +56,7 @@ class wsStats
 \r
                self::forceComputation($bid);\r
 \r
-               cubePHP::set_memory('4G');\r
+               cubePHP::set_memory('12G');\r
 \r
                self::$xls = new PHPExcel();\r
                self::$xls->removeSheetByIndex(0);\r
@@ -126,7 +126,7 @@ class wsStats
                        $writer = new PHPExcel_Writer_Excel2007();\r
                        $writer->setPHPExcel(self::$xls);\r
                        $xlsfile = self::_getXLSFile($bid, $annee, $mois);\r
-                       cubePHP::set_memory('4G');\r
+                       cubePHP::set_memory('12G');\r
                        $writer->save($xlsfile);\r
                } catch (Exception $e) {\r
                        die($e->getMessage());\r

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 306fcd88c744df22d20155e1d4e989476a405ddf..5430af6a5306caf1cda1c6ce25cc113ae7764771 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -15,4 +15,3 @@ $__autoload['wsIcone'] = dirname(__FILE__) . '/class.ws.icone.php';
 $__autoload['wsLang'] = dirname(__FILE__) . '/class.ws.lang.php';\r
 $__autoload['wsSignature'] = dirname(__FILE__) . '/class.ws.signature.php';\r
 $__autoload['wsDemande'] = dirname(__FILE__) . '/class.ws.demande.php';\r
-?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 9d2477c4ca60ceb19101ff67830ac4c45cc87812..adab7979b9d2516f98bc16a97526b01d966ceefb 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -249,7 +249,7 @@ class wsDocument extends cubeMetier
 
     public function parseInfos($data)
     {
-        cubePHP::set_memory('4G');
+        cubePHP::set_memory('12G');
         // This function get general infos (pages sizes, boxes, number sections and
         // bookmarks
         // Init arrays

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 0c28e635f777dd3eedea3dfce71a17488f373579..b107d2b632befa13e7c86a3396cd91fc97c9dcaa 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -124,6 +124,8 @@ class wsHTML5Compiler
         'js/widget.js'
     );
 
+    public $jsFiles = [];
+
     // Collection of LESS files to be compiled
     // Filename with no extension, relative to the /style directory in the player build folder
     public $lessFiles = ['fluidbook'];
@@ -233,7 +235,7 @@ class wsHTML5Compiler
         $this->appcache = $appcache;
         $this->widget = !$this->phonegap;
 
-        cubePHP::set_memory('4G');
+        cubePHP::set_memory('12G');
 
         if (trim($book_id) == '') {
             return;
@@ -553,7 +555,6 @@ class wsHTML5Compiler
     protected function loadPlugins()
     {
         $e = explode("\n", $this->book->parametres->mobilePlugins);
-
         $main = array_pop($this->jsFiles);
 
         $plugins = array();
@@ -1106,6 +1107,10 @@ class wsHTML5Compiler
             $e = explode("\n", $ml);
             $m = array();
             foreach ($e as $l1) {
+                $l1=trim($l1);
+                if($l1==''){
+                    continue;
+                }
                 $l = explode(',', $l1);
                 $flag = $l[1];
 
@@ -1777,8 +1782,8 @@ class wsHTML5Compiler
         $lessVariables['z'] = $this->z;
         $lessVariables['book-page-width'] = $w;
         if ($this->book->parametres->correctCenter) {
-            $lessVariables['book-page-correct-width'] = ceil($w + 1);
-            $lessVariables['book-page-correct-height'] = ceil($h + 1);
+            $lessVariables['book-page-correct-width'] = ceil($w) + 1;
+            $lessVariables['book-page-correct-height'] = ceil($h) + 1;
         } else {
             $lessVariables['book-page-correct-width'] = $w;
             $lessVariables['book-page-correct-height'] = $h;

diff --git a/index.php b/index.php
index d943374dfa89ff9b6bd35f16b7e2805efd15ce38..66b0f77c344192c520cf0308ec650d624a8898ad 100644 (file)
--- a/index.php
+++ b/index.php
@@ -30,7 +30,7 @@ $standard = 'XHTML 1.0 Transitional';
 echo $core->url->getDocument();
 $buffer = ob_get_contents();
 
-cubePHP::set_memory('6G');
+cubePHP::set_memory('12G');
 
 ob_clean();
 echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);