wip #4871 @1.5

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index ee0ca3a28feb8d388ea901bb3e9e34fba9dcb8d4..9bcfc90e948e74ce3a20bd2f2efd514d18296cb5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -740,6 +740,7 @@ class wsMaintenance
     public static function kadreoDevis8524147851()
     {
         global $core;
+        wsDroits::admin(true);
 
         $xls = new PHPExcel();
 
@@ -824,8 +825,8 @@ class wsMaintenance
             $batch[] = array_merge($e[$user['entreprise']], array('email' => $user['email'], 'LOCALE' => $user['lang'], 'FNAME' => $user['prenom'], 'LNAME' => $user['nom']));
         }
 
-        $api = new CubeIT_Services_Mailchimp('2b255293f3595181dd7d079d29dc6b99-us14');
-        $res = $api->batchSubscribe('8ff710b78e', $batch);
+//        $api = new CubeIT_Services_Mailchimp('2b255293f3595181dd7d079d29dc6b99-us14');
+//        $res = $api->batchSubscribe('8ff710b78e', $batch);
         echo '<pre>OK</pre>';
     }
 

diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index e89aa300db08e19a19cf4e02da1132ea11edfd55..0b41286d9dc544fb321214cd9eb11eaf56e3c4b9 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -56,9 +56,9 @@ class wsUtil
                 }\r
 \r
                 if ($assoc) {\r
-                    $worksheets[$title] = self::_assocSheet($worksheet->toArray(null, true, true));\r
+                    $worksheets[$title] = self::_assocSheet(self::worksheetToArray($worksheet));\r
                 } else {\r
-                    $worksheets[$title] = $worksheet->toArray(null, true, true);\r
+                    $worksheets[$title] = self::worksheetToArray($worksheet);\r
                 }\r
             }\r
             file_put_contents($cacheFile, json_encode($worksheets));\r
@@ -67,6 +67,32 @@ class wsUtil
         return $worksheets;\r
     }\r
 \r
+    /**\r
+     * @param $worksheet PHPExcel_Worksheet\r
+     * @return array\r
+     */\r
+    public static function worksheetToArray($worksheet)\r
+    {\r
+        $w = $worksheet->toArray(null, true, true);\r
+        $res = [];\r
+        foreach ($w as $line) {\r
+            $empty = true;\r
+            foreach ($line as $k => $v) {\r
+                if (null === $v || $v === '') {\r
+                    $v = '';\r
+                } else {\r
+                    $empty = false;\r
+                }\r
+                $line[$k] = $v;\r
+            }\r
+            if ($empty) {\r
+                continue;\r
+            }\r
+            $res[] = $line;\r
+        }\r
+        return $res;\r
+    }\r
+\r
     public static function excelToArrayKeyVal($excelFile, $reader = 'Excel2007')\r
     {\r
         $worksheets = self::excelToArray($excelFile, false, $reader);\r