patrickpr / trapdirector

library/Trapdirector/TrapsActions/UIDatabase.php

Indentation +234 added lines, -234 removed lines

@@ -14,30 +14,30 @@ 
  */
 class DBException extends Exception
 {
-    /** @var array $returnArray */
-    private $returnArray;
+	/** @var array $returnArray */
+	private $returnArray;
     
-    /**
-     * Buil DBException
-     * @param array $retarray
-     * @param string $message
-     * @param int $code
-     * @param Exception $previous
-     */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
-    }
+	/**
+	 * Buil DBException
+	 * @param array $retarray
+	 * @param string $message
+	 * @param int $code
+	 * @param Exception $previous
+	 */
+	public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+	{
+		parent::__construct($message,$code,$previous);
+		$this->returnArray = $retarray;
+	}
     
-    /**
-     * Get exception array
-     * @return array
-     */
-    public function getArray()
-    {
-        return $this->returnArray;
-    }
+	/**
+	 * Get exception array
+	 * @return array
+	 */
+	public function getArray()
+	{
+		return $this->returnArray;
+	}
 }
 
 /**
@@ -52,244 +52,244 @@ 
 class UIDatabase
 {
     
-    /** @var TrapsController $trapController TrapController 'parent' class */
-    protected  $trapController;
+	/** @var TrapsController $trapController TrapController 'parent' class */
+	protected  $trapController;
     
-    /** @var Zend_Db_Adapter_Abstract $trapDB Trap Database*/
-    protected $trapDB;
+	/** @var Zend_Db_Adapter_Abstract $trapDB Trap Database*/
+	protected $trapDB;
  
-    /** @var Zend_Db_Adapter_Abstract $trapDB Icinga IDO database*/
-    protected $idoDB;
+	/** @var Zend_Db_Adapter_Abstract $trapDB Icinga IDO database*/
+	protected $idoDB;
     
-    /** @var array $testResult */
-    protected $testResult;
+	/** @var array $testResult */
+	protected $testResult;
     
-    /**
-     * 
-     * @param TrapsController $trapCtrl
-     */
-    function __construct(TrapsController $trapCtrl)
-    {
-        $this->trapController=$trapCtrl;
-    }
+	/**
+	 * 
+	 * @param TrapsController $trapCtrl
+	 */
+	function __construct(TrapsController $trapCtrl)
+	{
+		$this->trapController=$trapCtrl;
+	}
     
-    /**
-     * Test if database version >= min database version
-     * 
-     * @param \Zend_Db_Adapter_Abstract $dbConn
-     * @param int $min Minimum version
-     * @param bool $test Test mode
-     * @param string $DBname Name of DB
-     * @return bool true if OK, false if version < min version
-     * @throws Exception if error and test = true
-     */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
-    {
-        try
-        {
-            $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 ($test === true) 
-                {
-                    $this->testResult = array(4,$DBname);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-                return false;
-            }
-            if ($version->value < $min)
-            {
-                if ($test === true) 
-                {
-                    $this->testResult = array(5,$version->value,$min);
-                    return false;
-                }
-                $this->trapController->redirectNow('trapdirector/settings?dberror=5');
-                return false;
-            }
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                $this->testResult = array(3,$DBname,$e->getMessage());
-                return false;
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=4');
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Test if database version >= min database version
+	 * 
+	 * @param \Zend_Db_Adapter_Abstract $dbConn
+	 * @param int $min Minimum version
+	 * @param bool $test Test mode
+	 * @param string $DBname Name of DB
+	 * @return bool true if OK, false if version < min version
+	 * @throws Exception if error and test = true
+	 */
+	protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+	{
+		try
+		{
+			$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 ($test === true) 
+				{
+					$this->testResult = array(4,$DBname);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+				return false;
+			}
+			if ($version->value < $min)
+			{
+				if ($test === true) 
+				{
+					$this->testResult = array(5,$version->value,$min);
+					return false;
+				}
+				$this->trapController->redirectNow('trapdirector/settings?dberror=5');
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				$this->testResult = array(3,$DBname,$e->getMessage());
+				return false;
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=4');
+			return false;
+		}
+		return true;
+	}
     
-    /**	Get Database connexion
-     *	@param $DBname string DB name in resource.ini_ge
-     *	@param $test bool if set to true, returns error code and not database
-     *	@param $test_version bool if set to flase, does not test database version of trapDB
-     *  @throws DBException if test = true and error
-     *	@return Zend_Db_Adapter_Abstract|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)
-    {
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
-        {
-            if ($test === true) 
-            {
-                throw new DBException(array(2,$DBname));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=2');
-            return null;
-        }
+	/**	Get Database connexion
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *  @throws DBException if test = true and error
+	 *	@return Zend_Db_Adapter_Abstract|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)
+	{
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+		}
+		catch (Exception $e)
+		{
+			if ($test === true) 
+			{
+				throw new DBException(array(2,$DBname));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=2');
+			return null;
+		}
 
-        try
-        {
-            $dbAdapter=$dbconn->getDbAdapter();
+		try
+		{
+			$dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
-        {
-            if ($test === true)
-            {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
-            }
-            $this->trapController->redirectNow('trapdirector/settings?dberror=3');
-            return null;
-        }
+		}
+		catch (Exception $e)
+		{
+			if ($test === true)
+			{
+				throw new DBException(array(3,$DBname,$e->getMessage()));
+			}
+			$this->trapController->redirectNow('trapdirector/settings?dberror=3');
+			return null;
+		}
         
-        if ($test_version == true) {
-            $testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
-            if ($testRet !== true) 
-            {
-                throw new DBException($this->testResult);
-            }
-        }
+		if ($test_version == true) {
+			$testRet=$this->testDbVersion($dbAdapter, $this->trapController->getModuleConfig()->getDbMinVersion(), $test, $DBname);
+			if ($testRet !== true) 
+			{
+				throw new DBException($this->testResult);
+			}
+		}
  
-        return $dbAdapter;
-    }
+		return $dbAdapter;
+	}
 
-    /**
-     * Get Trap database
-     * @param boolean $test
-     * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function getDb()
-    {
-        if ( $this->trapDB != null ) return $this->trapDB;
+	/**
+	 * Get Trap database
+	 * @param boolean $test
+	 * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function getDb()
+	{
+		if ( $this->trapDB != null ) return $this->trapDB;
         
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-            $this->trapController->redirectNow('trapdirector/settings?dberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?dberror=1');
+			return null;
+		}
 
-        try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
-        } catch (DBException $e) {
-            return null; // Should not happen as test = false
-        }
+		try {
+			$this->trapDB = $this->getDbByName($dbresource,false,true);
+		} catch (DBException $e) {
+			return null; // Should not happen as test = false
+		}
         
-        return $this->trapDB;
-    }
+		return $this->trapDB;
+	}
 
-    /**
-     * Test Trap database
-     * @param boolean $test
-     * @throws DBException on error.
-     * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-     */
-    public function testGetDb()
-    {       
-        $dbresource=$this->trapController->Config()->get('config', 'database');
+	/**
+	 * Test Trap database
+	 * @param boolean $test
+	 * @throws DBException on error.
+	 * @return Zend_Db_Adapter_Abstract|array|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
+	public function testGetDb()
+	{       
+		$dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
-        {
-                throw new DBException(array(1,''));
-        }
+		if ( ! $dbresource )
+		{
+				throw new DBException(array(1,''));
+		}
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
-        return;
-    }
+		$this->trapDB = $this->getDbByName($dbresource,true,true);       
+		return;
+	}
     
-    /**
-     * Get IDO Database 
-     * @param boolean $test
-     * @return Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
-     */
-    public function getIdoDb($test=false)
-    {
-        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');;
+	/**
+	 * Get IDO Database 
+	 * @param boolean $test
+	 * @return Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
+	 */
+	public function getIdoDb($test=false)
+	{
+		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 )
-        {
-            $this->redirectNow('trapdirector/settings?idodberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            $this->redirectNow('trapdirector/settings?idodberror=2');
-            return null;
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			$this->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
+		}
 
-        $this->idoDB = $dbconn->getDbAdapter();
-        return $this->idoDB;
-    }
+		$this->idoDB = $dbconn->getDbAdapter();
+		return $this->idoDB;
+	}
 
-    /**
-     * Get IDO Database
-     * @param boolean $test
-     * @throws DBException on error
-     */
-    public function testGetIdoDb()
-    {
-        // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+	/**
+	 * Get IDO Database
+	 * @param boolean $test
+	 * @throws DBException on error
+	 */
+	public function testGetIdoDb()
+	{
+		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
+		$dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
-        if ( ! $dbresource )
-        {
-            throw new DBException(array(1,'No database in config.ini'));
-        }
+		if ( ! $dbresource )
+		{
+			throw new DBException(array(1,'No database in config.ini'));
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+		}
                
-        try
-        {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
-            $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
-            {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
-            }
-        }
-        catch (Exception $e)
-        {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
-        }
+		try
+		{
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+			}
+		}
+		catch (Exception $e)
+		{
+			throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+		}
         
-        return;
-    }
+		return;
+	}
     
 }
\ No newline at end of file

Spacing +34 added lines, -34 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;
     }
     
     /**
@@ -83,19 +83,19 @@ 
      * @return bool true if OK, false if version < min version
      * @throws Exception if error and 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) 
                 {
-                    $this->testResult = array(4,$DBname);
+                    $this->testResult=array(4, $DBname);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -105,7 +105,7 @@ 
             {
                 if ($test === true) 
                 {
-                    $this->testResult = array(5,$version->value,$min);
+                    $this->testResult=array(5, $version->value, $min);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
@@ -116,7 +116,7 @@ 
         {
             if ($test === true) 
             {
-                $this->testResult = array(3,$DBname,$e->getMessage());
+                $this->testResult=array(3, $DBname, $e->getMessage());
                 return false;
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -132,17 +132,17 @@ 
      *  @throws DBException if test = true and error
      *	@return Zend_Db_Adapter_Abstract|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 === true) 
             {
-                throw new DBException(array(2,$DBname));
+                throw new DBException(array(2, $DBname));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
@@ -157,7 +157,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=3');
             return null;
@@ -181,18 +181,18 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ($this->trapDB != null) return $this->trapDB;
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
             $this->trapController->redirectNow('trapdirector/settings?dberror=1');
             return null;
         }
 
         try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
+            $this->trapDB=$this->getDbByName($dbresource, false, true);
         } catch (DBException $e) {
             return null; // Should not happen as test = false
         }
@@ -210,12 +210,12 @@ 
     {       
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-                throw new DBException(array(1,''));
+                throw new DBException(array(1, ''));
         }
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
+        $this->trapDB=$this->getDbByName($dbresource, true, true);       
         return;
     }
     
@@ -228,9 +228,9 @@ 
     {
         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)
         {
             $this->redirectNow('trapdirector/settings?idodberror=1');
             return null;
@@ -238,7 +238,7 @@ 
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
@@ -246,7 +246,7 @@ 
             return null;
         }
 
-        $this->idoDB = $dbconn->getDbAdapter();
+        $this->idoDB=$dbconn->getDbAdapter();
         return $this->idoDB;
     }
 
@@ -258,35 +258,35 @@ 
     public function testGetIdoDb()
     {
         // 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)
         {
-            throw new DBException(array(1,'No database in config.ini'));
+            throw new DBException(array(1, 'No database in config.ini'));
         }
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+            throw new DBException(array(2, "Database $dbresource does not exists in IcingaWeb2"));
         }
                
         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'))
             {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+                throw new DBException(array(4, "$dbresource does not look like an IDO database"));
             }
         }
         catch (Exception $e)
         {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+            throw new DBException(array(3, "Error connecting to $dbresource : ".$e->getMessage()));
         }
         
         return;

Braces +12 added lines, -14 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()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ( $this->trapDB != null ) {
+        	return $this->trapDB;
+        }
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
@@ -226,7 +225,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');;
         
@@ -239,8 +240,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -268,8 +268,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -283,8 +282,7 @@ 
             {
                 throw new DBException( 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()));
         }