[ADD] Support for Zabbix 6.0

Author: intellitrend-team

README.md

@@ -10,6 +10,10 @@ This software is licensed under the GNU Lesser General Public License v3.0.
 
 ## Changelog
 
+### Version 6.0.1
+
+* Support for Zabbix 6.0
+
 ### Version 5.4.2
 
 * Added support for Zabbix 5.0 and 5.2

modules/csv-host-importer/Module.php

@@ -2,7 +2,7 @@
 /**
   * Zabbix CSV Import Frontend Module
   *
-  * @version 5.0.0
+  * @version 6.0.1
   * @author Wolfgang Alper <[email protected]>
   * @copyright IntelliTrend GmbH, https://www.intellitrend.de
   * @license GNU Lesser General Public License v3.0

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

@@ -2,7 +2,7 @@
 /**
   * Zabbix CSV Import Frontend Module
   *
-  * @version 5.0.0
+  * @version 6.0.1
   * @author Wolfgang Alper <[email protected]>
   * @copyright IntelliTrend GmbH, https://www.intellitrend.de
   * @license GNU Lesser General Public License v3.0
@@ -23,8 +23,7 @@
 use CRoleHelper;
 use CUploadFile;
 use API;
-use CSession; // 5.0.0
-use CSessionHelper; // 5.2.0+
+use CSessionHelper;
 
 /**
  * Host CSV importer module action.
@@ -105,11 +104,7 @@ protected function checkInput(): bool {
 	 * @return bool
 	 */
 	protected function checkPermissions(): bool {
-		if (version_compare(ZABBIX_VERSION, '5.4.0', '>=')) {
-			return $this->checkAccess(CRoleHelper::UI_ADMINISTRATION_GENERAL);
-		} else {
-			return ($this->getUserType() == USER_TYPE_SUPER_ADMIN);
-		}
+		return $this->checkAccess(CRoleHelper::UI_ADMINISTRATION_GENERAL);
 	}
 
 	private function csvParse(): bool {
@@ -270,35 +265,19 @@ private function importHosts(): bool {
 	}
 
 	private function loadSession() {
-		if (version_compare(ZABBIX_VERSION, '5.2.0', '>=')) {
-			if (!CSessionHelper::has(self::HOSTLIST_KEY)) {
-				return false;
-			}
-			$this->hostlist = CSessionHelper::get(self::HOSTLIST_KEY);
-			return true;
-		} else {
-			if (!CSession::keyExists(self::HOSTLIST_KEY)) {
-				return false;
-			}
-			$this->hostlist = CSession::getValue(self::HOSTLIST_KEY);
-			return true;
+		if (!CSessionHelper::has(self::HOSTLIST_KEY)) {
+			return false;
 		}
+		$this->hostlist = CSessionHelper::get(self::HOSTLIST_KEY);
+		return true;
 	}
 
 	private function saveSession() {
-		if (version_compare(ZABBIX_VERSION, '5.2.0', '>=')) {
-			CSessionHelper::set(self::HOSTLIST_KEY, $this->hostlist);
-		} else {
-			CSession::setValue(self::HOSTLIST_KEY, $this->hostlist);
-		}
+		CSessionHelper::set(self::HOSTLIST_KEY, $this->hostlist);
 	}
 
 	private function clearSession() {
-		if (version_compare(ZABBIX_VERSION, '5.2.0', '>=')) {
-			CSessionHelper::unset([self::HOSTLIST_KEY]);
-		} else {
-			CSession::unsetValue([self::HOSTLIST_KEY]);
-		}
+		CSessionHelper::unset([self::HOSTLIST_KEY]);
 	}
 
 

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

@@ -2,7 +2,7 @@
 /**
   * Zabbix CSV Import Frontend Module
   *
-  * @version 5.0.0
+  * @version 6.0.1
   * @author Wolfgang Alper <[email protected]>
   * @copyright IntelliTrend GmbH, https://www.intellitrend.de
   * @license GNU Lesser General Public License v3.0
@@ -56,11 +56,7 @@ protected function checkInput(): bool {
 	 * @return bool
 	 */
 	protected function checkPermissions(): bool {
-		if (version_compare(ZABBIX_VERSION, '5.4.0', '>=')) {
-			return $this->checkAccess(CRoleHelper::UI_ADMINISTRATION_GENERAL);
-		} else {
-			return ($this->getUserType() == USER_TYPE_SUPER_ADMIN);
-		}
+		return $this->checkAccess(CRoleHelper::UI_ADMINISTRATION_GENERAL);
 	}
 
 	/**

modules/csv-host-importer/manifest.json

@@ -2,7 +2,7 @@
 	"manifest_version": 1.0,
 	"id": "intellitrend_csv_host_importer",
 	"name": "CSV Host Importer",
-	"version": "5.4.2",
+	"version": "6.0.1",
 	"namespace": "ichi",
 	"author": "IntelliTrend GmbH",
 	"url": "https://www.intellitrend.de/",

modules/csv-host-importer/views/layout.ichi.example.php

@@ -2,7 +2,7 @@
 /**
   * Zabbix CSV Import Frontend Module
   *
-  * @version 5.0.0
+  * @version 6.0.1
   * @author Wolfgang Alper <[email protected]>
   * @copyright IntelliTrend GmbH, https://www.intellitrend.de
   * @license GNU Lesser General Public License v3.0

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

@@ -2,7 +2,7 @@
 /**
   * Zabbix CSV Import Frontend Module
   *
-  * @version 5.0.0
+  * @version 6.0.1
   * @author Wolfgang Alper <[email protected]>
   * @copyright IntelliTrend GmbH, https://www.intellitrend.de
   * @license GNU Lesser General Public License v3.0
@@ -126,8 +126,8 @@
 
             if ($hostid != -1) {
                 $cols[] = new CCol(
-                    new CLink('Created', (new CUrl('hosts.php'))
-                        ->setArgument('form', 'update')
+                    new CLink('Created', (new CUrl('zabbix.php'))
+                        ->setArgument('action', 'host.edit')
                         ->setArgument('hostid', $hostid)
                     )
                 );