Refactor to use is_installed helper function

Author: helmo

server/lib/classes/cron.d/100-monitor_iptables.inc.php

@@ -67,8 +67,7 @@ public function onRunJob() {
 		$type = 'iptables_rules';
 
 		/* This monitoring is only available if fail2ban is installed */
-		system('which iptables > /dev/null', $retval); // Debian, Ubuntu, Fedora
-		if ($retval === 0) {
+		if ($app->system->is_installed('iptables')) {
 			/*  Get the data of the log */
 			$data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S 2>/dev/null');
 
@@ -83,8 +82,7 @@ public function onRunJob() {
 
 
 		/* This monitoring is only available if fail2ban is installed */
-		system('which ip6tables > /dev/null', $retval); // Debian, Ubuntu, Fedora
-		if ($retval === 0) {
+		if ($app->system->is_installed('ip6tables')) {
 			/*  Get the data of the log */
 			$data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S 2>/dev/null');
 

server/lib/classes/cron.d/100-monitor_raid.inc.php

@@ -126,8 +126,7 @@ public function onRunJob() {
 		 * Check, if we have mpt-status installed (LSIsoftware-raid)
 		 */
 		if (file_exists('/proc/mpt/summary')) {
-			system('which mpt-status', $retval);
-			if ($retval === 0) {
+			if ($app->system->is_installed('mpt-status')) {
 				/*
 				 * Fetch the output
 				 */
@@ -174,8 +173,7 @@ public function onRunJob() {
 		/*
 		* 3ware Controller
 		*/
-		system('which tw_cli', $retval);
-		if($retval === 0) {
+		if($app->system->is_installed('tw_cli')) {
 
 			// TYPOWORX FIX | Determine Controler-ID
 			$availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+"');
@@ -232,8 +230,7 @@ public function onRunJob() {
 		/*
 		* HP Proliant
 		*/
-		system('which hpacucli', $retval);
-		if($retval === 0) {
+		if($app->system->is_installed('hpacucli')) {
 			$state = 'ok';
 			$data['output'] = shell_exec('/usr/sbin/hpacucli ctrl all show config');
 			$tmp = explode("\n", $data['output']);
@@ -298,8 +295,7 @@ public function onRunJob() {
 		/*
 		* Adaptec-RAID
 		*/
-		system('which arcconf', $retval);
-		if($retval === 0) {
+		if($app->system->is_installed('arcconf')) {
 			$state = 'ok';
 			$data['output'] = shell_exec('arcconf GETCONFIG 1 LD');
 			if(is_array($data['output'])) {

server/lib/classes/cron.d/100-monitor_rkhunter.inc.php

@@ -67,8 +67,7 @@ public function onRunJob() {
 		$type = 'rkhunter';
 
 		/* This monitoring is only available if rkhunter is installed */
-		system('which rkhunter', $retval);
-		if ($retval === 0) {
+		if ($app->system->is_installed('rkhunter')) {
 			/*
 			 * Fetch the output
 			 */

server/lib/classes/cron.d/500-backup_mail.inc.php

@@ -78,8 +78,7 @@ public function onRunJob() {
 				} else {
 					chmod($backup_dir, $backup_dir_permissions);
 				}
-				system('which pigz > /dev/null', $ret);
-				if($ret === 0) {
+				if($app->system->is_installed('pigz')) {
 					$use_pigz = true;
 				} else {
 					$use_pigz = false;