patrickpr / trapdirector

library/Trapdirector/TrapsActions/UIDatabase.php

Braces +32 added lines, -19 removed lines

@@ -105,8 +105,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 exit(0);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -128,10 +127,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->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
         }
@@ -140,10 +140,11 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if ($test) return array(3,$DBname,$e->getMessage());
+            if ($test) {
+            	return array(3,$DBname,$e->getMessage());
+            }
             $this->trapController->redirectNow('trapdirector/settings?dberror=3');
             return null;
         }
@@ -155,7 +156,9 @@ 
                 return $testRet;
             }
         }
-        if ($test) return array(0,'');
+        if ($test) {
+        	return array(0,'');
+        }
         return $dbAdapter;
     }
 
@@ -166,19 +169,25 @@ 
      */
     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->trapController->Config()->get('config', 'database');
         
         if ( ! $dbresource )
         {
-            if ($test) return array(1,'');
+            if ($test) {
+            	return array(1,'');
+            }
             $this->trapController->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;
@@ -191,13 +200,17 @@ 
      */
     public function getIdoDb($test=false)
     {
-        if ($this->idoDB != null && $test = false) return $this->idoDB;
+        if ($this->idoDB != null && $test = false) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->trapController->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;
         }
@@ -205,10 +218,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;
         }
@@ -228,8 +242,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());
         }