[VER] 7.0.0

Author: intellitrend-team

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 7.0.0
+
+* Improved support for Zabbix 7.2 and 7.4.
+* Fixed PHP warning with fgetcsv.
+
 ## Version 6.3.0
 
 * Support for Zabbix 6.4 and 7.0.

README.md

@@ -14,7 +14,7 @@ You can find the latest versions for the respective Zabbix releases on the [Gith
 
 ## Requirements
 
-- Zabbix 6.0, 6.2, 6.4 or 7.0
+- Zabbix 6.0, 6.2, 6.4, 7.0, 7.2, 7.4
 - File write access to the Zabbix frontend server
 - Super admin permissions for the Zabbix users that want to use the frontend module
 

modules/csv-host-importer/actions/CSVHostImport.php

@@ -238,7 +238,7 @@ private function csvParse($path): bool {
 				}
 
 				// get first CSV line, which is the header
-				$header = fgetcsv($fp, self::CSV_MAX_LINE_LEN, $this->csvSeparators[$this->separator]);
+				$header = fgetcsv($fp, self::CSV_MAX_LINE_LEN, $this->csvSeparators[$this->separator], '"', '');
 				if ($header === FALSE) {
 					error(_('Empty CSV file.'));
 					return false;
@@ -270,7 +270,7 @@ private function csvParse($path): bool {
 
 				// get all other records till the end of the file
 				$linenum = 1; // header was already read, so start at 1
-				while (($line = fgetcsv($fp, self::CSV_MAX_LINE_LEN, $this->csvSeparators[$this->separator])) !== FALSE) {
+				while (($line = fgetcsv($fp, self::CSV_MAX_LINE_LEN, $this->csvSeparators[$this->separator], '"', '')) !== FALSE) {
 					$linenum++;
 					$column_count = count($line);
 					if ($column_count < $header_count) {

modules/csv-host-importer/manifest.json

@@ -3,7 +3,7 @@
 	"id": "intellitrend_csv_host_importer",
 	"type": "module",
 	"name": "CSV Host Importer",
-	"version": "6.3.0",
+	"version": "7.0.0",
 	"namespace": "ICHI",
 	"author": "IntelliTrend GmbH",
 	"url": "https://www.intellitrend.de/",

modules/csv-host-importer/manifest.v1.json

@@ -2,7 +2,7 @@
 	"manifest_version": 1,
 	"id": "intellitrend_csv_host_importer",
 	"name": "CSV Host Importer",
-	"version": "6.3.0",
+	"version": "7.0.0",
 	"namespace": "ICHI",
 	"author": "IntelliTrend GmbH",
 	"url": "https://www.intellitrend.de/",

modules/csv-host-importer/views/module.ichi.import.php

@@ -122,7 +122,10 @@ class_alias('CWidget', 'CHtmlPage');
                 ->addStyle('min-width: 10em;')
                 ->addClass('table-col-handle'),
         ]);
-    
+
+        // 7.2+ uses popup dialogs
+        $use_popup = version_compare(ZABBIX_VERSION, '7.2.0', '>=');
+
         foreach ($hostlist as $row) {
             $hostid = $row['HOSTID'];
 
@@ -131,11 +134,15 @@ class_alias('CWidget', 'CHtmlPage');
             $cols[] = new CCol($row['VISIBLE_NAME'] ?? '');
 
             if ($hostid != -1) {
+                $url = (new CUrl('zabbix.php'))->setArgument('hostid', $hostid);
+                if ($use_popup) {
+                    $url->setArgument('action', 'popup')
+                        ->setArgument('popup', 'host.edit');
+                } else {
+                    $url->setArgument('action', 'host.edit');
+                }
                 $cols[] = new CCol(
-                    new CLink('Created', (new CUrl('zabbix.php'))
-                        ->setArgument('action', 'host.edit')
-                        ->setArgument('hostid', $hostid)
-                    )
+                    new CLink('Created', $url)
                 );
             } else {
                 $cols[] = (new CCol('Error'))->addClass(ZBX_STYLE_RED);