patrickpr / trapdirector

library/Trapdirector/TrapsActions/TrapDBQuery.php

Indentation +175 added lines, -175 removed lines

@@ -19,207 +19,207 @@
 trait TrapDBQuery
 {
     
-    /** @return TrapsController */
-    abstract protected function getTrapCtrl();
+	/** @return TrapsController */
+	abstract protected function getTrapCtrl();
 
-    /** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
-    abstract public function getDbConn();
+	/** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
+	abstract public function getDbConn();
     
-    /** Add handler rule in traps DB
-     *	@param array $params : array(<db item>=><value>)
-     *	@return int inserted id
-     */
-    public function addHandlerRule($params)
-    {
-        // TODO Check for rule consistency
+	/** Add handler rule in traps DB
+	 *	@param array $params : array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
+	public function addHandlerRule($params)
+	{
+		// TODO Check for rule consistency
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // Add last modified date = creation date and username
-        $params['created'] = new Zend_Db_Expr('NOW()');
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// Add last modified date = creation date and username
+		$params['created'] = new Zend_Db_Expr('NOW()');
+		$params['modified'] = new 	Zend_Db_Expr('NOW()');
+		$params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
-        $query=$dbConn->insert(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            $params
-            );
-        if($query==false)
-        {
-            return null;
-        }
-        return $dbConn->lastInsertId();
-    }
+		$query=$dbConn->insert(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			$params
+			);
+		if($query==false)
+		{
+			return null;
+		}
+		return $dbConn->lastInsertId();
+	}
     
-    /** Update handler rule in traps DB
-     *	@param array $params : (<db item>=><value>)
-     *   @param integer $ruleID : rule id in db
-     *	@return array affected rows
-     */
-    public function updateHandlerRule($params,$ruleID)
-    {
-        // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // Add last modified date = creation date and username
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+	/** Update handler rule in traps DB
+	 *	@param array $params : (<db item>=><value>)
+	 *   @param integer $ruleID : rule id in db
+	 *	@return array affected rows
+	 */
+	public function updateHandlerRule($params,$ruleID)
+	{
+		// TODO Check for rule consistency
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// Add last modified date = creation date and username
+		$params['modified'] = new 	Zend_Db_Expr('NOW()');
+		$params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
-        $numRows=$dbConn->update(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            $params,
-            'id='.$ruleID
-            );
-        return $numRows;
-    }
+		$numRows=$dbConn->update(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			$params,
+			'id='.$ruleID
+			);
+		return $numRows;
+	}
     
-    /** Delete rule by id
-     *	@param int $ruleID rule id
-     */
-    public function deleteRule($ruleID)
-    {
-        if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
+	/** Delete rule by id
+	 *	@param int $ruleID rule id
+	 */
+	public function deleteRule($ruleID)
+	{
+		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->delete(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            'id='.$ruleID
-            );
-        return $query;
-    }
+		$query=$dbConn->delete(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			'id='.$ruleID
+			);
+		return $query;
+	}
     
-    /** Delete trap by ip & oid
-     *	@param $ipAddr string source IP (v4 or v6)
-     *	@param $oid string oid
-     */
-    public function deleteTrap($ipAddr,$oid)
-    {
+	/** Delete trap by ip & oid
+	 *	@param $ipAddr string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
+	public function deleteTrap($ipAddr,$oid)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $condition=null;
-        if ($ipAddr != null)
-        {
-            $condition="source_ip='$ipAddr'";
-        }
-        if ($oid != null)
-        {
-            $condition=($condition===null)?'':$condition.' AND ';
-            $condition.="trap_oid='$oid'";
-        }
-        if($condition === null) return null;
-        $query=$dbConn->delete(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
-            $condition
-            );
-        // TODO test ret code etc...
-        return $query;
-    }
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$condition=null;
+		if ($ipAddr != null)
+		{
+			$condition="source_ip='$ipAddr'";
+		}
+		if ($oid != null)
+		{
+			$condition=($condition===null)?'':$condition.' AND ';
+			$condition.="trap_oid='$oid'";
+		}
+		if($condition === null) return null;
+		$query=$dbConn->delete(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
+			$condition
+			);
+		// TODO test ret code etc...
+		return $query;
+	}
     
     
-    /** count trap by ip & oid
-     *	@param $ipAddr string source IP (v4 or v6)
-     *	@param $oid string oid
-     */
-    public function countTrap($ipAddr,$oid)
-    {
+	/** count trap by ip & oid
+	 *	@param $ipAddr string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
+	public function countTrap($ipAddr,$oid)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $condition=null;
-        if ($ipAddr != null)
-        {
-            $condition="source_ip='$ipAddr'";
-        }
-        if ($oid != null)
-        {
-            $condition=($condition===null)?'':$condition.' AND ';
-            $condition.="trap_oid='$oid'";
-        }
-        if($condition === null) return 0;
-        $query=$dbConn->select()
-            ->from(
-                $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
-                array('num'=>'count(*)'))
-            ->where($condition);
-        $returnRow=$dbConn->fetchRow($query);
-        return $returnRow->num;
-    }
+		$condition=null;
+		if ($ipAddr != null)
+		{
+			$condition="source_ip='$ipAddr'";
+		}
+		if ($oid != null)
+		{
+			$condition=($condition===null)?'':$condition.' AND ';
+			$condition.="trap_oid='$oid'";
+		}
+		if($condition === null) return 0;
+		$query=$dbConn->select()
+			->from(
+				$this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
+				array('num'=>'count(*)'))
+			->where($condition);
+		$returnRow=$dbConn->fetchRow($query);
+		return $returnRow->num;
+	}
     
-    /** get configuration value
-     *	@param string $element : configuration name in db
-     */
-    public function getDBConfigValue($element)
-    {
+	/** get configuration value
+	 *	@param string $element : configuration name in db
+	 */
+	public function getDBConfigValue($element)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->select()
-        ->from(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array('value'=>'value'))
-            ->where('name=?',$element);
-            $returnRow=$dbConn->fetchRow($query);
-            if ($returnRow==null)  // value does not exists
-            {
-                $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
+		$query=$dbConn->select()
+		->from(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array('value'=>'value'))
+			->where('name=?',$element);
+			$returnRow=$dbConn->fetchRow($query);
+			if ($returnRow==null)  // value does not exists
+			{
+				$default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
+				if ( ! isset($default[$element])) return null; // no default and not value
                 
-                $this->addDBConfigValue($element,$default[$element]);
-                return $default[$element];
-            }
-            if ($returnRow->value == null) // value id empty
-            {
-                $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
-                $this->setDBConfigValue($element,$default[$element]);
-                return $default[$element];
-            }
-            return $returnRow->value;
-    }
+				$this->addDBConfigValue($element,$default[$element]);
+				return $default[$element];
+			}
+			if ($returnRow->value == null) // value id empty
+			{
+				$default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
+				if ( ! isset($default[$element])) return null; // no default and not value
+				$this->setDBConfigValue($element,$default[$element]);
+				return $default[$element];
+			}
+			return $returnRow->value;
+	}
     
-    /** add configuration value
-     *	@param string $element : name of config element
-     *   @param string $value : value
-     */
+	/** add configuration value
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
     
-    public function addDBConfigValue($element,$value)
-    {
+	public function addDBConfigValue($element,$value)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->insert(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array(
-                'name' => $element,
-                'value'=>$value
-            )
-            );
-        return $query;
-    }
+		$query=$dbConn->insert(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array(
+				'name' => $element,
+				'value'=>$value
+			)
+			);
+		return $query;
+	}
     
-    /** set configuration value
-     *	@param string $element : name of config element
-     *   @param string $value : value
-     */
-    public function setDBConfigValue($element,$value)
-    {
+	/** set configuration value
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
+	public function setDBConfigValue($element,$value)
+	{
         
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->update(
-            $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
-            array('value'=>$value),
-            'name=\''.$element.'\''
-            );
-        return $query;
-    }
+		$query=$dbConn->update(
+			$this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
+			array('value'=>$value),
+			'name=\''.$element.'\''
+			);
+		return $query;
+	}
     
     
 }
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -33,18 +33,18 @@ 
     {
         // TODO Check for rule consistency
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // Add last modified date = creation date and username
-        $params['created'] = new Zend_Db_Expr('NOW()');
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+        $params['created']=new Zend_Db_Expr('NOW()');
+        $params['modified']=new 	Zend_Db_Expr('NOW()');
+        $params['modifier']=$this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
         $query=$dbConn->insert(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
             $params
             );
-        if($query==false)
+        if ($query == false)
         {
             return null;
         }
@@ -56,14 +56,14 @@ 
      *   @param integer $ruleID : rule id in db
      *	@return array affected rows
      */
-    public function updateHandlerRule($params,$ruleID)
+    public function updateHandlerRule($params, $ruleID)
     {
         // TODO Check for rule consistency
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // Add last modified date = creation date and username
-        $params['modified'] = new 	Zend_Db_Expr('NOW()');
-        $params['modifier'] = $this->getTrapCtrl()->Auth()->getUser()->getUsername();
+        $params['modified']=new 	Zend_Db_Expr('NOW()');
+        $params['modifier']=$this->getTrapCtrl()->Auth()->getUser()->getUsername();
         
         $numRows=$dbConn->update(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
@@ -78,9 +78,9 @@ 
      */
     public function deleteRule($ruleID)
     {
-        if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
+        if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->delete(
@@ -94,10 +94,10 @@ 
      *	@param $ipAddr string source IP (v4 or v6)
      *	@param $oid string oid
      */
-    public function deleteTrap($ipAddr,$oid)
+    public function deleteTrap($ipAddr, $oid)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $condition=null;
         if ($ipAddr != null)
@@ -106,10 +106,10 @@ 
         }
         if ($oid != null)
         {
-            $condition=($condition===null)?'':$condition.' AND ';
+            $condition=($condition === null) ? '' : $condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return null;
+        if ($condition === null) return null;
         $query=$dbConn->delete(
             $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
             $condition
@@ -123,10 +123,10 @@ 
      *	@param $ipAddr string source IP (v4 or v6)
      *	@param $oid string oid
      */
-    public function countTrap($ipAddr,$oid)
+    public function countTrap($ipAddr, $oid)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $condition=null;
@@ -136,10 +136,10 @@ 
         }
         if ($oid != null)
         {
-            $condition=($condition===null)?'':$condition.' AND ';
+            $condition=($condition === null) ? '' : $condition.' AND ';
             $condition.="trap_oid='$oid'";
         }
-        if($condition === null) return 0;
+        if ($condition === null) return 0;
         $query=$dbConn->select()
             ->from(
                 $this->getTrapCtrl()->getModuleConfig()->getTrapTableName(),
@@ -155,28 +155,28 @@ 
     public function getDBConfigValue($element)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->select()
         ->from(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
             array('value'=>'value'))
-            ->where('name=?',$element);
+            ->where('name=?', $element);
             $returnRow=$dbConn->fetchRow($query);
-            if ($returnRow==null)  // value does not exists
+            if ($returnRow == null)  // value does not exists
             {
                 $default=$this->getTrapCtrl()->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]);
+                $this->addDBConfigValue($element, $default[$element]);
                 return $default[$element];
             }
             if ($returnRow->value == null) // value id empty
             {
                 $default=$this->getTrapCtrl()->getModuleConfig()->getDBConfigDefaults();
-                if ( ! isset($default[$element])) return null; // no default and not value
-                $this->setDBConfigValue($element,$default[$element]);
+                if (!isset($default[$element])) return null; // no default and not value
+                $this->setDBConfigValue($element, $default[$element]);
                 return $default[$element];
             }
             return $returnRow->value;
@@ -187,10 +187,10 @@ 
      *   @param string $value : value
      */
     
-    public function addDBConfigValue($element,$value)
+    public function addDBConfigValue($element, $value)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->insert(
@@ -207,10 +207,10 @@ 
      *	@param string $element : name of config element
      *   @param string $value : value
      */
-    public function setDBConfigValue($element,$value)
+    public function setDBConfigValue($element, $value)
     {
         
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->update(

library/Trapdirector/TrapsActions/UIDatabase.php

Indentation +260 added lines, -260 removed lines

@@ -19,30 +19,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;
+	}
 }
 
 /**
@@ -56,278 +56,278 @@ 
  */
 class UIDatabase //extends TrapDBQuery
 {
-    use TrapDBQuery,IdoDBQuery;
+	use TrapDBQuery,IdoDBQuery;
     
-    /** @var TrapsController $trapController TrapController 'parent' class */
-    protected  $trapController=null;
+	/** @var TrapsController $trapController TrapController 'parent' class */
+	protected  $trapController=null;
     
-    /** @var Selectable $trapDB Trap Database*/
-    protected $trapDB=null;
+	/** @var Selectable $trapDB Trap Database*/
+	protected $trapDB=null;
  
-    /** @var Selectable $trapDB Icinga IDO database*/
-    protected $idoDB=null;
+	/** @var Selectable $trapDB Icinga IDO database*/
+	protected $idoDB=null;
     
-    /** @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;
+	}
     
-    /**
-     * Get TrapsController instance
-     * @return TrapsController
-     */
-    protected function getTrapCtrl()
-    {
-        return $this->trapController;
-    }
+	/**
+	 * Get TrapsController instance
+	 * @return TrapsController
+	 */
+	protected function getTrapCtrl()
+	{
+		return $this->trapController;
+	}
     
-    /**
-     * 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 Selectable|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 Selectable|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 $dbconn;
-    }
+		return $dbconn;
+	}
 
-    /**
-     * Get Trap database
-     * @return Selectable|null : returns DB connexion or null on error.
-     */
-    public function getDb()
-    {
-        if ( $this->trapDB != null ) return $this->trapDB;
+	/**
+	 * Get Trap database
+	 * @return Selectable|null : returns DB connexion 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
+		}
         
-        //$this->trapDB->getConnection();
+		//$this->trapDB->getConnection();
         
-        return $this->trapDB;
-    }
+		return $this->trapDB;
+	}
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getDbConn()
-    {
-        if ($this->getDb() == null) return null;
-        return $this->getDb()->getConnection();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getDbConn()
+	{
+		if ($this->getDb() == null) return null;
+		return $this->getDb()->getConnection();
+	}
     
-    /**
-     * 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
-     * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
-     */
-    public function getIdoDb()
-    {
-        if ( $this->idoDB != null ) 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
+	 * @return \Zend_Db_Adapter_Abstract|NULL  returns DB connexion or null on error.
+	 */
+	public function getIdoDb()
+	{
+		if ( $this->idoDB != null ) 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->trapController->redirectNow('trapdirector/settings?idodberror=1');
-            return null;
-        }
+		if ( ! $dbresource )
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
+		}
         
-        try
-        {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
-        {
-            $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
-            return null;
-        }
+		try
+		{
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		}
+		catch (Exception $e)
+		{
+			$this->trapController->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
+		}
 
-        $this->idoDB = $dbconn;
-        return $this->idoDB;
-    }
+		$this->idoDB = $dbconn;
+		return $this->idoDB;
+	}
 
 
-    /**
-     * Get Zend adapter of DB.
-     * @return \Zend_Db_Adapter_Abstract|null
-     */
-    public function getIdoDbConn()
-    {
-        if ($this->getIdoDb() == null) return null;
-        return $this->getIdoDb()->getConnection();
-    }
+	/**
+	 * Get Zend adapter of DB.
+	 * @return \Zend_Db_Adapter_Abstract|null
+	 */
+	public function getIdoDbConn()
+	{
+		if ($this->getIdoDb() == null) return null;
+		return $this->getIdoDb()->getConnection();
+	}
     
-    /**
-     * 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

library/Trapdirector/TrapsActions/IdoDBQuery.php

Indentation +222 added lines, -222 removed lines

@@ -18,247 +18,247 @@
 trait IdoDBQuery
 {
 
-    /** @return TrapsController */
-    abstract protected function getTrapCtrl();
+	/** @return TrapsController */
+	abstract protected function getTrapCtrl();
     
-    /** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
-    abstract public function getIdoDbConn();
+	/** @return Zend_Db_Adapter_Abstract : returns DB connexion or null on error */
+	abstract public function getIdoDbConn();
     
-    /** Get host(s) by IP (v4 or v6) or by name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostByIP($ip)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get host(s) by IP (v4 or v6) or by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostByIP($ip)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("(b.address LIKE '%".$ip."%' OR b.address6 LIKE '%".$ip."%' OR a.name1 LIKE '%".$ip."%' OR b.display_name LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host(s) by name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostByName($name)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get host(s) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostByName($name)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name'))
-                ->where("a.name1 = '$name'");
-                return $dbConn->fetchAll($query);
-    }
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name'))
+				->where("a.name1 = '$name'");
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get host groups by  name in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( name, id (object_id), display_name)
-     */
-    public function getHostGroupByName($ip)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        // TODO : check for SQL injections
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
-            ->join(
-                array('b' => 'icinga_hostgroups'),
-                'b.hostgroup_object_id=a.object_id',
-                array('display_name' => 'b.alias'))
-                ->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
-                return $dbConn->fetchAll($query);
-    }
+	/** Get host groups by  name in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
+	public function getHostGroupByName($ip)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		// TODO : check for SQL injections
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'object_id'))
+			->join(
+				array('b' => 'icinga_hostgroups'),
+				'b.hostgroup_object_id=a.object_id',
+				array('display_name' => 'b.alias'))
+				->where("(a.name1 LIKE '%".$ip."%' OR b.alias LIKE '%".$ip."%') and a.is_active = 1");
+				return $dbConn->fetchAll($query);
+	}
  
-    /** Get host IP (v4 and v6) by name in IDO database
-     *	does not catch exceptions
-     *	@return array ( name, display_name, ip4, ip6)
-     */
-    public function getHostInfoByID($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
-                ->where("a.object_id = '".$id."'");
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host IP (v4 and v6) by name in IDO database
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
+	public function getHostInfoByID($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('ip4' => 'b.address', 'ip6' => 'b.address6', 'display_name' => 'b.display_name'))
+				->where("a.object_id = '".$id."'");
+				return $dbConn->fetchRow($query);
+	}
         
-    /** Get host by objectid  in IDO database
-     *	does not catch exceptions
-     *	@return array of objects ( id, name, display_name, ip, ip6,  )
-     */
-    public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'a.object_id'))
-            ->join(
-                array('b' => 'icinga_hosts'),
-                'b.host_object_id=a.object_id',
-                array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-                ->where('a.object_id = ?',$id);
-                return $dbConn->fetchRow($query);
-    }
+	/** Get host by objectid  in IDO database
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
+	public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name' => 'a.name1','id' => 'a.object_id'))
+			->join(
+				array('b' => 'icinga_hosts'),
+				'b.host_object_id=a.object_id',
+				array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?',$id);
+				return $dbConn->fetchRow($query);
+	}
     
-    /** Get services from object ( host_object_id) in IDO database
-     *	does not catch exceptions
-     *	@param $id	int object_id
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostid($id)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                array('is_active'=>'a.is_active','name2'=>'a.name2'))
-                ->where('s.host_object_id='.$id.' AND a.is_active = 1');
-                return $dbConn->fetchAll($query);
-    }
+	/** Get services from object ( host_object_id) in IDO database
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostid($id)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_services'),
+			array('name' => 's.display_name','id' => 's.service_object_id'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				array('is_active'=>'a.is_active','name2'=>'a.name2'))
+				->where('s.host_object_id='.$id.' AND a.is_active = 1');
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
-     * 	gets all hosts in hostgroup and return common services
-     *	does not catch exceptions
-     *	@param $id	int object_id
-     *	@return array display_name (of service), service_object_id
-     */
-    public function getServicesByHostGroupid($id)
-    {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_hostgroup_members'),
-            array('host_object_id' => 's.host_object_id'))
-            ->join(
-                array('a' => 'icinga_hostgroups'),
-                's.hostgroup_id=a.hostgroup_id',
-                'hostgroup_object_id')
-                ->where('a.hostgroup_object_id='.$id);
-                $hosts=$dbConn->fetchAll($query);
-                $common_services=array();
-                $num_hosts=count($hosts);
-                foreach ($hosts as $key => $host)
-                { // For each host, get all services and add in common_services if not found or add counter
-                    $host_services=$this->getServicesByHostid($host->host_object_id);
-                    foreach($host_services as $service)
-                    {
-                        if (isset($common_services[$service->name2]['num']))
-                        {
-                            $common_services[$service->name2]['num'] +=1;
-                        }
-                        else
-                        {
-                            $common_services[$service->name2]['num']=1;
-                            $common_services[$service->name2]['name']=$service->name;
-                        }
-                    }
-                }
-                $result=array();
+	/** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
+	 * 	gets all hosts in hostgroup and return common services
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
+	public function getServicesByHostGroupid($id)
+	{
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_hostgroup_members'),
+			array('host_object_id' => 's.host_object_id'))
+			->join(
+				array('a' => 'icinga_hostgroups'),
+				's.hostgroup_id=a.hostgroup_id',
+				'hostgroup_object_id')
+				->where('a.hostgroup_object_id='.$id);
+				$hosts=$dbConn->fetchAll($query);
+				$common_services=array();
+				$num_hosts=count($hosts);
+				foreach ($hosts as $key => $host)
+				{ // For each host, get all services and add in common_services if not found or add counter
+					$host_services=$this->getServicesByHostid($host->host_object_id);
+					foreach($host_services as $service)
+					{
+						if (isset($common_services[$service->name2]['num']))
+						{
+							$common_services[$service->name2]['num'] +=1;
+						}
+						else
+						{
+							$common_services[$service->name2]['num']=1;
+							$common_services[$service->name2]['name']=$service->name;
+						}
+					}
+				}
+				$result=array();
                 
-                //print_r($common_services);
-                foreach (array_keys($common_services) as $key)
-                {
-                    if ($common_services[$key]['num'] == $num_hosts)
-                    {
-                        array_push($result,array($key,$common_services[$key]['name']));
-                    }
-                }
+				//print_r($common_services);
+				foreach (array_keys($common_services) as $key)
+				{
+					if ($common_services[$key]['num'] == $num_hosts)
+					{
+						array_push($result,array($key,$common_services[$key]['name']));
+					}
+				}
                 
-                return $result;
-    }
+				return $result;
+	}
     
-    /** Get services object id by host name / service name in IDO database
-     *	does not catch exceptions
-     *	@param $hostname string host name
-     *	@param $name string service name
-     *	@return array  service id
-     */
-    public function getServiceIDByName($hostname,$name)
-    {
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get services object id by host name / service name in IDO database
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return array  service id
+	 */
+	public function getServiceIDByName($hostname,$name)
+	{
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        if ($name == null)
-        {
-            return array();
-        }
+		if ($name == null)
+		{
+			return array();
+		}
         
-        $query=$dbConn->select()
-        ->from(
-            array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
-            ->join(
-                array('a' => 'icinga_objects'),
-                's.service_object_id=a.object_id',
-                'is_active')
-                ->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('s' => 'icinga_services'),
+			array('name' => 's.display_name','id' => 's.service_object_id'))
+			->join(
+				array('a' => 'icinga_objects'),
+				's.service_object_id=a.object_id',
+				'is_active')
+				->where('a.name2=\''.$name.'\' AND a.name1=\''.$hostname.'\' AND a.is_active = 1');
                 
-                return $dbConn->fetchAll($query);
-    }
+				return $dbConn->fetchAll($query);
+	}
     
-    /** Get object name from object_id  in IDO database
-     *	does not catch exceptions
-     *	@param int $id object_id (default to null, used first if not null)
-     *	@return array name1 (host) name2 (service)
-     */
-    public function getObjectNameByid($id)
-    {
-        // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/** Get object name from object_id  in IDO database
+	 *	does not catch exceptions
+	 *	@param int $id object_id (default to null, used first if not null)
+	 *	@return array name1 (host) name2 (service)
+	 */
+	public function getObjectNameByid($id)
+	{
+		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
+		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
+		$dbConn = $this->getIdoDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query=$dbConn->select()
-        ->from(
-            array('a' => 'icinga_objects'),
-            array('name1' => 'a.name1','name2' => 'a.name2'))
-            ->where('a.object_id='.$id.' AND a.is_active = 1');
+		$query=$dbConn->select()
+		->from(
+			array('a' => 'icinga_objects'),
+			array('name1' => 'a.name1','name2' => 'a.name2'))
+			->where('a.object_id='.$id.' AND a.is_active = 1');
             
-            return $dbConn->fetchRow($query);
-    }
+			return $dbConn->fetchRow($query);
+	}
     
     
 }
\ No newline at end of file