patrickpr / trapdirector

library/Trapdirector/TrapsController.php

Braces +62 added lines, -30 removed lines

@@ -87,10 +87,11 @@ 
 		try 
 		{
 			$dbconn = IcingaDbConnection::fromResourceName($DBname);
-		} 
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) {
+				return array(2,$DBname);
+			}
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -98,10 +99,11 @@ 
 			try 
 			{
 				$db=$dbconn->getConnection();
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
@@ -113,55 +115,72 @@ 
 				$version=$db->fetchRow($query);
 				if ( ($version == null) || ! property_exists($version,'value') )
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) {
+						return array(4,$DBname);
+					}
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) {
+						return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					}
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) {
+			return array(0,'');
+		}
 		return $dbconn;
 	}
 
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test = false) {
+			return $this->trapDB;
+		}
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
 		if ( ! $dbresource )
 		{	
-			if ($test) return array(1,'');
+			if ($test) {
+				return array(1,'');
+			}
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
 		$retDB=$this->getDbByName($dbresource,$test,true);
-		if ($test == true) return $retDB;
+		if ($test == true) {
+			return $retDB;
+		}
 		$this->trapDB=$retDB;
 		return $this->trapDB;
 	}
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test = false) {
+			return $this->icingaDB;
+		}
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
 		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) {
+		    	return array(1,'No database in config.ini');
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
@@ -169,10 +188,11 @@ 
 		try
 		{
 		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) {
+		    	return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
@@ -192,8 +212,7 @@ 
 		    {
 		        return array(4,"$dbresource does not look like an IDO database");
 		    }
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
 		}
@@ -441,8 +460,7 @@ 
 				if (isset($common_services[$service->name2]['num']))
 				{
 					$common_services[$service->name2]['num'] +=1;
-				}
-				else
+				} else
 				{
 					$common_services[$service->name2]['num']=1;
 					$common_services[$service->name2]['name']=$service->name;
@@ -586,7 +604,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if($condition === null) {
+			return null;
+		}
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -614,7 +634,9 @@ 
 			$condition=($condition==null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition ==null) return 0;
+		if($condition ==null) {
+			return 0;
+		}
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -638,18 +660,28 @@ 
 				array('value'=>'value'))
 			->where('name=?',$element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row==null) {
+			// value does not exists
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			
 			$this->addDBConfigValue($element,$default[$element]);
 			return $default[$element];
 		}
-		if ($return_row->value == null) // value id empty
+		if ($return_row->value == null) {
+			// value id empty
 		{
 			$default=$this->getModuleConfig()->getDBConfigDefaults();
-			if ( ! isset($default[$element])) return null; // no default and not value
+		}
+			if ( ! isset($default[$element])) {
+				return null;
+			}
+			// no default and not value
 			$this->setDBConfigValue($element,$default[$element]);
 			return $default[$element];			
 		}