Browse Source

Fix PHP warnings,

Julio 7 years ago
parent
commit
692aa2a121
2 changed files with 11 additions and 3 deletions
  1. 3 0
      main/cron/import_csv.php
  2. 8 3
      main/inc/lib/career.lib.php

+ 3 - 0
main/cron/import_csv.php

@@ -2397,6 +2397,9 @@ class ImportCsv
             $this->logger->addInfo(count($data)." records found.");
             $values = [];
             foreach ($data as $row) {
+                if (empty($row)) {
+                    continue;
+                }
                 foreach ($row as $key => $value) {
                     $key = (string) trim($key);
                     // Remove utf8 bom

+ 8 - 3
main/inc/lib/career.lib.php

@@ -337,7 +337,7 @@ class Career extends Model
         // Read Connections column
         foreach ($list as $group => $subGroupList) {
             foreach ($subGroupList as $subGroupData) {
-                $columns = $subGroupData['columns'];
+                $columns = isset($subGroupData['columns']) ? $subGroupData['columns'] : [];
                 $showGroupLine = true;
                 if (count($columns) == 1) {
                     $showGroupLine = false;
@@ -471,13 +471,18 @@ class Career extends Model
         }
 
         foreach ($subGroupList as $subGroup => $subGroupData) {
-            $subGroupLabel = $subGroupData['label'];
-            $columnList = $subGroupData['columns'];
+            $subGroupLabel = isset($subGroupData['label']) ? $subGroupData['label'] : '';
+            $columnList = isset($subGroupData['columns']) ? $subGroupData['columns'] : [];
+
+            if (empty($columnList)) {
+                continue;
+            }
 
             $line = '';
             if (!empty($subGroup)) {
                 $line = 'border-style:solid;';
             }
+
             // padding:15px;
             $graphHtml .= '<div id="subgroup_'.$subGroup.'" class="career_subgroup" style="'.$line.' margin-bottom:20px; padding:15px; float:left; margin-left:0px; width:100%">';
             if (!empty($subGroupLabel)) {