wait #5889 @0:10

diff --git a/app/Fluidbook/Links.php b/app/Fluidbook/Links.php
index 95e4959a8c04db30f5949f5f07d746dae706b843..4b8e1a817b083ad42128108daae9239355c5c2f3 100644 (file)
--- a/app/Fluidbook/Links.php
+++ b/app/Fluidbook/Links.php
@@ -305,13 +305,15 @@ class Links
 
         $rulers = array();
         $links = array();
-        
+
         if ($xls->getSheetCount() === 1) {
             $s = $xls->setActiveSheetIndex(0);
-        } else if (null === $xls->getSheetByName('Links')) {
-            $s = $xls->setActiveSheetIndexByName('Links');
         } else {
-            throw new \Exception(__('Format du fichier Excel invalide (pas de feuille nommée :name)', ['name' => 'Links']));
+            try {
+                $s = $xls->setActiveSheetIndexByName('Links');
+            } catch (\Exception $e) {
+                throw new \Exception(__('Format du fichier Excel invalide (pas de feuille nommée :name)', ['name' => 'Links']));
+            }
         }
         $i = 0;
 
@@ -343,30 +345,33 @@ class Links
         self::_fixLinks($links);
 
 
-        if ($xls->getSheetCount() === 1 || null === $xls->getSheetByName('Rulers')) {
+        if ($xls->getSheetCount() === 1) {
             return;
         }
         $i = 0;
-        $s = $xls->setActiveSheetIndexByName('Rulers');
-        foreach ($s->getRowIterator() as $row) {
-            $cellIterator = $row->getCellIterator();
-            $cellIterator->setIterateOnlyExistingCells(false);
-            if ($i == 0) {
-                $cols = array();
-                foreach ($cellIterator as $cell) {
-                    $cols[] = $cell->getValue();
-                }
-            } else {
-                $link = array();
-                $j = 0;
-                foreach ($cellIterator as $cell) {
-                    $ruler[$cols[$j]] = $cell->getValue();
-                    $j++;
-                }
+        try {
+            $s = $xls->setActiveSheetIndexByName('Rulers');
+            foreach ($s->getRowIterator() as $row) {
+                $cellIterator = $row->getCellIterator();
+                $cellIterator->setIterateOnlyExistingCells(false);
+                if ($i == 0) {
+                    $cols = array();
+                    foreach ($cellIterator as $cell) {
+                        $cols[] = $cell->getValue();
+                    }
+                } else {
+                    $j = 0;
+                    foreach ($cellIterator as $cell) {
+                        $ruler[$cols[$j]] = $cell->getValue();
+                        $j++;
+                    }
 
-                $rulers[] = $ruler;
+                    $rulers[] = $ruler;
+                }
+                $i++;
             }
-            $i++;
+        } catch (\Exception $e) {
+
         }
     }