patrickpr / trapdirector

library/Trapdirector/TrapsController.php

Braces +15 added lines, -5 removed lines

@@ -131,9 +131,11 @@ 
     	    $this->icingaAPI = new Icinga2API($host,$port);
     	    $this->icingaAPI->setCredentials($user, $pass);
     	    list($ret,$message) = $this->icingaAPI->test($this->getModuleConfig()->getapiUserPermissions());
-    	    if ($ret === TRUE) // On error, switch to ido DB
+    	    if ($ret === TRUE) {
+    	    	// On error, switch to ido DB
     	    {
     	        $this->apiMode = FALSE;
+    	    }
     	        return $this->getUIDatabase();
     	    }
     	    $this->apiMode = TRUE;
@@ -213,7 +215,9 @@ 
 		if ($this->MIBData == null)
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
@@ -283,7 +287,9 @@ 
 	    $catString='';
 	    foreach ($catArray as $index => $value)
 	    {
-	        if ($catString != '' ) $catString .= '!';
+	        if ($catString != '' ) {
+	        	$catString .= '!';
+	        }
 	        $catString .= $index . ':' . $value;
 	    }
 	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
@@ -293,8 +299,12 @@ 
 	{
 	    $catArray = $this->getHandlersCategory();
 	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
+	    while (isset($catArray[$i]) && $i < 100) {
+	    	$i++;
+	    }
+	    if ($i == 100) {
+	    	throw new ProgrammingError('Category array error');
+	    }
 	    $catArray[$i] = $catName;
 	    $this->setHandlerCategory($catArray);
 	}

Indentation +110 added lines, -110 removed lines

@@ -49,8 +49,8 @@ 
 	
 	
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -82,12 +82,12 @@ 
 	 */
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	/**
@@ -108,12 +108,12 @@ 
 	 */
 	public function getUIDatabase()
 	{
-	    if ($this->UIDatabase == Null)
-	    {
-	        $this->UIDatabase = new UIDatabase($this);
+		if ($this->UIDatabase == Null)
+		{
+			$this->UIDatabase = new UIDatabase($this);
 	       
-	    }
-	    return $this->UIDatabase;
+		}
+		return $this->UIDatabase;
 	}
 
 	/**
@@ -122,41 +122,41 @@ 
 	 */
 	public function getIdoConn()
 	{
-	    if ($this->icingaAPI === NULL)
-	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
-    	    if ($host == '')
-    	    {
-    	        $this->apiMode = FALSE;
-    	        return $this->getUIDatabase();
-    	    }
-    	    $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());
-    	    if ($ret === TRUE) // On error, switch to ido DB
-    	    {
-    	        $this->apiMode = FALSE;
-    	        return $this->getUIDatabase();
-    	    }
-    	    $this->apiMode = TRUE;
+		if ($this->icingaAPI === NULL)
+		{
+			$host = $this->Config()->get('config', 'icingaAPI_host');
+			if ($host == '')
+			{
+				$this->apiMode = FALSE;
+				return $this->getUIDatabase();
+			}
+			$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());
+			if ($ret === TRUE) // On error, switch to ido DB
+			{
+				$this->apiMode = FALSE;
+				return $this->getUIDatabase();
+			}
+			$this->apiMode = TRUE;
     	    
-	    }
-	    return $this->icingaAPI;
+		}
+		return $this->icingaAPI;
 	    
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -165,33 +165,33 @@ 
 	
 	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');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -211,18 +211,18 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$this->MIBData=new MIBLoader(
 				$this->Config()->get('config', 'snmptranslate'),
 				$this->Config()->get('config', 'snmptranslate_dirs'),
-			    $dbConn,
+				$dbConn,
 				$this->getModuleConfig()
 			);
 		}
@@ -232,13 +232,13 @@ 
 	/**************************  Database queries *******************/		
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{
@@ -251,72 +251,72 @@ 
 
 	/************************ UI elements **************************/
 	
-    /**
-     * get max rows to display before paging.
-     * @return number
-     */
+	/**
+	 * get max rows to display before paging.
+	 * @return number
+	 */
 	public function itemListDisplay()
 	{
-	    return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
+		return $this->getUIDatabase()->getDBConfigValue('max_rows_in_list');
 	}
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+		return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
 	}
 	
-    /**
-     * get Handlers categories list (index => textvalue).
-     * @return array
-     */	
+	/**
+	 * get Handlers categories list (index => textvalue).
+	 * @return array
+	 */	
 	public function getHandlersCategory()
 	{
-	    //<index>:<name>!<index>:<name>
-	    $catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
-	    $catListArray=explode('!',$catList);
-	    $retArray=array();
-	    foreach ($catListArray as $category)
-	    {
-	        $catArray=explode(':',$category);
-	        $retArray[$catArray[0]] = $catArray[1];
-	    }
-	    return $retArray; 
+		//<index>:<name>!<index>:<name>
+		$catList = $this->getUIDatabase()->getDBConfigValue('handler_categories');
+		$catListArray=explode('!',$catList);
+		$retArray=array();
+		foreach ($catListArray as $category)
+		{
+			$catArray=explode(':',$category);
+			$retArray[$catArray[0]] = $catArray[1];
+		}
+		return $retArray; 
 	}
 
 	public function setHandlerCategory(array $catArray)
 	{
-	    $catString='';
-	    foreach ($catArray as $index => $value)
-	    {
-	        if ($catString != '' ) $catString .= '!';
-	        $catString .= $index . ':' . $value;
-	    }
-	    $this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
+		$catString='';
+		foreach ($catArray as $index => $value)
+		{
+			if ($catString != '' ) $catString .= '!';
+			$catString .= $index . ':' . $value;
+		}
+		$this->getUIDatabase()->setDBConfigValue('handler_categories', $catString);
 	}
 	
 	public function addHandlersCategory(string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $i=1;
-	    while (isset($catArray[$i]) && $i < 100) $i++;
-	    if ($i == 100) throw new ProgrammingError('Category array error');
-	    $catArray[$i] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$i=1;
+		while (isset($catArray[$i]) && $i < 100) $i++;
+		if ($i == 100) throw new ProgrammingError('Category array error');
+		$catArray[$i] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 	public function delHandlersCategory(int $catIndex)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    unset($catArray[$catIndex]);
-	    $this->setHandlerCategory($catArray);
-	    $this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
+		$catArray = $this->getHandlersCategory();
+		unset($catArray[$catIndex]);
+		$this->setHandlerCategory($catArray);
+		$this->getUIDatabase()->updateHandlersOnCategoryDelete($catIndex);
 	}
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
-	    $this->setHandlerCategory($catArray);
+		$catArray = $this->getHandlersCategory();
+		$catArray[$catIndex] = $catName;
+		$this->setHandlerCategory($catArray);
 	}
 	
 }

Spacing +44 added lines, -44 removed lines

@@ -39,11 +39,11 @@ 
 	/** @var Trap $trapClass Trap class for bin/trap_class.php */
 	protected $trapClass;
 	/** @var UIDatabase $UIDatabase */
-	protected $UIDatabase = NULL;
+	protected $UIDatabase=NULL;
 	/** @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,56 +124,56 @@ 
 	{
 	    if ($this->icingaAPI === NULL)
 	    {
-    	    $host = $this->Config()->get('config', 'icingaAPI_host');
+    	    $host=$this->Config()->get('config', 'icingaAPI_host');
     	    if ($host == '')
     	    {
-    	        $this->apiMode = FALSE;
+    	        $this->apiMode=FALSE;
     	        return $this->getUIDatabase();
     	    }
-    	    $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);
+    	    $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');
         }		
 	}
 	
@@ -184,10 +184,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;
         }
@@ -199,10 +199,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;
@@ -217,7 +217,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'),
@@ -237,10 +237,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;
 			}
@@ -262,7 +262,7 @@ 
 
 	public function setitemListDisplay(int $maxRows)
 	{
-	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list',$maxRows);
+	    return $this->getUIDatabase()->setDBConfigValue('max_rows_in_list', $maxRows);
 	}
 	
     /**
@@ -272,13 +272,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; 
 	}
@@ -288,25 +288,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);
@@ -314,8 +314,8 @@ 
 	
 	public function renameHandlersCategory(int $catIndex, string $catName)
 	{
-	    $catArray = $this->getHandlersCategory();
-	    $catArray[$catIndex] = $catName;
+	    $catArray=$this->getHandlersCategory();
+	    $catArray[$catIndex]=$catName;
 	    $this->setHandlerCategory($catArray);
 	}