patrickpr / trapdirector

library/Trapdirector/Icinga2Api.php

Spacing +53 added lines, -53 removed lines

@@ -16,9 +16,9 @@ 
      * @param string $host host name or IP
      * @param number $port API port
      */
-    public function __construct($host, $port = 5665)
+    public function __construct($host, $port=5665)
     {
-        parent::__construct($host,$port);
+        parent::__construct($host, $port);
     }
     /**
 
@@ -32,17 +32,17 @@ 
      */
     public function getHostByFilter(string $hostfilter)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'host',
             $hostfilter,
             //'match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6) || match("*' . $ip . '*",host.name) || match("*' . $ip . '*",host.display_name)',
-            array('__name','name','display_name','address','address6')
+            array('__name', 'name', 'display_name', 'address', 'address6')
             );
-        foreach ( array_keys($hosts) as $key )
+        foreach (array_keys($hosts) as $key)
         {
-            $hosts[$key]->id = $hosts[$key]->__name;
-            $hosts[$key]->ip4 = $hosts[$key]->address;
-            $hosts[$key]->ip6 = $hosts[$key]->address6;
+            $hosts[$key]->id=$hosts[$key]->__name;
+            $hosts[$key]->ip4=$hosts[$key]->address;
+            $hosts[$key]->ip6=$hosts[$key]->address6;
         }
         return $hosts;
     }
@@ -55,7 +55,7 @@ 
      */
     public function getHostByIP(string $ip) 
     {
-        return $this->getHostByFilter('match("*' . $ip . '*",host.address) || match("*' . $ip . '*",host.address6)');
+        return $this->getHostByFilter('match("*'.$ip.'*",host.address) || match("*'.$ip.'*",host.address6)');
     }
 
     
@@ -66,7 +66,7 @@ 
      */
     public function getHostByName(string $name)
     {
-        return $this->getHostByFilter('match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name)');
+        return $this->getHostByFilter('match("*'.$name.'*",host.name) || match("*'.$name.'*",host.display_name)');
     }
 
     /**
@@ -77,13 +77,13 @@ 
     public function getHostByNameOrIP(string $name)
     {
         return $this->getHostByFilter( 
-            'match("*' . $name . '*",host.name) || match("*' . $name . '*",host.display_name) || match("*' . $name . '*",host.address) || match("*' . $name . '*",host.address6)');
+            'match("*'.$name.'*",host.name) || match("*'.$name.'*",host.display_name) || match("*'.$name.'*",host.address) || match("*'.$name.'*",host.address6)');
     }
     
     public function getHostInfoByID(string $name)
     {
-        $host = $this->getHostByFilter(
-            'host.__name=="'. $name .'"');
+        $host=$this->getHostByFilter(
+            'host.__name=="'.$name.'"');
         if (isset($host[0]))
             return $host[0];
         else
@@ -100,8 +100,8 @@ 
     {        
         return $this->standardQuery(
             'host', 
-            '"' . $hostGroup . '" in host.groups',
-            array('address','address6','name')
+            '"'.$hostGroup.'" in host.groups',
+            array('address', 'address6', 'name')
                 
         );
     }
@@ -115,26 +115,26 @@ 
      *  @param bool $passive_svc
      *	@return array display_name (of service), service_object_id
      */
-    public function getServicesByHostid(string $id, bool $active = TRUE, bool $passive_svc = TRUE)
+    public function getServicesByHostid(string $id, bool $active=TRUE, bool $passive_svc=TRUE)
     {
-        $filter = 'match("' . $id . '!*", service.__name)';
+        $filter='match("'.$id.'!*", service.__name)';
         if ($active === TRUE)
         {
-            $filter .= ' && service.active==true';
+            $filter.=' && service.active==true';
         }
         if ($passive_svc === TRUE)
         {
-            $filter .= ' && service.enable_passive_checks==true';
+            $filter.=' && service.enable_passive_checks==true';
         }
-        $services =  $this->standardQuery(
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active')
+            array('__name', 'name', 'display_name', 'active')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;
@@ -152,27 +152,27 @@ 
     {
          return $this->standardQuery(
             'host',
-            '"' . $group . '" in host.groups',
-            array('name','display_name')
+            '"'.$group.'" in host.groups',
+            array('name', 'display_name')
             );
     }
     
     public function getServicesByHostGroupid(string $group)
     {
-        $hostList = $this->getHostsByGroup($group);
+        $hostList=$this->getHostsByGroup($group);
         //return $hostList;
-        $hostNum = count($hostList);
+        $hostNum=count($hostList);
         $serviceList=array();
         foreach ($hostList as $curHost)
         {
-            $services = $this->getServicesByHostid($curHost->name);
+            $services=$this->getServicesByHostid($curHost->name);
             foreach ($services as $service)
             {
                 //return $service;
-                if (! isset($serviceList[$service->name]))
+                if (!isset($serviceList[$service->name]))
                 {
                     $serviceList[$service->name]=
-                        array('num'=> 1 ,'__name' => $service->__name,'display_name' => $service->display_name);
+                        array('num'=> 1, '__name' => $service->__name, 'display_name' => $service->display_name);
                 }
                 else
                 {
@@ -185,7 +185,7 @@ 
         {
             if ($values['num'] >= $hostNum)
             {
-                array_push($commonServices,array($key,$values['display_name']));
+                array_push($commonServices, array($key, $values['display_name']));
             }
         }
         return $commonServices;
@@ -199,15 +199,15 @@ 
      */
     public function getHostGroupByName($name)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'hostgroup',
-            'match("*' . $name . '*",hostgroup.name)',
-            array('__name','name','display_name')
+            'match("*'.$name.'*",hostgroup.name)',
+            array('__name', 'name', 'display_name')
             
             );
-        foreach ( array_keys($hosts) as $key )
+        foreach (array_keys($hosts) as $key)
         {
-            $hosts[$key]->id = $hosts[$key]->__name;
+            $hosts[$key]->id=$hosts[$key]->__name;
         }
         return $hosts;
     }
@@ -220,13 +220,13 @@ 
      */
     public function getHostGroupById($name)
     {
-        $hosts = $this->standardQuery(
+        $hosts=$this->standardQuery(
             'hostgroup',
-            'hostgroup.__name=="'. $name .'"',
-            array('__name','name','display_name')
+            'hostgroup.__name=="'.$name.'"',
+            array('__name', 'name', 'display_name')
             
             );
-        $hosts[0]->id = $hosts[0]->__name;
+        $hosts[0]->id=$hosts[0]->__name;
         return $hosts[0];
     }
     
@@ -239,26 +239,26 @@ 
      *  @param bool $passive_svc : if true, return only service accepting passive checks
      *	@return array  service id
      */
-    public function getServiceIDByName($hostname,$name,bool $active = TRUE, bool $passive_svc = TRUE)
+    public function getServiceIDByName($hostname, $name, bool $active=TRUE, bool $passive_svc=TRUE)
     {
-        $filter = 'service.__name=="' . $hostname . '!'. $name .'"';
+        $filter='service.__name=="'.$hostname.'!'.$name.'"';
         if ($active === TRUE)
         {
-            $filter .= ' && service.active==true';
+            $filter.=' && service.active==true';
         }
         if ($passive_svc === TRUE)
         {
-            $filter .= ' && service.enable_passive_checks==true';
+            $filter.=' && service.enable_passive_checks==true';
         }
-        $services =  $this->standardQuery(
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
+            array('__name', 'name', 'display_name', 'active', 'enable_passive_checks')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;
@@ -271,16 +271,16 @@ 
      */
     public function getServiceById($name)
     {
-        $filter = 'service.__name=="' .  $name .'"';
-        $services =  $this->standardQuery(
+        $filter='service.__name=="'.$name.'"';
+        $services=$this->standardQuery(
             'service',
             $filter,
-            array('__name','name','display_name','active','enable_passive_checks')
+            array('__name', 'name', 'display_name', 'active', 'enable_passive_checks')
             );
         
-        foreach ( array_keys($services) as $key )
+        foreach (array_keys($services) as $key)
         {
-            $services[$key]->id = $services[$key]->__name;
+            $services[$key]->id=$services[$key]->__name;
         }
         
         return $services;

library/Trapdirector/TrapsController.php

Spacing +42 added lines, -42 removed lines

@@ -41,9 +41,9 @@ 
 	/** @var UIDatabase $UIDatabase */
 	protected $UIDatabase;
 	/** @var Icinga2API $IcingaAPI */
-	protected $icingaAPI = NULL;
+	protected $icingaAPI=NULL;
 	/** @var bool $apiMode connection to icinngaDB is by api (true) od ido DB (false) */
-	protected $apiMode = FALSE;
+	protected $apiMode=FALSE;
 	
 	
 	
@@ -60,7 +60,7 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -84,7 +84,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -97,7 +97,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -110,7 +110,7 @@ 
 	{
 	    if ($this->UIDatabase == Null)
 	    {
-	        $this->UIDatabase = new UIDatabase($this);
+	        $this->UIDatabase=new UIDatabase($this);
 	       
 	    }
 	    return $this->UIDatabase;
@@ -124,51 +124,51 @@ 
 	{
 	    if ($this->icingaAPI === NULL)
 	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    $port = $this->Config()->get('config', 'icingaAPI_port');
-    	    $user = $this->Config()->get('config', 'icingaAPI_user');
-    	    $pass = $this->Config()->get('config', 'icingaAPI_password');
-    	    $this->icingaAPI = new Icinga2API($host,$port);
+    	    $host=$this->Config()->get('config', 'icingaAPI_host');
+    	    $port=$this->Config()->get('config', 'icingaAPI_port');
+    	    $user=$this->Config()->get('config', 'icingaAPI_user');
+    	    $pass=$this->Config()->get('config', 'icingaAPI_password');
+    	    $this->icingaAPI=new Icinga2API($host, $port);
     	    $this->icingaAPI->setCredentials($user, $pass);
-    	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
+    	    list($ret, $message)=$this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
     	    if ($ret === TRUE) // On error, switch to ido DB
     	    {
-    	        $this->apiMode = FALSE;
+    	        $this->apiMode=FALSE;
     	        return $this->getUIDatabase();
     	    }
-    	    $this->apiMode = TRUE;
+    	    $this->apiMode=TRUE;
     	    
 	    }
 	    return $this->icingaAPI;
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -179,10 +179,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -194,10 +194,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 			//$debug_level=4;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -212,7 +212,7 @@ 
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
@@ -232,10 +232,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}
@@ -257,7 +257,7 @@ 
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list', $maxRows);
 	}
 	
     /**
@@ -267,13 +267,13 @@ 
 	public function getHandlersCategory()
 	{
 	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
+	    $catList=$this->getUIDatabase()->getDBConfigValue('handler_categories');
+	    $catListArray=explode('!', $catList);
 	    $retArray=array();
 	    foreach ($catListArray as $category)
 	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
+	        $catArray=explode(':', $category);
+	        $retArray[$catArray[0]]=$catArray[1];
 	    }
 	    return $retArray; 
 	}
@@ -283,25 +283,25 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
+	        if ($catString != '') $catString.='!';
+	        $catString.=$index.':'.$value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    $i=1;
 	    while (isset($catArray[$i]) && $i < 100) $i++;
 	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
+	    $catArray[$i]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
+	    $catArray=$this->getHandlersCategory();
 	    unset($catArray[$catIndex]);
 	    $this->setHandlerCategory($catArray);
 	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
@@ -309,8 +309,8 @@ 
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
+	    $catArray=$this->getHandlersCategory();
+	    $catArray[$catIndex]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}
 	

library/Trapdirector/IcingaApi/IcingaApiBase.php

Spacing +50 added lines, -50 removed lines

@@ -8,15 +8,15 @@ 
 
 class IcingaApiBase
 {
-    protected $version = 'v1';      //< icinga2 api version
+    protected $version='v1'; //< icinga2 api version
     
-    protected $host;                //< icinga2 host name or IP
-    protected $port;                //< icinga2 api port
+    protected $host; //< icinga2 host name or IP
+    protected $port; //< icinga2 api port
     
-    protected $user;                //< user name
-    protected $pass;                //< user password
-    protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
-    protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
+    protected $user; //< user name
+    protected $pass; //< user password
+    protected $usercert; //< user key for certificate auth (NOT IMPLEMENTED)
+    protected $authmethod='pass'; //< Authentication : 'pass' or 'cert'
 
     protected $queryURL=array(
         'host'  => 'objects/hosts',
@@ -26,7 +26,7 @@ 
     
     protected $curl;
     // http://php.net/manual/de/function.json-last-error.php#119985
-    protected $errorReference = [
+    protected $errorReference=[
         JSON_ERROR_NONE => 'No error has occurred.',
         JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
         JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
@@ -37,7 +37,7 @@ 
         JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
         JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
     ];
-    const JSON_UNKNOWN_ERROR = 'Unknown error.';
+    const JSON_UNKNOWN_ERROR='Unknown error.';
     
     /**
      * Creates Icinga2API object
@@ -45,7 +45,7 @@ 
      * @param string $host host name or IP
      * @param number $port API port
      */
-    public function __construct($host, $port = 5665)
+    public function __construct($host, $port=5665)
     {
         $this->host=$host;
         $this->port=$port;
@@ -55,7 +55,7 @@ 
      * @param string $user
      * @param string $pass
      */
-    public function setCredentials($user,$pass)
+    public function setCredentials($user, $pass)
     {
         $this->user=$user;
         $this->pass=$pass;
@@ -67,7 +67,7 @@ 
      * @param string $user
      * @param string $usercert
      */
-    public function setCredentialskey($user,$usercert)
+    public function setCredentialskey($user, $usercert)
     {
         $this->user=$user;
         $this->usercert=$usercert;
@@ -95,18 +95,18 @@ 
         $permMissing='';
         if ($permissions === NULL || count($permissions) == 0) // If no permission check return OK after connexion
         {
-            return array(false,'OK');
+            return array(false, 'OK');
         }
         if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
         {
             
-            foreach ( $permissions as $mustPermission)
+            foreach ($permissions as $mustPermission)
             {
                 $curPermOK=0;
-                foreach ( $result->results[0]->permissions as $curPermission)
+                foreach ($result->results[0]->permissions as $curPermission)
                 {
-                    $curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
-                    if (preg_match('#'.$curPermission.'#',$mustPermission))
+                    $curPermission=preg_replace('/\*/', '.*', $curPermission); // put * as .* to created a regexp
+                    if (preg_match('#'.$curPermission.'#', $mustPermission))
                     {
                         $curPermOK=1;
                         break;
@@ -121,12 +121,12 @@ 
             }
             if ($permOk == 0)
             {
-                return array(true,'API connection OK, but missing permission : '.$permMissing);
+                return array(true, 'API connection OK, but missing permission : '.$permMissing);
             }
-            return array(false,'API connection OK');
+            return array(false, 'API connection OK');
             
         }
-        return array(true,'API connection OK, but cannot get permissions');
+        return array(true, 'API connection OK, but cannot get permissions');
     }
     
     
@@ -141,7 +141,7 @@ 
      */
     protected function curl() {
         if ($this->curl === null) {
-            $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
+            $this->curl=curl_init(sprintf('https://%s:%d', $this->host, $this->port));
             if ($this->curl === false) {
                 throw new Exception('CURL INIT ERROR');
             }
@@ -158,7 +158,7 @@ 
      * @param string $perfdata : performance data as string
      * @return array (status = true (oK) or false (nok), string message)
      */
-    public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
+    public function serviceCheckResult($host, $service, $state, $display, $perfdata='')
     {
         //Send a POST request to the URL endpoint /v1/actions/process-check-result
         //actions/process-check-result?service=example.localdomain!passive-ping6
@@ -177,9 +177,9 @@ 
         {
             return array(false, $e->getMessage());
         }
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
                 $message=$result->status;
             }
@@ -187,21 +187,21 @@ 
             {
                 $message="Unkown status";
             }
-            return array(false , 'Ret code ' .$result->error.' : '.$message);
+            return array(false, 'Ret code '.$result->error.' : '.$message);
         }
         if (property_exists($result, 'results'))
         {
             if (isset($result->results[0]))
             {
-                return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
+                return array(true, 'code '.$result->results[0]->code.' : '.$result->results[0]->status);
             }
             else
             {
-                return array(false,'Service not found');
+                return array(false, 'Service not found');
             }
             
         }
-        return array(false,'Unkown result, open issue with this : '.print_r($result,true));
+        return array(false, 'Unkown result, open issue with this : '.print_r($result, true));
     }
   
     /**
@@ -211,18 +211,18 @@ 
      */
     public function checkResultStatus(\stdClass $result) 
     {
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+                throw new Exception('Ret code '.$result->error.' : '.$result->status);
             }
             else
             {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
+                throw new Exception('Ret code '.$result->error.' : Unkown status');
             }
         }
-        if ( ! property_exists($result, 'results'))
+        if (!property_exists($result, 'results'))
         {
             throw new Exception('Unkown result');
         }
@@ -238,23 +238,23 @@ 
      * @return array
      */
     public function request($method, $url, $headers, $body) {
-        $auth = sprintf('%s:%s', $this->user, $this->pass);
-        $curlHeaders = array("Accept: application/json");
+        $auth=sprintf('%s:%s', $this->user, $this->pass);
+        $curlHeaders=array("Accept: application/json");
         if ($body !== null) {
-            $body = json_encode($body);
+            $body=json_encode($body);
             array_push($curlHeaders, 'Content-Type: application/json');
             //array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
         }
         //var_dump($body);
         //var_dump($this->url($url));
         if ($headers !== null) {
-            $curlFinalHeaders = array_merge($curlHeaders, $headers);
+            $curlFinalHeaders=array_merge($curlHeaders, $headers);
         } else 
         {
             $curlFinalHeaders=$curlHeaders;
         }
-        $curl = $this->curl();
-        $opts = array(
+        $curl=$this->curl();
+        $opts=array(
             CURLOPT_URL		=> $this->url($url),
             CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
             CURLOPT_USERPWD		=> $auth,
@@ -265,14 +265,14 @@ 
             CURLOPT_SSL_VERIFYPEER 	=> false,
         );
         if ($body !== null) {
-            $opts[CURLOPT_POSTFIELDS] = $body;
+            $opts[CURLOPT_POSTFIELDS]=$body;
         }
         curl_setopt_array($curl, $opts);
-        $res = curl_exec($curl);
+        $res=curl_exec($curl);
         if ($res === false) {
-            throw new Exception('CURL ERROR: ' . curl_error($curl));
+            throw new Exception('CURL ERROR: '.curl_error($curl));
         }
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $statusCode=curl_getinfo($curl, CURLINFO_HTTP_CODE);
         if ($statusCode === 401) {
             throw new Exception('Unable to authenticate, please check your API credentials');
         }
@@ -286,7 +286,7 @@ 
      * @return array json decoded
      */
     protected function fromJsonResult($json) {
-        $result = @json_decode($json);
+        $result=@json_decode($json);
         //var_dump($json);
         if ($result === null) {
             throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));
@@ -306,7 +306,7 @@ 
         return $this->errorReference[$errorCode];
     }
 
-    public function standardQuery(string $urlType , string $filter, array $attributes)
+    public function standardQuery(string $urlType, string $filter, array $attributes)
     {
         /*
          *  curl -k -s -u  trapdirector:trapdirector -H 'X-HTTP-Method-Override: GET' -X POST 'https://localhost:5665/v1/objects/hosts' 
@@ -315,7 +315,7 @@ 
          {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        if (! isset($this->queryURL[$urlType] ))
+        if (!isset($this->queryURL[$urlType]))
         {
             throw new Exception("Unkown object type");
         }
@@ -323,11 +323,11 @@ 
         $body=array();
         if ($filter !== NULL)
         {
-            $body['filter'] = $filter;
+            $body['filter']=$filter;
         }
         if (count($attributes) != 0)
         {
-            $body['attrs'] = $attributes;
+            $body['attrs']=$attributes;
         }
 
         try
@@ -342,9 +342,9 @@ 
         
         $numHost=0;
         $hostArray=array();
-        while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+        while (isset($result->results[$numHost]) && property_exists($result->results[$numHost], 'attrs'))
         {
-            $hostArray[$numHost] = $result->results[$numHost]->attrs;
+            $hostArray[$numHost]=$result->results[$numHost]->attrs;
             $numHost++;
         }
         return $hostArray;

application/controllers/HandlerController.php

Spacing +91 added lines, -91 removed lines

@@ -24,10 +24,10 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('status');
 
-		$dbConn = $this->getUIDatabase()->getDb();
+		$dbConn=$this->getUIDatabase()->getDb();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
-		$handlerTable = new HandlerTable(
+		$handlerTable=new HandlerTable(
 		      $this->moduleConfig->getTrapRuleName(),
 		      $this->moduleConfig->getHandlerListTitles(),
 		      $this->moduleConfig->getHandlerListDisplayColumns(),
@@ -40,7 +40,7 @@ 
 		
 		$handlerTable->setMibloader($this->getMIB());
 		
-		$getVars = $this->getRequest()->getParams();
+		$getVars=$this->getRequest()->getParams();
 		$handlerTable->getParams($getVars);
 		
 		if ($handlerTable->isOrderSet() == FALSE)
@@ -51,7 +51,7 @@ 
 		
 		}
 		
-		$this->view->handlerTable = $handlerTable;
+		$this->view->handlerTable=$handlerTable;
 		
 		
 		// TODO : Obsolete remove after new table validation.
@@ -74,7 +74,7 @@ 
 	public function testruleAction()
 	{
 	    $this->checkReadPermission();
-	    $this->getTabs()->add('get',array(
+	    $this->getTabs()->add('get', array(
 	        'active'	=> true,
 	        'label'		=> $this->translate('Test Rule'),
 	        'url'		=> Url::fromRequest()
@@ -83,7 +83,7 @@ 
 
 	    if ($this->params->get('rule') !== null) 
 	    {
-	        $this->view->rule= $this->params->get('rule');
+	        $this->view->rule=$this->params->get('rule');
 	    }
 	    else
 	    {
@@ -142,12 +142,12 @@ 
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->displayExitError('Add handler : get host by IP/Name ',$e->getMessage());
+	        $this->displayExitError('Add handler : get host by IP/Name ', $e->getMessage());
 	    }
 	    
 	    
 	    // if one unique host found -> put id text input
-	    if (count($hosts)==1) {
+	    if (count($hosts) == 1) {
 	        $this->view->hostname=$hosts[0]->name;
 	        //$hostid=$hosts[0]->id;
 	        // Tell JS to get services when page is loaded
@@ -156,9 +156,9 @@ 
 	    }
 	    else
 	    {
-	        foreach($hosts as $key=>$val)
+	        foreach ($hosts as $key=>$val)
 	        {
-	            array_push($this->view->hostlist,$hosts[$key]->name);
+	            array_push($this->view->hostlist, $hosts[$key]->name);
 	        }
 	    }
 	    
@@ -197,18 +197,18 @@ 
 	            $currentObjectTypeEnum
 	        );
 	        $oid_index++;
-	        array_push($this->view->objectList,$currentObject);
+	        array_push($this->view->objectList, $currentObject);
 	        // set currrent object to null in allObjects
 	        if (isset($allObjects[$val->oid]))
 	        {
 	            $allObjects[$val->oid]=null;
 	        }
 	    }
-	    if ($allObjects!=null) // in case trap doesn't have objects or is not resolved
+	    if ($allObjects != null) // in case trap doesn't have objects or is not resolved
 	    {
 	        foreach ($allObjects as $key => $val)
 	        {
-	            if ($val==null) { continue; }
+	            if ($val == null) { continue; }
 	            array_push($this->view->objectList, array(
 	                $oid_index,
 	                $key,
@@ -236,9 +236,9 @@ 
 	    // Check if hostname still exists
 	    $host_get=$this->getIdoConn()->getHostByName($this->view->hostname);
 	    
-	    if (count($host_get)==0)
+	    if (count($host_get) == 0)
 	    {
-	        $this->view->warning_message='Host '.$this->view->hostname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='Host '.$this->view->hostname.' doesn\'t exists anymore';
 	        $this->view->serviceGet=false;
 	    }
 	    else
@@ -246,10 +246,10 @@ 
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGet=true;
 	        // get service id for form to set :
-	        $serviceID=$this->getIdoConn()->getServiceIDByName($this->view->hostname,$ruleDetail->service_name);
-	        if (count($serviceID) ==0)
+	        $serviceID=$this->getIdoConn()->getServiceIDByName($this->view->hostname, $ruleDetail->service_name);
+	        if (count($serviceID) == 0)
 	        {
-	            $this->view->warning_message=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	        else
 	        {
@@ -266,9 +266,9 @@ 
 	{
 	    // Check if groupe exists
 	    $group_get=$this->getIdoConn()->getHostGroupByName($this->view->hostgroupname);
-	    if (count($group_get)==0)
+	    if (count($group_get) == 0)
 	    {
-	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname. ' doesn\'t exists anymore';
+	        $this->view->warning_message='HostGroup '.$this->view->hostgroupname.' doesn\'t exists anymore';
 	        $this->view->serviceGroupGet=false;
 	    }
 	    else
@@ -286,9 +286,9 @@ 
 	        
 	        // Tell JS to get services when page is loaded
 	        $this->view->serviceGroupGet=true;
-	        if ($foundGrpService==0)
+	        if ($foundGrpService == 0)
 	        {
-	            $this->view->warning_message.=' Service '.$ruleDetail->service_name. ' doesn\'t exists anymore';
+	            $this->view->warning_message.=' Service '.$ruleDetail->service_name.' doesn\'t exists anymore';
 	        }
 	    }
 	}
@@ -306,12 +306,12 @@ 
 	    $index=1;
 	    // check in display & rule for : OID(<oid>)
 	    $matches=array();
-	    while ( preg_match('/_OID\(([\.0-9\*]+)\)/',$display,$matches) ||
-	        preg_match('/_OID\(([\.0-9\*]+)\)/',$rule,$matches))
+	    while (preg_match('/_OID\(([\.0-9\*]+)\)/', $display, $matches) ||
+	        preg_match('/_OID\(([\.0-9\*]+)\)/', $rule, $matches))
 	    {
 	        $curOid=$matches[1];
 	        
-	        if ( (preg_match('/\*/',$curOid) == 0 ) 
+	        if ((preg_match('/\*/', $curOid) == 0) 
 	            && ($object=$this->getMIB()->translateOID($curOid)) != null)
 	        {
 	            array_push($curObjectList, array(
@@ -336,9 +336,9 @@ 
 	                'not found'
 	            ));
 	        }
-	        $curOid = preg_replace('/\*/','\*',$curOid);
-	        $display=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$display);
-	        $rule=preg_replace('/_OID\('.$curOid.'\)/','\$'.$index.'\$',$rule);
+	        $curOid=preg_replace('/\*/', '\*', $curOid);
+	        $display=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $display);
+	        $rule=preg_replace('/_OID\('.$curOid.'\)/', '\$'.$index.'\$', $rule);
 	        $index++;
 	    }
 	    return $curObjectList;
@@ -353,7 +353,7 @@ 
 		$this->checkConfigPermission();
 		// set up tab
 		$this->prepareTabs();
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Add handler'),
 			'url'		=> Url::fromRequest()
@@ -365,11 +365,11 @@ 
 		$this->view->mibList=$this->getMIB()->getMIBList();
 		
 		// Get categories
-		$this->view->categoryList = $this->getHandlersCategory();
+		$this->view->categoryList=$this->getHandlersCategory();
 		
 		//$this->view->trapvalues=false; // Set to true to display 'value' colum in objects
 		
-		if (($trapid = $this->params->get('fromid')) !== null) {
+		if (($trapid=$this->params->get('fromid')) !== null) {
 		    /********** Setup from existing trap ***************/
             $this->add_from_existing($trapid);
 			return;
@@ -389,11 +389,11 @@ 
 			$this->view->setRuleMatch=$ruleDetail->action_match;
 			$this->view->setRuleNoMatch=$ruleDetail->action_nomatch;
 			$this->view->hostgroupname=$ruleDetail->host_group_name;
-			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z",$ruleDetail->modified);
+			$this->view->modified=gmdate("Y-m-d\TH:i:s\Z", $ruleDetail->modified);
 			$this->view->modifier=$ruleDetail->modifier;
 			
-			$this->view->comment = $ruleDetail->comment;
-			$this->view->category = $ruleDetail->category;
+			$this->view->comment=$ruleDetail->comment;
+			$this->view->category=$ruleDetail->category;
 			
 			// Warning message if host/service don't exists anymore
 			$this->view->warning_message='';
@@ -444,28 +444,28 @@ 
 	
 		$params=array(
 			// id (also db) => 	array('post' => post id, 'val' => default val, 'db' => send to table)
-			'hostgroup'		=>	array('post' => 'hostgroup',                    'db'=>false),
-			'db_rule'		=>	array('post' => 'db_rule',                      'db'=>false),
-			'hostid'		=>	array('post' => 'hostid',                       'db'=>false),
-			'host_name'		=>	array('post' => 'hostname',      'val' => null,  'db'=>true),
-			'host_group_name'=>	array('post' => null,            'val' => null,  'db'=>true),
-			'serviceid'		=>	array('post' => 'serviceid',                     'db'=>false),
-			'service_name'	=>	array('post' => 'serviceName',                    'db'=>true),
-		    'comment'       =>  array('post' => 'comment',       'val' => '',    'db'=>true),
-		    'rule_type'     =>  array('post' => 'category',       'val' => 0,    'db'=>true),
-			'trap_oid'		=>	array('post' => 'oid',                            'db'=>true),
-			'revert_ok'		=>	array('post' => 'revertOK',      'val' => 0,      'db'=>true),
-			'display'		=>	array('post' => 'display',        'val' => '',     'db'=>true),
-			'rule'			=>	array('post' => 'rule',          'val' => '',        'db'=>true),			
-			'action_match'	=>	array('post' => 'ruleMatch',       'val' => -1,    'db'=>true),
-			'action_nomatch'=>	array('post' => 'ruleNoMatch',    'val' => -1,    'db'=>true),					
-			'ip4'			=>	array('post' => null,             'val' => null,  'db'=>true),
-			'ip6'			=>	array('post' => null,             'val' => null,  'db'=>true),
-		    'action_form'	=>	array('post' => 'action_form',    'val' => null, 'db'=>false)
+			'hostgroup'		=>	array('post' => 'hostgroup', 'db'=>false),
+			'db_rule'		=>	array('post' => 'db_rule', 'db'=>false),
+			'hostid'		=>	array('post' => 'hostid', 'db'=>false),
+			'host_name'		=>	array('post' => 'hostname', 'val' => null, 'db'=>true),
+			'host_group_name'=>	array('post' => null, 'val' => null, 'db'=>true),
+			'serviceid'		=>	array('post' => 'serviceid', 'db'=>false),
+			'service_name'	=>	array('post' => 'serviceName', 'db'=>true),
+		    'comment'       =>  array('post' => 'comment', 'val' => '', 'db'=>true),
+		    'rule_type'     =>  array('post' => 'category', 'val' => 0, 'db'=>true),
+			'trap_oid'		=>	array('post' => 'oid', 'db'=>true),
+			'revert_ok'		=>	array('post' => 'revertOK', 'val' => 0, 'db'=>true),
+			'display'		=>	array('post' => 'display', 'val' => '', 'db'=>true),
+			'rule'			=>	array('post' => 'rule', 'val' => '', 'db'=>true),			
+			'action_match'	=>	array('post' => 'ruleMatch', 'val' => -1, 'db'=>true),
+			'action_nomatch'=>	array('post' => 'ruleNoMatch', 'val' => -1, 'db'=>true),					
+			'ip4'			=>	array('post' => null, 'val' => null, 'db'=>true),
+			'ip6'			=>	array('post' => null, 'val' => null, 'db'=>true),
+		    'action_form'	=>	array('post' => 'action_form', 'val' => null, 'db'=>false)
 		);
 		
 		if (isset($postData[$params['action_form']['post']]) 
-			&& $postData[$params['action_form']['post']] == 'delete' )
+			&& $postData[$params['action_form']['post']] == 'delete')
 		{
 			try
 			{
@@ -473,7 +473,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Deleting Rule'));
+				$this->_helper->json(array('status'=>$e->getMessage(), 'location'=>'Deleting Rule'));
 				return;
 			}
 			//$this->Module()->
@@ -485,16 +485,16 @@ 
 		}		
 		foreach (array_keys($params) as $key)
 		{
-			if ($params[$key]['post']==null) continue; // data not sent in post vars
-			if (! isset($postData[$params[$key]['post']]))
+			if ($params[$key]['post'] == null) continue; // data not sent in post vars
+			if (!isset($postData[$params[$key]['post']]))
 			{
 				// should not happen as the js checks data
-				$this->_helper->json(array('status'=>'No ' . $key));
+				$this->_helper->json(array('status'=>'No '.$key));
 			}
 			else
 			{
 				$data=$postData[$params[$key]['post']];
-				if ($data!=null && $data !="")
+				if ($data != null && $data != "")
 				{
 					$params[$key]['val']=$postData[$params[$key]['post']];
 				}
@@ -503,8 +503,8 @@ 
 		$this->getIdoConn(); //Set apiMode
 		try 
 		{
-			$isHostGroup=($params['hostgroup']['val'] == 1)?true:false;
-			if (! $isHostGroup ) 
+			$isHostGroup=($params['hostgroup']['val'] == 1) ?true:false;
+			if (!$isHostGroup) 
 			{  // checks if selection by host 
 			    $hostAddr=$this->getIdoConn()->getHostInfoByID($params['hostid']['val']);
 			    if ($hostAddr === NULL) throw new \Exception("No object found");
@@ -519,9 +519,9 @@ 
 				if ($this->apiMode == TRUE)
 				{
 				    $serviceName=$this->getIdoConn()->getServiceById($params['serviceid']['val']);
-				    if (count($serviceName) == 0 )
+				    if (count($serviceName) == 0)
 				    {
-				        $this->_helper->json(array('status'=>"Invalid service id : Please re enter service",'sent'=>$params['serviceid']['val'],'found'=>$serviceName[0]->__name));
+				        $this->_helper->json(array('status'=>"Invalid service id : Please re enter service", 'sent'=>$params['serviceid']['val'], 'found'=>$serviceName[0]->__name));
 				        return;
 				    }
 				}
@@ -529,7 +529,7 @@ 
 				{
     				if (!is_numeric($params['serviceid']['val']))
     				{
-    				    $this->_helper->json(array('status'=>"Invalid service id ". $params['serviceid']['val']));
+    				    $this->_helper->json(array('status'=>"Invalid service id ".$params['serviceid']['val']));
     				    return;
     				}
     				
@@ -562,15 +562,15 @@ 
     				}
 			    }
 				// Put param in correct column (group_name)
-				$params['host_group_name']['val'] = $params['host_name']['val'];
+				$params['host_group_name']['val']=$params['host_name']['val'];
 				$params['host_name']['val']=null;
 			}
 			$dbparams=array();
 			foreach ($params as $key=>$val)
 			{
-				if ($val['db']==true )
+				if ($val['db'] == true)
 				{
-					$dbparams[$key] = $val['val'];
+					$dbparams[$key]=$val['val'];
 				}
 			}
 			// echo '<br>';	print_r($dbparams);echo '<br>';
@@ -581,13 +581,13 @@ 
 			}
 			else
 			{
-			    $this->getUIDatabase()->updateHandlerRule($dbparams,$params['db_rule']['val']);
+			    $this->getUIDatabase()->updateHandlerRule($dbparams, $params['db_rule']['val']);
 				$ruleID=$params['db_rule']['val'];
 			}
 		}
 		catch (Exception $e)
 		{
-		    $this->_helper->json(array('status'=>$e->getMessage(),'location'=>'Add/update Rule','line'=>$e->getLine(),'file'=>$e->getFile()));
+		    $this->_helper->json(array('status'=>$e->getMessage(), 'location'=>'Add/update Rule', 'line'=>$e->getLine(), 'file'=>$e->getFile()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK', 'id' => $ruleID));
@@ -600,10 +600,10 @@ 
 	*/
 	protected function getTrapDetail($trapid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get main data
 		// extract columns and titles;
@@ -613,19 +613,19 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->getModuleConfig()->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->getModuleConfig()->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null ) 
+			if ($trapDetail == null) 
 			{
-			    $trapDetail = 'NULL';
+			    $trapDetail='NULL';
 			    throw new Exception('No traps was found with id = '.$trapid);
 			}
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail,true),$e->getMessage());
+			$this->displayExitError('Add handler : get trap detail returning : '.print_r($trapDetail, true), $e->getMessage());
 			return;
 		}
 
@@ -639,10 +639,10 @@ 
 	*/
 	protected function getTrapobjects($trapid)
 	{	
-		if (!preg_match('/^[0-9]+$/',$trapid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $trapid)) { throw new Exception('Invalid id'); }
 		$queryArrayData=$this->getModuleConfig()->trapDataDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get object data
 		// extract columns and titles;
@@ -652,15 +652,15 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 				$trapDetail=$dbConn->fetchAll($query);
 			// if ( $trapDetail == null ) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Add handler : get trap data detail : ',$e->getMessage());
+			$this->displayExitError('Add handler : get trap data detail : ', $e->getMessage());
 			return array();
 		}
 
@@ -674,24 +674,24 @@ 
 	*/
 	protected function getRuleDetail($ruleid) 
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleid)) { throw new Exception('Invalid id');  }
+		if (!preg_match('/^[0-9]+$/', $ruleid)) { throw new Exception('Invalid id'); }
 		$queryArray=$this->getModuleConfig()->ruleDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		// ***************  Get main data
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->getModuleConfig()->getTrapRuleName(),$queryArray)
-				->where('id=?',$ruleid);
+		    $query=$dbConn->select()
+				->from($this->getModuleConfig()->getTrapRuleName(), $queryArray)
+				->where('id=?', $ruleid);
 			$ruleDetail=$dbConn->fetchRow($query);
-			if ( $ruleDetail == null ) throw new Exception('No rule was found with id = '.$ruleid);
+			if ($ruleDetail == null) throw new Exception('No rule was found with id = '.$ruleid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Update handler : get rule detail',$e->getMessage());
-			throw new Exception('Error : ' . $e->getMessage());
+			$this->displayExitError('Update handler : get rule detail', $e->getMessage());
+			throw new Exception('Error : '.$e->getMessage());
 		}
 
 		return $ruleDetail;
@@ -704,7 +704,7 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Trap handlers'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/handler')
+			'url'   => $this->getModuleConfig()->urlPath().'/handler')
 		);
 	} 
 	

application/controllers/HelperController.php

Spacing +65 added lines, -65 removed lines

@@ -18,9 +18,9 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 		$this->getIdoConn(); // set apiMode to correct val
         if ($this->apiMode === TRUE)
         {
@@ -33,7 +33,7 @@ 
         }
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -46,14 +46,14 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getIdoConn()->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -76,31 +76,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getIdoConn()->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getIdoConn()->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -115,26 +115,26 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$host = $this->checkPostVar($postData, 'host', '.+');
+		$host=$this->checkPostVar($postData, 'host', '.+');
 		
 		$hostArray=$this->getIdoConn()->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getIdoConn()->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -148,12 +148,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$mib = $this->checkPostVar($postData, 'mib', '.*');
+		$mib=$this->checkPostVar($postData, 'mib', '.*');
 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -171,12 +171,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$trap = $this->checkPostVar($postData, 'trap', '.*');
+		$trap=$this->checkPostVar($postData, 'trap', '.*');
 		
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -210,7 +210,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$oid = $this->checkPostVar($postData, 'oid', '.*');
+		$oid=$this->checkPostVar($postData, 'oid', '.*');
 		
 		// Try to get oid name from snmptranslate
 		if (($object=$this->getMIB()->translateOID($oid)) == null)
@@ -243,20 +243,20 @@ 
 		
 		$postData=$this->getRequest()->getPost();
 		
-		$days = $this->checkPostVar($postData, 'days', '^[0-9]+$');
+		$days=$this->checkPostVar($postData, 'days', '^[0-9]+$');
 		$days=intval($days);
 
-		$action = $this->checkPostVar($postData, 'action', 'save|execute');
+		$action=$this->checkPostVar($postData, 'action', 'save|execute');
 		
 		if ($action == 'save')
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+			    $this->getUIDatabase()->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -266,16 +266,16 @@ 
 		{
 			try
 			{
-				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 				$debug_level=4;
-				$trap = new Trap($icingaweb2_etc);
-				$trap->setLogging($debug_level,'syslog');
+				$trap=new Trap($icingaweb2_etc);
+				$trap->setLogging($debug_level, 'syslog');
 				$trap->eraseOldTraps($days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage()));
 				return;
 			}			
 			$this->_helper->json(array('status'=>'OK'));
@@ -292,18 +292,18 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
+	    $snmpUse=$this->checkPostVar($postData, 'useTrapAddr', '0|1');
 	    
-	    $snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
+	    $snmpOID=$this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
 	    	    
 	    try
 	    {
-	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
-	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
+	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess', $snmpUse);
+	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid', $snmpOID);
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 	        return;
 	    }
 	    $this->_helper->json(array('status'=>'OK'));
@@ -321,7 +321,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$destination = $this->checkPostVar($postData, 'destination', '.*');
+		$destination=$this->checkPostVar($postData, 'destination', '.*');
 		$logDest=$this->getModuleConfig()->getLogDestinations();
 		if (!isset($logDest[$destination]))
 		{
@@ -332,7 +332,7 @@ 
 		if (isset($postData['file']))
 		{ 
 			$file=$postData['file'];
-			$fileHandler=@fopen($file,'w');
+			$fileHandler=@fopen($file, 'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
@@ -352,17 +352,17 @@ 
 			}
 		}
 
-		$level = $this->checkPostVar($postData, 'level', '[0-9]');
+		$level=$this->checkPostVar($postData, 'level', '[0-9]');
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+		    $this->getUIDatabase()->setDBConfigValue('log_destination', $destination);
+		    $this->getUIDatabase()->setDBConfigValue('log_file', $file);
+		    $this->getUIDatabase()->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -380,29 +380,29 @@ 
 	    
 	    $postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+	    $rule=$this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+	    $action=$this->checkPostVar($postData, 'action', 'evaluate');
 
 	    if ($action == 'evaluate')
 	    {
 	        try
 	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
+	            $trap=new Trap($icingaweb2_etc);
 	            // Cleanup spaces before eval
 	            $rule=$trap->ruleClass->eval_cleanup($rule);
 	            // Eval
 	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
+	            $rule=$trap->ruleClass->evaluation($rule, $item);
 	        }
 	        catch (Exception $e)
 	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage()));
 	            return;
 	        }
-	        $return=($rule==true)?'true':'false';
+	        $return=($rule == true) ? 'true' : 'false';
 	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
 	    }
 	    
@@ -417,15 +417,15 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+	    $pluginName=$this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+	    $action=$this->checkPostVar($postData, 'action', 'enable|disable');
 	    
         try
         {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
             $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
+            $trap=new Trap($icingaweb2_etc);
             // Enable plugin.
             $action=($action == 'enable') ? true : false;
             $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
@@ -433,7 +433,7 @@ 
         }
         catch (Exception $e)
         {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
             return;
         }
         if ($retVal === true)
@@ -455,45 +455,45 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+	    $functionString=$this->checkPostVar($postData, 'function', '.*');
 	    
 	    $this->checkPostVar($postData, 'action', 'evaluate');
 	    
 	    // Only one action possible for now, no tests on action.
 	    try
 	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	        require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
+	        $trap=new Trap($icingaweb2Etc);
 	        // load all plugins in case tested function is not enabled.
 	        $trap->pluginClass->registerAllPlugins(false);
 	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
+	        $functionString=$trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+	        $result=$trap->pluginClass->evaluateFunctionString($functionString);	        
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
 	        return;
 	    }
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+        $result=($result === true) ? 'True' : 'False';
+        $this->_helper->json(array('status'=>'OK', 'message' => $result));
 	}
 
     /**************   Utilities **********************/
 
-	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
+	private function checkPostVar(array $postData, string $postVar, string $validRegexp) : string
 	{
 	    if (!isset ($postData[$postVar]))
 	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
+	        $this->_helper->json(array('status'=>'No '.$postVar));
 	        return '';
 	    }
 	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
 	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+	        $this->_helper->json(array('status'=>'Unknown '.$postVar.' value '.$postData[$postVar]));
 	        return '';
 	    }
 	    return $postData[$postVar];