patrickpr / trapdirector

library/Trapdirector/TrapsActions/UIDatabase.php

Spacing +32 added lines, -32 removed lines

@@ -24,10 +24,10 @@ 
      * @param int $code
      * @param Exception $previous
      */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+    public function __construct(array $retarray, string $message=null, int $code=0, Exception $previous=null)
     {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
+        parent::__construct($message, $code, $previous);
+        $this->returnArray=$retarray;
     }
     
     /**
@@ -79,19 +79,19 @@ 
      * @param string $DBname Name of DB
      * @throws DBException if test = true
      */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+    protected function testDbVersion($dbAdapter, int $min, bool $test, string $DBname)
     {
         try
         {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+            $query=$dbAdapter->select()
+            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(), 'value')
             ->where('name=\'db_version\'');
             $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
+            if (($version == null) || !property_exists($version, 'value'))
             {
                 if ($test === true) 
                 {
-                    throw new DBException(array(4,$DBname));
+                    throw new DBException(array(4, $DBname));
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
                 exit(0);
@@ -100,7 +100,7 @@ 
             {
                 if ($test === true) 
                 {
-                    throw new DBException(array(5,$version->value,$min));
+                    throw new DBException(array(5, $version->value, $min));
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 exit(0);
@@ -110,7 +110,7 @@ 
         {
             if ($test === true) 
             {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
+                throw new DBException(array(3, $DBname, $e->getMessage()));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
         }
@@ -123,15 +123,15 @@ 
      *	@param $test_version bool if set to flase, does not test database version of trapDB
      *	@return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
      */
-    protected function getDbByName($DBname,$test=false,$test_version=true)
+    protected function getDbByName($DBname, $test=false, $test_version=true)
     {
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
+            $dbconn=IcingaDbConnection::fromResourceName($DBname);
         }
         catch (Exception $e)
         {
-            if ($test) return array(2,$DBname);
+            if ($test) return array(2, $DBname);
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
         }
@@ -143,7 +143,7 @@ 
         }
         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 +155,7 @@ 
                 return $testRet;
             }
         }
-        if ($test) return array(0,'');
+        if ($test) return array(0, '');
         return $dbAdapter;
     }
 
@@ -166,17 +166,17 @@ 
      */
     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 (!$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);
+        $retDB=$this->getDbByName($dbresource, $test, true);
         
         if ($test === true) return $retDB;
         
@@ -191,50 +191,50 @@ 
      */
     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');;
+        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        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;
         }
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         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;
         }
         
         if ($test === false)
         {
-            $this->idoDB = $dbconn->getDbAdapter();
+            $this->idoDB=$dbconn->getDbAdapter();
             return $this->idoDB;
         }
         
         try
         {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
+            $query=$dbconn->select()
+            ->from('icinga_dbversion', array('version'));
             $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
+            if (($version == null) || !property_exists($version, 'version'))
             {
-                return array(4,"$dbresource does not look like an IDO database");
+                return array(4, "$dbresource does not look like an IDO database");
             }
         }
         catch (Exception $e)
         {
-            return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+            return array(3, "Error connecting to $dbresource : ".$e->getMessage());
         }
         
-        return array(0,'');
+        return array(0, '');
     }
     
 }
\ No newline at end of file