patrickpr / trapdirector

library/Trapdirector/TrapsActions/UIDatabase.php

Braces +11 added lines, -12 removed lines

@@ -111,8 +111,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -137,8 +136,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -152,8 +150,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -181,7 +178,9 @@ 
      */
     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');
         
@@ -207,7 +206,9 @@ 
      */
     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');;
         
@@ -224,8 +225,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -250,8 +250,7 @@ 
             {
                 return array(4,"$dbresource does not look like an IDO database");
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
         }