patrickpr / trapdirector

library/Trapdirector/TrapsActions/TrapDBQuery.php

Indentation +191 added lines, -191 removed lines

@@ -20,225 +20,225 @@
 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;
+	}
 
-    /**
-     * Get last trap rule table modification
-     * @throws \ErrorException
-     * @return Zend_Db_Select
-     */
-    public function lastModification()
-    {
-        $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	/**
+	 * Get last trap rule table modification
+	 * @throws \ErrorException
+	 * @return Zend_Db_Select
+	 */
+	public function lastModification()
+	{
+		$dbConn = $this->getDbConn();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query = $dbConn->select()
-        ->from(
-            $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
-            array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
-        $returnRow=$dbConn->fetchRow($query);
-        return $returnRow->lastmodified;
-    }
+		$query = $dbConn->select()
+		->from(
+			$this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
+			array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
+		$returnRow=$dbConn->fetchRow($query);
+		return $returnRow->lastmodified;
+	}
     
-    /** 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 +32 added lines, -32 removed lines

@@ -34,18 +34,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;
         }
@@ -57,14 +57,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(),
@@ -79,9 +79,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(
@@ -98,10 +98,10 @@ 
      */
     public function lastModification()
     {
-        $dbConn = $this->getDbConn();
+        $dbConn=$this->getDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
-        $query = $dbConn->select()
+        $query=$dbConn->select()
         ->from(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
             array('lastModified'=>'UNIX_TIMESTAMP(MAX(modified))'));
@@ -113,10 +113,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)
@@ -125,10 +125,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
@@ -142,10 +142,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;
@@ -155,10 +155,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(),
@@ -174,28 +174,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;
@@ -206,10 +206,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(
@@ -226,10 +226,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(

Braces +47 added lines, -15 removed lines

@@ -35,7 +35,9 @@ 
         // TODO Check for rule consistency
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        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()');
@@ -61,7 +63,9 @@ 
     {
         // TODO Check for rule consistency
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        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();
@@ -82,7 +86,9 @@ 
         if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->delete(
             $this->getTrapCtrl()->getModuleConfig()->getTrapRuleName(),
@@ -99,7 +105,9 @@ 
     public function lastModification()
     {
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query = $dbConn->select()
         ->from(
@@ -117,7 +125,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $condition=null;
         if ($ipAddr != null)
         {
@@ -128,7 +138,9 @@ 
             $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
@@ -146,7 +158,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $condition=null;
         if ($ipAddr != null)
@@ -158,7 +172,9 @@ 
             $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(),
@@ -175,7 +191,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->select()
         ->from(
@@ -183,18 +201,28 @@ 
             array('value'=>'value'))
             ->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]);
                 return $default[$element];
             }
-            if ($returnRow->value == null) // value id empty
+            if ($returnRow->value == null) {
+            	// value id empty
             {
                 $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->setDBConfigValue($element,$default[$element]);
                 return $default[$element];
             }
@@ -210,7 +238,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->insert(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),
@@ -230,7 +260,9 @@ 
     {
         
         $dbConn = $this->getDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->update(
             $this->getTrapCtrl()->getModuleConfig()->getDbConfigTableName(),

library/Trapdirector/TrapsProcess/TrapApi.php

Indentation +76 added lines, -76 removed lines

@@ -17,93 +17,93 @@
 class TrapApi
 {
 
-    // Constants
-    public const MASTER=1;
-    public const MASTERHA=2;
-    public const SAT=3;
-    public $stateArray = array('MASTER' => TrapApi::MASTER, 'MASTERHA' => TrapApi::MASTERHA , 'SAT' => TrapApi::SAT  );
+	// Constants
+	public const MASTER=1;
+	public const MASTERHA=2;
+	public const SAT=3;
+	public $stateArray = array('MASTER' => TrapApi::MASTER, 'MASTERHA' => TrapApi::MASTERHA , 'SAT' => TrapApi::SAT  );
     
-    /** @var integer $whoami current server : MASTER MASTERHA or SAT */
-    public $whoami = TrapApi::MASTER;
-    /** @var string $masterIP ip of master if MASTERHA or SAT  */
-    public $masterIP='';
-    /** @var integer $masterPort port of master if MASTERHA or SAT  */
-    public $masterPort=443;
-    /** @var string $masterUser user to log in API  */
-    public $masterUser='';
-    /** @var string $masterPass password */
-    public $masterPass='';
+	/** @var integer $whoami current server : MASTER MASTERHA or SAT */
+	public $whoami = TrapApi::MASTER;
+	/** @var string $masterIP ip of master if MASTERHA or SAT  */
+	public $masterIP='';
+	/** @var integer $masterPort port of master if MASTERHA or SAT  */
+	public $masterPort=443;
+	/** @var string $masterUser user to log in API  */
+	public $masterUser='';
+	/** @var string $masterPass password */
+	public $masterPass='';
     
-    /** @var Logging $logging logging class */
-    protected $logging;
+	/** @var Logging $logging logging class */
+	protected $logging;
     
-    /**
-     * Create TrapApi class
-     * @param Logging $logClass
-     */
-    function __construct($logClass)
-    {
-        $this->logging=$logClass;
-    }
+	/**
+	 * Create TrapApi class
+	 * @param Logging $logClass
+	 */
+	function __construct($logClass)
+	{
+		$this->logging=$logClass;
+	}
 
-    /**
-     * Return true if ode is master.
-     * @return boolean
-     */
-    public function isMaster()
-    {
-        return ($this->whoami == MASTER);
-    }
+	/**
+	 * Return true if ode is master.
+	 * @return boolean
+	 */
+	public function isMaster()
+	{
+		return ($this->whoami == MASTER);
+	}
 
-    /**
-     * return status of node
-     * @return number
-     */
-    public function getStatus()
-    {
-        return $this->whoami;    
-    }
+	/**
+	 * return status of node
+	 * @return number
+	 */
+	public function getStatus()
+	{
+		return $this->whoami;    
+	}
     
-    /**
-     * Set status os node to $status
-     * @param string $status
-     * @return boolean : true if $status is correct, or false.
-     */
-    public function setStatus(string $status)
-    {
-        if (! isset($this->stateArray[$status]))
-        {
-            return FALSE;
-        }
+	/**
+	 * Set status os node to $status
+	 * @param string $status
+	 * @return boolean : true if $status is correct, or false.
+	 */
+	public function setStatus(string $status)
+	{
+		if (! isset($this->stateArray[$status]))
+		{
+			return FALSE;
+		}
         
-        $this->logging->log('Setting status to : ' . $status, INFO);
+		$this->logging->log('Setting status to : ' . $status, INFO);
         
-        $this->whoami = $this->stateArray[$status];
+		$this->whoami = $this->stateArray[$status];
         
-        return TRUE;
-    }
+		return TRUE;
+	}
  
-    public function setStatusMaster()
-    {
-        $this->whoami = TrapApi::MASTER;
-    }
+	public function setStatusMaster()
+	{
+		$this->whoami = TrapApi::MASTER;
+	}
     
-    /**
-     * Set params for API connection
-     * @param string $IP
-     * @param int $port
-     * @param string $user
-     * @param string $pass
-     * @return boolean true if params are OK
-     */
-    public function setParams(string $IP, int $port, string $user, string $pass)
-    {
-        $this->masterIP = $IP;
-        $this->masterPort = $port;
-        $this->masterUser = $user;
-        $this->masterPass = $pass;
+	/**
+	 * Set params for API connection
+	 * @param string $IP
+	 * @param int $port
+	 * @param string $user
+	 * @param string $pass
+	 * @return boolean true if params are OK
+	 */
+	public function setParams(string $IP, int $port, string $user, string $pass)
+	{
+		$this->masterIP = $IP;
+		$this->masterPort = $port;
+		$this->masterUser = $user;
+		$this->masterPass = $pass;
         
-        return true;
-    }
+		return true;
+	}
     
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -21,10 +21,10 @@ 
     public const MASTER=1;
     public const MASTERHA=2;
     public const SAT=3;
-    public $stateArray = array('MASTER' => TrapApi::MASTER, 'MASTERHA' => TrapApi::MASTERHA , 'SAT' => TrapApi::SAT  );
+    public $stateArray=array('MASTER' => TrapApi::MASTER, 'MASTERHA' => TrapApi::MASTERHA, 'SAT' => TrapApi::SAT);
     
     /** @var integer $whoami current server : MASTER MASTERHA or SAT */
-    public $whoami = TrapApi::MASTER;
+    public $whoami=TrapApi::MASTER;
     /** @var string $masterIP ip of master if MASTERHA or SAT  */
     public $masterIP='';
     /** @var integer $masterPort port of master if MASTERHA or SAT  */
@@ -71,21 +71,21 @@ 
      */
     public function setStatus(string $status)
     {
-        if (! isset($this->stateArray[$status]))
+        if (!isset($this->stateArray[$status]))
         {
             return FALSE;
         }
         
-        $this->logging->log('Setting status to : ' . $status, INFO);
+        $this->logging->log('Setting status to : '.$status, INFO);
         
-        $this->whoami = $this->stateArray[$status];
+        $this->whoami=$this->stateArray[$status];
         
         return TRUE;
     }
  
     public function setStatusMaster()
     {
-        $this->whoami = TrapApi::MASTER;
+        $this->whoami=TrapApi::MASTER;
     }
     
     /**
@@ -98,10 +98,10 @@ 
      */
     public function setParams(string $IP, int $port, string $user, string $pass)
     {
-        $this->masterIP = $IP;
-        $this->masterPort = $port;
-        $this->masterUser = $user;
-        $this->masterPass = $pass;
+        $this->masterIP=$IP;
+        $this->masterPort=$port;
+        $this->masterUser=$user;
+        $this->masterPass=$pass;
         
         return true;
     }

library/Trapdirector/Rest/RestAPI.php

Indentation +34 added lines, -34 removed lines

@@ -14,43 +14,43 @@
 
 class RestAPI
 {
-    public $version=1;
+	public $version=1;
     
-    /**
-     * @var TrapsController $trapController
-     */
-    protected $trapController=null;
+	/**
+	 * @var TrapsController $trapController
+	 */
+	protected $trapController=null;
     
-    public function __construct(TrapsController $trapCtrl)
-    {
-        $this->trapController=$trapCtrl;
-    }
+	public function __construct(TrapsController $trapCtrl)
+	{
+		$this->trapController=$trapCtrl;
+	}
     
-    public function sendJson($object)
-    {
-        $this->trapController->getResponse()->setHeader('Content-Type', 'application/json', true);        
-        $this->trapController->getResponse()->sendHeaders();
-        $this->trapController->helper_ret(json_encode($object, JSON_PRETTY_PRINT));
-        //$this->trapController->_helper->json($object);
-        //echo json_encode($object, JSON_PRETTY_PRINT) . "\n";
-    }
+	public function sendJson($object)
+	{
+		$this->trapController->getResponse()->setHeader('Content-Type', 'application/json', true);        
+		$this->trapController->getResponse()->sendHeaders();
+		$this->trapController->helper_ret(json_encode($object, JSON_PRETTY_PRINT));
+		//$this->trapController->_helper->json($object);
+		//echo json_encode($object, JSON_PRETTY_PRINT) . "\n";
+	}
     
-    protected function sendJsonError(string $error, int $retCode = 200)
-    {
-        //TODO
-        $this->sendJson('{"Error":"'.$error.'"}');
-    }
+	protected function sendJsonError(string $error, int $retCode = 200)
+	{
+		//TODO
+		$this->sendJson('{"Error":"'.$error.'"}');
+	}
     
-    public function last_modified()
-    {
-        try 
-        {
-            $query = $this->trapController->getUIDatabase()->lastModification();
-            return array('lastModified' => $query);
-        } 
-        catch (\ErrorException $e) 
-        {
-            return array('Error' =>  $e->getMessage());
-        }
-    }
+	public function last_modified()
+	{
+		try 
+		{
+			$query = $this->trapController->getUIDatabase()->lastModification();
+			return array('lastModified' => $query);
+		} 
+		catch (\ErrorException $e) 
+		{
+			return array('Error' =>  $e->getMessage());
+		}
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
         //echo json_encode($object, JSON_PRETTY_PRINT) . "\n";
     }
     
-    protected function sendJsonError(string $error, int $retCode = 200)
+    protected function sendJsonError(string $error, int $retCode=200)
     {
         //TODO
         $this->sendJson('{"Error":"'.$error.'"}');
@@ -45,7 +45,7 @@ 
     {
         try 
         {
-            $query = $this->trapController->getUIDatabase()->lastModification();
+            $query=$this->trapController->getUIDatabase()->lastModification();
             return array('lastModified' => $query);
         } 
         catch (\ErrorException $e) 

Braces +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
         {
             $query = $this->trapController->getUIDatabase()->lastModification();
             return array('lastModified' => $query);
-        } 
-        catch (\ErrorException $e) 
+        } catch (\ErrorException $e) 
         {
             return array('Error' =>  $e->getMessage());
         }

library/Trapdirector/Icinga2Api.php

Indentation +336 added lines, -336 removed lines

@@ -8,367 +8,367 @@
 
 class Icinga2API 
 {
-    protected $version = 'v1';      //< icinga2 api version
+	protected $version = 'v1';      //< icinga2 api version
     
-    protected $host;                //< icinga2 host name or IP
-    protected $port;                //< icinga2 api port
+	protected $host;                //< icinga2 host name or IP
+	protected $port;                //< icinga2 api port
     
-    protected $user;                //< user name
-    protected $pass;                //< user password
-    protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
-    protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
+	protected $user;                //< user name
+	protected $pass;                //< user password
+	protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
+	protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
 
-    protected $curl;
-    // http://php.net/manual/de/function.json-last-error.php#119985
-    protected $errorReference = [
-        JSON_ERROR_NONE => 'No error has occurred.',
-        JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
-        JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
-        JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded.',
-        JSON_ERROR_SYNTAX => 'Syntax error.',
-        JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
-        JSON_ERROR_RECURSION => 'One or more recursive references in the value to be encoded.',
-        JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
-        JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
-    ];
-    const JSON_UNKNOWN_ERROR = 'Unknown error.';
+	protected $curl;
+	// http://php.net/manual/de/function.json-last-error.php#119985
+	protected $errorReference = [
+		JSON_ERROR_NONE => 'No error has occurred.',
+		JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
+		JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
+		JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded.',
+		JSON_ERROR_SYNTAX => 'Syntax error.',
+		JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
+		JSON_ERROR_RECURSION => 'One or more recursive references in the value to be encoded.',
+		JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
+		JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
+	];
+	const JSON_UNKNOWN_ERROR = 'Unknown error.';
     
-    /**
-     * Creates Icinga2API object
-     * 
-     * @param string $host host name or IP
-     * @param number $port API port
-     */
-    public function __construct($host, $port = 5665)
-    {
-        $this->host=$host;
-        $this->port=$port;
-    }
-    /**
-     * Set user & pass
-     * @param string $user
-     * @param string $pass
-     */
-    public function setCredentials($user,$pass)
-    {
-        $this->user=$user;
-        $this->pass=$pass;
-        $this->authmethod='pass';
-    }
+	/**
+	 * Creates Icinga2API object
+	 * 
+	 * @param string $host host name or IP
+	 * @param number $port API port
+	 */
+	public function __construct($host, $port = 5665)
+	{
+		$this->host=$host;
+		$this->port=$port;
+	}
+	/**
+	 * Set user & pass
+	 * @param string $user
+	 * @param string $pass
+	 */
+	public function setCredentials($user,$pass)
+	{
+		$this->user=$user;
+		$this->pass=$pass;
+		$this->authmethod='pass';
+	}
     
-    /**
-     * Set user & certificate (NOT IMPLEMENTED @throws RuntimeException)
-     * @param string $user
-     * @param string $usercert
-     */
-    public function setCredentialskey($user,$usercert)
-    {
-        $this->user=$user;
-        $this->usercert=$usercert;
-        $this->authmethod='cert';
-        throw new RuntimeException('Certificate auth not implemented');
-    }
+	/**
+	 * Set user & certificate (NOT IMPLEMENTED @throws RuntimeException)
+	 * @param string $user
+	 * @param string $usercert
+	 */
+	public function setCredentialskey($user,$usercert)
+	{
+		$this->user=$user;
+		$this->usercert=$usercert;
+		$this->authmethod='cert';
+		throw new RuntimeException('Certificate auth not implemented');
+	}
 
-    public function test(array $permissions)
-    {
-       try
-        {
-            $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
-        {
-            return array(true, 'Error with API : '.$e->getMessage());
-        }
-        //var_dump($result);
-        $permOk=1;
-        $permMissing='';
-        if ($permissions === NULL) // If no permission check return OK after connexion
-        {
-            return array(false,'OK');
-        }
-        if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
-        {
+	public function test(array $permissions)
+	{
+	   try
+		{
+			$result=$this->request('GET', "", NULL, NULL);
+		} 
+		catch (Exception $e)
+		{
+			return array(true, 'Error with API : '.$e->getMessage());
+		}
+		//var_dump($result);
+		$permOk=1;
+		$permMissing='';
+		if ($permissions === NULL) // If no permission check return OK after connexion
+		{
+			return array(false,'OK');
+		}
+		if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
+		{
             
-            foreach ( $permissions as $mustPermission)
-            {
-                $curPermOK=0;
-                foreach ( $result->results[0]->permissions as $curPermission)
-                {
-                    $curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
-                    if (preg_match('#'.$curPermission.'#',$mustPermission))
-                    {
-                        $curPermOK=1;
-                        break;
-                    }
-                }
-                if ($curPermOK == 0)
-                {
-                    $permOk=0;
-                    $permMissing=$mustPermission;
-                    break;
-                }
-            }
-            if ($permOk == 0)
-            {
-                return array(true,'API connection OK, but missing permission : '.$permMissing);
-            }
-            return array(false,'API connection OK');
+			foreach ( $permissions as $mustPermission)
+			{
+				$curPermOK=0;
+				foreach ( $result->results[0]->permissions as $curPermission)
+				{
+					$curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
+					if (preg_match('#'.$curPermission.'#',$mustPermission))
+					{
+						$curPermOK=1;
+						break;
+					}
+				}
+				if ($curPermOK == 0)
+				{
+					$permOk=0;
+					$permMissing=$mustPermission;
+					break;
+				}
+			}
+			if ($permOk == 0)
+			{
+				return array(true,'API connection OK, but missing permission : '.$permMissing);
+			}
+			return array(false,'API connection OK');
             
-        }
-        return array(true,'API connection OK, but cannot get permissions');
-    }
+		}
+		return array(true,'API connection OK, but cannot get permissions');
+	}
     
     
-    protected function url($url) {
-        return sprintf('https://%s:%d/%s/%s', $this->host, $this->port, $this->version, $url);
-    }
+	protected function url($url) {
+		return sprintf('https://%s:%d/%s/%s', $this->host, $this->port, $this->version, $url);
+	}
     
-    /**
-     * Create or return curl ressource
-     * @throws Exception
-     * @return resource
-     */
-    protected function curl() {
-        if ($this->curl === null) {
-            $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
-            if ($this->curl === false) {
-                throw new Exception('CURL INIT ERROR');
-            }
-        }
-        return $this->curl;
-    }
+	/**
+	 * Create or return curl ressource
+	 * @throws Exception
+	 * @return resource
+	 */
+	protected function curl() {
+		if ($this->curl === null) {
+			$this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
+			if ($this->curl === false) {
+				throw new Exception('CURL INIT ERROR');
+			}
+		}
+		return $this->curl;
+	}
 
-    /**
-     * Send a passive service check
-     * @param string $host : host name 
-     * @param string $service : service name
-     * @param int $state : state of service
-     * @param string $display : service passive check output
-     * @param string $perfdata : performance data as string
-     * @return array (status = true (oK) or false (nok), string message)
-     */
-    public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
-    {
-        //Send a POST request to the URL endpoint /v1/actions/process-check-result
-        //actions/process-check-result?service=example.localdomain!passive-ping6
-        $url='actions/process-check-result';
-        $body=array(
-            "filter"        => 'service.name=="'.$service.'" && service.host_name=="'.$host.'"',
-            'type'          => 'Service',
-            "exit_status"   => $state,
-            "plugin_output" => $display,
-            "performance_data" => $perfdata
-        );
-        try 
-        {
-            $result=$this->request('POST', $url, null, $body);
-        } catch (Exception $e) 
-        {
-            return array(false, $e->getMessage());
-        }
-        if (property_exists($result,'error') )
-        {
-            if (property_exists($result,'status'))
-            {
-                $message=$result->status;
-            }
-            else 
-            {
-                $message="Unkown status";
-            }
-            return array(false , 'Ret code ' .$result->error.' : '.$message);
-        }
-        if (property_exists($result, 'results'))
-        {
-            if (isset($result->results[0]))
-            {
-                return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
-            }
-            else
-            {
-                return array(false,'Service not found');
-            }
+	/**
+	 * Send a passive service check
+	 * @param string $host : host name 
+	 * @param string $service : service name
+	 * @param int $state : state of service
+	 * @param string $display : service passive check output
+	 * @param string $perfdata : performance data as string
+	 * @return array (status = true (oK) or false (nok), string message)
+	 */
+	public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
+	{
+		//Send a POST request to the URL endpoint /v1/actions/process-check-result
+		//actions/process-check-result?service=example.localdomain!passive-ping6
+		$url='actions/process-check-result';
+		$body=array(
+			"filter"        => 'service.name=="'.$service.'" && service.host_name=="'.$host.'"',
+			'type'          => 'Service',
+			"exit_status"   => $state,
+			"plugin_output" => $display,
+			"performance_data" => $perfdata
+		);
+		try 
+		{
+			$result=$this->request('POST', $url, null, $body);
+		} catch (Exception $e) 
+		{
+			return array(false, $e->getMessage());
+		}
+		if (property_exists($result,'error') )
+		{
+			if (property_exists($result,'status'))
+			{
+				$message=$result->status;
+			}
+			else 
+			{
+				$message="Unkown status";
+			}
+			return array(false , 'Ret code ' .$result->error.' : '.$message);
+		}
+		if (property_exists($result, 'results'))
+		{
+			if (isset($result->results[0]))
+			{
+				return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
+			}
+			else
+			{
+				return array(false,'Service not found');
+			}
             
-        }
-        return array(false,'Unkown result, open issue with this : '.print_r($result,true));
-    }
+		}
+		return array(false,'Unkown result, open issue with this : '.print_r($result,true));
+	}
  
-    /**
-     * return array of host by IP (4 or 6)
-     * @param string $ip
-     * @throws Exception
-     * @return array objects : array('__name','name','display_name')
-     */
-    public function getHostByIP($ip) 
-    {
-        /*
+	/**
+	 * return array of host by IP (4 or 6)
+	 * @param string $ip
+	 * @throws Exception
+	 * @return array objects : array('__name','name','display_name')
+	 */
+	public function getHostByIP($ip) 
+	{
+		/*
          *  curl -k -s -u  trapdirector:trapdirector -H 'X-HTTP-Method-Override: GET' -X POST 'https://localhost:5665/v1/objects/hosts' 
          *  -d '{"filter":"host.group==\"test_trap\"","attrs": ["address" ,"address6"]}'
             
             {"results":[{"attrs":{"__name":"Icinga host","address":"127.0.0.1","display_name":"Icinga host","name":"Icinga host"},"joins":{},"meta":{},"name":"Icinga host","type":"Host"}]}
          */
         
-        $url='objects/hosts';
-        $body=array(
-            "filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
-            "attrs"         => array('__name','name','display_name')
-        );
-        try
-        {
-            $result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
-        } catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
-        }
+		$url='objects/hosts';
+		$body=array(
+			"filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
+			"attrs"         => array('__name','name','display_name')
+		);
+		try
+		{
+			$result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
+		} catch (Exception $e)
+		{
+			throw new Exception($e->getMessage());
+		}
         
-        if (property_exists($result,'error') )
-        {
-            if (property_exists($result,'status'))
-            {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
-            {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
-            }
-        }
-        if (property_exists($result, 'results'))
-        {
-            $numHost=0;
-            $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
-            {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $numHost++;
-            }
-            return $hostArray;            
-        }
-        throw new Exception('Unkown result');
-    }
+		if (property_exists($result,'error') )
+		{
+			if (property_exists($result,'status'))
+			{
+				throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+			}
+			else
+			{
+				throw new Exception('Ret code ' .$result->error.' : Unkown status');
+			}
+		}
+		if (property_exists($result, 'results'))
+		{
+			$numHost=0;
+			$hostArray=array();
+			while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+			{
+				$hostArray[$numHost] = $result->results[$numHost]->attrs;
+				$numHost++;
+			}
+			return $hostArray;            
+		}
+		throw new Exception('Unkown result');
+	}
 
-    /**
-     * Get all host and IP from hostgroup
-     * @param string $hostGroup
-     * @throws Exception
-     * @return array : attributes : address, address6, name
-     */
-    public function getHostsIPByHostGroup($hostGroup)
-    {        
-        $url='objects/hosts';
-        $body=array(
-            "filter"        => '\"'.$hostGroup.'\" in host.groups',
-            "attrs"         => array('address','address','name')
-        );
-        try
-        {
-            $result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
-        } catch (Exception $e)
-        {
-            throw new Exception($e->getMessage());
-        }
+	/**
+	 * Get all host and IP from hostgroup
+	 * @param string $hostGroup
+	 * @throws Exception
+	 * @return array : attributes : address, address6, name
+	 */
+	public function getHostsIPByHostGroup($hostGroup)
+	{        
+		$url='objects/hosts';
+		$body=array(
+			"filter"        => '\"'.$hostGroup.'\" in host.groups',
+			"attrs"         => array('address','address','name')
+		);
+		try
+		{
+			$result=$this->request('POST', $url, array('X-HTTP-Method-Override: GET'), $body);
+		} catch (Exception $e)
+		{
+			throw new Exception($e->getMessage());
+		}
         
-        if (property_exists($result,'error') )
-        {
-            if (property_exists($result,'status'))
-            {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
-            {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
-            }
-        }
-        if (property_exists($result, 'results'))
-        {
-            $numHost=0;
-            $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
-            {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $hostArray[$numHost]->name = $result->results[$numHost]->name;
-                $numHost++;
-            }
-            return $hostArray;
-        }
-        throw new Exception('Unkown result');
-    }
+		if (property_exists($result,'error') )
+		{
+			if (property_exists($result,'status'))
+			{
+				throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+			}
+			else
+			{
+				throw new Exception('Ret code ' .$result->error.' : Unkown status');
+			}
+		}
+		if (property_exists($result, 'results'))
+		{
+			$numHost=0;
+			$hostArray=array();
+			while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+			{
+				$hostArray[$numHost] = $result->results[$numHost]->attrs;
+				$hostArray[$numHost]->name = $result->results[$numHost]->name;
+				$numHost++;
+			}
+			return $hostArray;
+		}
+		throw new Exception('Unkown result');
+	}
     
-    /**
-     * Send request to API
-     * @param string $method get/post/...
-     * @param string $url (after /v1/ )
-     * @param array $headers
-     * @param array $body 
-     * @throws Exception
-     * @return array
-     */
-    public function request($method, $url, $headers, $body) {
-        $auth = sprintf('%s:%s', $this->user, $this->pass);
-        $curlHeaders = array("Accept: application/json");
-        if ($body !== null) {
-            $body = json_encode($body);
-            array_push($curlHeaders, 'Content-Type: application/json');
-            //array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
-        }
-        //var_dump($body);
-        //var_dump($this->url($url));
-        if ($headers !== null) {
-            $curlFinalHeaders = array_merge($curlHeaders, $headers);
-        } else 
-        {
-            $curlFinalHeaders=$curlHeaders;
-        }
-        $curl = $this->curl();
-        $opts = array(
-            CURLOPT_URL		=> $this->url($url),
-            CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
-            CURLOPT_USERPWD		=> $auth,
-            CURLOPT_CUSTOMREQUEST	=> strtoupper($method),
-            CURLOPT_RETURNTRANSFER 	=> true,
-            CURLOPT_CONNECTTIMEOUT 	=> 10,
-            CURLOPT_SSL_VERIFYHOST 	=> false,
-            CURLOPT_SSL_VERIFYPEER 	=> false,
-        );
-        if ($body !== null) {
-            $opts[CURLOPT_POSTFIELDS] = $body;
-        }
-        curl_setopt_array($curl, $opts);
-        $res = curl_exec($curl);
-        if ($res === false) {
-            throw new Exception('CURL ERROR: ' . curl_error($curl));
-        }
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        if ($statusCode === 401) {
-            throw new Exception('Unable to authenticate, please check your API credentials');
-        }
-        return $this->fromJsonResult($res);
-    }
+	/**
+	 * Send request to API
+	 * @param string $method get/post/...
+	 * @param string $url (after /v1/ )
+	 * @param array $headers
+	 * @param array $body 
+	 * @throws Exception
+	 * @return array
+	 */
+	public function request($method, $url, $headers, $body) {
+		$auth = sprintf('%s:%s', $this->user, $this->pass);
+		$curlHeaders = array("Accept: application/json");
+		if ($body !== null) {
+			$body = json_encode($body);
+			array_push($curlHeaders, 'Content-Type: application/json');
+			//array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
+		}
+		//var_dump($body);
+		//var_dump($this->url($url));
+		if ($headers !== null) {
+			$curlFinalHeaders = array_merge($curlHeaders, $headers);
+		} else 
+		{
+			$curlFinalHeaders=$curlHeaders;
+		}
+		$curl = $this->curl();
+		$opts = array(
+			CURLOPT_URL		=> $this->url($url),
+			CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
+			CURLOPT_USERPWD		=> $auth,
+			CURLOPT_CUSTOMREQUEST	=> strtoupper($method),
+			CURLOPT_RETURNTRANSFER 	=> true,
+			CURLOPT_CONNECTTIMEOUT 	=> 10,
+			CURLOPT_SSL_VERIFYHOST 	=> false,
+			CURLOPT_SSL_VERIFYPEER 	=> false,
+		);
+		if ($body !== null) {
+			$opts[CURLOPT_POSTFIELDS] = $body;
+		}
+		curl_setopt_array($curl, $opts);
+		$res = curl_exec($curl);
+		if ($res === false) {
+			throw new Exception('CURL ERROR: ' . curl_error($curl));
+		}
+		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		if ($statusCode === 401) {
+			throw new Exception('Unable to authenticate, please check your API credentials');
+		}
+		return $this->fromJsonResult($res);
+	}
     
-    /**
-     * 
-     * @param string $json json encoded 
-     * @throws Exception
-     * @return array json decoded
-     */
-    protected function fromJsonResult($json) {
-        $result = @json_decode($json);
-        //var_dump($json);
-        if ($result === null) {
-            throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));
-        }
-        return $result;
-    }
+	/**
+	 * 
+	 * @param string $json json encoded 
+	 * @throws Exception
+	 * @return array json decoded
+	 */
+	protected function fromJsonResult($json) {
+		$result = @json_decode($json);
+		//var_dump($json);
+		if ($result === null) {
+			throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));
+		}
+		return $result;
+	}
     
-    /**
-     * Return text error no json error
-     * @param string $errorCode
-     * @return string
-     */
-    protected function getLastJsonErrorMessage($errorCode) {
-        if (!array_key_exists($errorCode, $this->errorReference)) {
-            return self::JSON_UNKNOWN_ERROR;
-        }
-        return $this->errorReference[$errorCode];
-    }
+	/**
+	 * Return text error no json error
+	 * @param string $errorCode
+	 * @return string
+	 */
+	protected function getLastJsonErrorMessage($errorCode) {
+		if (!array_key_exists($errorCode, $this->errorReference)) {
+			return self::JSON_UNKNOWN_ERROR;
+		}
+		return $this->errorReference[$errorCode];
+	}
 }
 

Spacing +54 added lines, -54 removed lines

@@ -8,19 +8,19 @@ 
 
 class Icinga2API 
 {
-    protected $version = 'v1';      //< icinga2 api version
+    protected $version='v1'; //< icinga2 api version
     
-    protected $host;                //< icinga2 host name or IP
-    protected $port;                //< icinga2 api port
+    protected $host; //< icinga2 host name or IP
+    protected $port; //< icinga2 api port
     
-    protected $user;                //< user name
-    protected $pass;                //< user password
-    protected $usercert;            //< user key for certificate auth (NOT IMPLEMENTED)
-    protected $authmethod='pass';   //< Authentication : 'pass' or 'cert'
+    protected $user; //< user name
+    protected $pass; //< user password
+    protected $usercert; //< user key for certificate auth (NOT IMPLEMENTED)
+    protected $authmethod='pass'; //< Authentication : 'pass' or 'cert'
 
     protected $curl;
     // http://php.net/manual/de/function.json-last-error.php#119985
-    protected $errorReference = [
+    protected $errorReference=[
         JSON_ERROR_NONE => 'No error has occurred.',
         JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.',
         JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.',
@@ -31,7 +31,7 @@ 
         JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.',
         JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.',
     ];
-    const JSON_UNKNOWN_ERROR = 'Unknown error.';
+    const JSON_UNKNOWN_ERROR='Unknown error.';
     
     /**
      * Creates Icinga2API object
@@ -39,7 +39,7 @@ 
      * @param string $host host name or IP
      * @param number $port API port
      */
-    public function __construct($host, $port = 5665)
+    public function __construct($host, $port=5665)
     {
         $this->host=$host;
         $this->port=$port;
@@ -49,7 +49,7 @@ 
      * @param string $user
      * @param string $pass
      */
-    public function setCredentials($user,$pass)
+    public function setCredentials($user, $pass)
     {
         $this->user=$user;
         $this->pass=$pass;
@@ -61,7 +61,7 @@ 
      * @param string $user
      * @param string $usercert
      */
-    public function setCredentialskey($user,$usercert)
+    public function setCredentialskey($user, $usercert)
     {
         $this->user=$user;
         $this->usercert=$usercert;
@@ -84,18 +84,18 @@ 
         $permMissing='';
         if ($permissions === NULL) // If no permission check return OK after connexion
         {
-            return array(false,'OK');
+            return array(false, 'OK');
         }
         if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
         {
             
-            foreach ( $permissions as $mustPermission)
+            foreach ($permissions as $mustPermission)
             {
                 $curPermOK=0;
-                foreach ( $result->results[0]->permissions as $curPermission)
+                foreach ($result->results[0]->permissions as $curPermission)
                 {
-                    $curPermission=preg_replace('/\*/','.*',$curPermission); // put * as .* to created a regexp
-                    if (preg_match('#'.$curPermission.'#',$mustPermission))
+                    $curPermission=preg_replace('/\*/', '.*', $curPermission); // put * as .* to created a regexp
+                    if (preg_match('#'.$curPermission.'#', $mustPermission))
                     {
                         $curPermOK=1;
                         break;
@@ -110,12 +110,12 @@ 
             }
             if ($permOk == 0)
             {
-                return array(true,'API connection OK, but missing permission : '.$permMissing);
+                return array(true, 'API connection OK, but missing permission : '.$permMissing);
             }
-            return array(false,'API connection OK');
+            return array(false, 'API connection OK');
             
         }
-        return array(true,'API connection OK, but cannot get permissions');
+        return array(true, 'API connection OK, but cannot get permissions');
     }
     
     
@@ -130,7 +130,7 @@ 
      */
     protected function curl() {
         if ($this->curl === null) {
-            $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
+            $this->curl=curl_init(sprintf('https://%s:%d', $this->host, $this->port));
             if ($this->curl === false) {
                 throw new Exception('CURL INIT ERROR');
             }
@@ -147,7 +147,7 @@ 
      * @param string $perfdata : performance data as string
      * @return array (status = true (oK) or false (nok), string message)
      */
-    public function serviceCheckResult($host,$service,$state,$display,$perfdata='')
+    public function serviceCheckResult($host, $service, $state, $display, $perfdata='')
     {
         //Send a POST request to the URL endpoint /v1/actions/process-check-result
         //actions/process-check-result?service=example.localdomain!passive-ping6
@@ -166,9 +166,9 @@ 
         {
             return array(false, $e->getMessage());
         }
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
                 $message=$result->status;
             }
@@ -176,21 +176,21 @@ 
             {
                 $message="Unkown status";
             }
-            return array(false , 'Ret code ' .$result->error.' : '.$message);
+            return array(false, 'Ret code '.$result->error.' : '.$message);
         }
         if (property_exists($result, 'results'))
         {
             if (isset($result->results[0]))
             {
-                return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
+                return array(true, 'code '.$result->results[0]->code.' : '.$result->results[0]->status);
             }
             else
             {
-                return array(false,'Service not found');
+                return array(false, 'Service not found');
             }
             
         }
-        return array(false,'Unkown result, open issue with this : '.print_r($result,true));
+        return array(false, 'Unkown result, open issue with this : '.print_r($result, true));
     }
  
     /**
@@ -211,7 +211,7 @@ 
         $url='objects/hosts';
         $body=array(
             "filter"        => 'host.address=="'.$ip.'" || host.address6=="'.$ip.'"',
-            "attrs"         => array('__name','name','display_name')
+            "attrs"         => array('__name', 'name', 'display_name')
         );
         try
         {
@@ -221,24 +221,24 @@ 
             throw new Exception($e->getMessage());
         }
         
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+                throw new Exception('Ret code '.$result->error.' : '.$result->status);
             }
             else
             {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
+                throw new Exception('Ret code '.$result->error.' : Unkown status');
             }
         }
         if (property_exists($result, 'results'))
         {
             $numHost=0;
             $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+            while (isset($result->results[$numHost]) && property_exists($result->results[$numHost], 'attrs'))
             {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
+                $hostArray[$numHost]=$result->results[$numHost]->attrs;
                 $numHost++;
             }
             return $hostArray;            
@@ -257,7 +257,7 @@ 
         $url='objects/hosts';
         $body=array(
             "filter"        => '\"'.$hostGroup.'\" in host.groups',
-            "attrs"         => array('address','address','name')
+            "attrs"         => array('address', 'address', 'name')
         );
         try
         {
@@ -267,25 +267,25 @@ 
             throw new Exception($e->getMessage());
         }
         
-        if (property_exists($result,'error') )
+        if (property_exists($result, 'error'))
         {
-            if (property_exists($result,'status'))
+            if (property_exists($result, 'status'))
             {
-                throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
+                throw new Exception('Ret code '.$result->error.' : '.$result->status);
             }
             else
             {
-                throw new Exception('Ret code ' .$result->error.' : Unkown status');
+                throw new Exception('Ret code '.$result->error.' : Unkown status');
             }
         }
         if (property_exists($result, 'results'))
         {
             $numHost=0;
             $hostArray=array();
-            while (isset($result->results[$numHost]) && property_exists ($result->results[$numHost],'attrs'))
+            while (isset($result->results[$numHost]) && property_exists($result->results[$numHost], 'attrs'))
             {
-                $hostArray[$numHost] = $result->results[$numHost]->attrs;
-                $hostArray[$numHost]->name = $result->results[$numHost]->name;
+                $hostArray[$numHost]=$result->results[$numHost]->attrs;
+                $hostArray[$numHost]->name=$result->results[$numHost]->name;
                 $numHost++;
             }
             return $hostArray;
@@ -303,23 +303,23 @@ 
      * @return array
      */
     public function request($method, $url, $headers, $body) {
-        $auth = sprintf('%s:%s', $this->user, $this->pass);
-        $curlHeaders = array("Accept: application/json");
+        $auth=sprintf('%s:%s', $this->user, $this->pass);
+        $curlHeaders=array("Accept: application/json");
         if ($body !== null) {
-            $body = json_encode($body);
+            $body=json_encode($body);
             array_push($curlHeaders, 'Content-Type: application/json');
             //array_push($curlHeaders, 'X-HTTP-Method-Override: GET');
         }
         //var_dump($body);
         //var_dump($this->url($url));
         if ($headers !== null) {
-            $curlFinalHeaders = array_merge($curlHeaders, $headers);
+            $curlFinalHeaders=array_merge($curlHeaders, $headers);
         } else 
         {
             $curlFinalHeaders=$curlHeaders;
         }
-        $curl = $this->curl();
-        $opts = array(
+        $curl=$this->curl();
+        $opts=array(
             CURLOPT_URL		=> $this->url($url),
             CURLOPT_HTTPHEADER 	=> $curlFinalHeaders,
             CURLOPT_USERPWD		=> $auth,
@@ -330,14 +330,14 @@ 
             CURLOPT_SSL_VERIFYPEER 	=> false,
         );
         if ($body !== null) {
-            $opts[CURLOPT_POSTFIELDS] = $body;
+            $opts[CURLOPT_POSTFIELDS]=$body;
         }
         curl_setopt_array($curl, $opts);
-        $res = curl_exec($curl);
+        $res=curl_exec($curl);
         if ($res === false) {
-            throw new Exception('CURL ERROR: ' . curl_error($curl));
+            throw new Exception('CURL ERROR: '.curl_error($curl));
         }
-        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $statusCode=curl_getinfo($curl, CURLINFO_HTTP_CODE);
         if ($statusCode === 401) {
             throw new Exception('Unable to authenticate, please check your API credentials');
         }
@@ -351,7 +351,7 @@ 
      * @return array json decoded
      */
     protected function fromJsonResult($json) {
-        $result = @json_decode($json);
+        $result=@json_decode($json);
         //var_dump($json);
         if ($result === null) {
             throw new Exception('Parsing JSON failed: '.$this->getLastJsonErrorMessage(json_last_error()));

Braces +8 added lines, -11 removed lines

@@ -74,18 +74,19 @@ 
        try
         {
             $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return array(true, 'Error with API : '.$e->getMessage());
         }
         //var_dump($result);
         $permOk=1;
         $permMissing='';
-        if ($permissions === NULL) // If no permission check return OK after connexion
+        if ($permissions === NULL) {
+        	// If no permission check return OK after connexion
         {
             return array(false,'OK');
         }
+        }
         if (property_exists($result, 'results') && property_exists($result->results[0], 'permissions'))
         {
             
@@ -171,8 +172,7 @@ 
             if (property_exists($result,'status'))
             {
                 $message=$result->status;
-            }
-            else 
+            } else 
             {
                 $message="Unkown status";
             }
@@ -183,8 +183,7 @@ 
             if (isset($result->results[0]))
             {
                 return array(true,'code '.$result->results[0]->code.' : '.$result->results[0]->status);
-            }
-            else
+            } else
             {
                 return array(false,'Service not found');
             }
@@ -226,8 +225,7 @@ 
             if (property_exists($result,'status'))
             {
                 throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
+            } else
             {
                 throw new Exception('Ret code ' .$result->error.' : Unkown status');
             }
@@ -272,8 +270,7 @@ 
             if (property_exists($result,'status'))
             {
                 throw new Exception('Ret code ' .$result->error.' : ' . $result->status);
-            }
-            else
+            } else
             {
                 throw new Exception('Ret code ' .$result->error.' : Unkown status');
             }

library/Trapdirector/TrapsProcess/TrapConfig.php

Braces +8 added lines, -6 removed lines

@@ -40,8 +40,7 @@ 
             }
             $this->getLogging()->log($message,$log_level);
             return false;
-        }
-        else
+        } else
         {
             $option_var=$option_array[$option_category][$option_name];
             return true;
@@ -54,9 +53,11 @@ 
     protected function getDatabaseOptions()
     {
         // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
+        if ($this->logSetup === false) {
+        	// Only if logging was no setup in constructor
         {
             $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
+        }
             $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
             $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
         }
@@ -69,7 +70,9 @@ 
     protected function getDBConfigIfSet($element,&$variable)
     {
         $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
+        if ($value != null) {
+        	$variable=$value;
+        }
     }
     
     /**
@@ -106,8 +109,7 @@ 
         {
             $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
             $this->getTrapApi()->setStatusMaster();
-        }
-        else 
+        } else 
         {
             if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
             {

Indentation +160 added lines, -160 removed lines

@@ -15,184 +15,184 @@
 trait TrapConfig
 {
 
-    /** @return \Trapdirector\Logging   */
-    abstract public function getLogging();
-    /** @return \Trapdirector\TrapApi   */
-    abstract public function getTrapApi();
+	/** @return \Trapdirector\Logging   */
+	abstract public function getLogging();
+	/** @return \Trapdirector\TrapApi   */
+	abstract public function getTrapApi();
     
-    /**
-     * Get option from array of ini file, send message if empty
-     * @param string $option_array Array of ini file
-     * @param string $option_category category in ini file
-     * @param string $option_name name of option in category
-     * @param mixed $option_var variable to fill if found, left untouched if not found
-     * @param integer $log_level default 2 (warning)
-     * @param string $message warning message if not found
-     * @return boolean true if found, or false
-     */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
-    {
-        if (!isset($option_array[$option_category][$option_name]))
-        {
-            if ($message === null)
-            {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
-            }
-            $this->getLogging()->log($message,$log_level);
-            return false;
-        }
-        else
-        {
-            $option_var=$option_array[$option_category][$option_name];
-            return true;
-        }
-    }
+	/**
+	 * Get option from array of ini file, send message if empty
+	 * @param string $option_array Array of ini file
+	 * @param string $option_category category in ini file
+	 * @param string $option_name name of option in category
+	 * @param mixed $option_var variable to fill if found, left untouched if not found
+	 * @param integer $log_level default 2 (warning)
+	 * @param string $message warning message if not found
+	 * @return boolean true if found, or false
+	 */
+	protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
+	{
+		if (!isset($option_array[$option_category][$option_name]))
+		{
+			if ($message === null)
+			{
+				$message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+			}
+			$this->getLogging()->log($message,$log_level);
+			return false;
+		}
+		else
+		{
+			$option_var=$option_array[$option_category][$option_name];
+			return true;
+		}
+	}
 
-    /**
-     * Get options in database
-     */
-    protected function getDatabaseOptions()
-    {
-        // Database options
-        if ($this->logSetup === false) // Only if logging was no setup in constructor
-        {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
-        }
-    }
+	/**
+	 * Get options in database
+	 */
+	protected function getDatabaseOptions()
+	{
+		// Database options
+		if ($this->logSetup === false) // Only if logging was no setup in constructor
+		{
+			$this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
+			$this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
+			$this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+		}
+	}
         
-    /** Set $variable to value if $element found in database config table
-     * @param string $element
-     * @param string $variable
-     */
-    protected function getDBConfigIfSet($element,&$variable)
-    {
-        $value=$this->getDBConfig($element);
-        if ($value != null) $variable=$value;
-    }
+	/** Set $variable to value if $element found in database config table
+	 * @param string $element
+	 * @param string $variable
+	 */
+	protected function getDBConfigIfSet($element,&$variable)
+	{
+		$value=$this->getDBConfig($element);
+		if ($value != null) $variable=$value;
+	}
     
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    protected function getDBConfig($element)  // TODO : put this in DB class
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	protected function getDBConfig($element)  // TODO : put this in DB class
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
     
-    /**
-     * Get options from ini file
-     * @param array $trap_config : ini file array
-     */
-    protected function getMainOptions($trapConfig)
-    {
+	/**
+	 * Get options from ini file
+	 * @param array $trap_config : ini file array
+	 */
+	protected function getMainOptions($trapConfig)
+	{
         
-        $nodeStatus='';
-        $this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
-        if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
-        {
-            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
-            $this->getTrapApi()->setStatusMaster();
-        }
-        else 
-        {
-            if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
-            {
-                // Get options to connect to API
-                $IP = $port = $user =  $pass = null;
-                $this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
-                $this->getTrapApi()->setParams($IP, $port, $user, $pass);
-                return;
-            }
-        }
+		$nodeStatus='';
+		$this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
+		if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
+		{
+			$this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
+			$this->getTrapApi()->setStatusMaster();
+		}
+		else 
+		{
+			if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
+			{
+				// Get options to connect to API
+				$IP = $port = $user =  $pass = null;
+				$this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
+				$this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
+				$this->getTrapApi()->setParams($IP, $port, $user, $pass);
+				return;
+			}
+		}
         
-        // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+		// Snmptranslate binary path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
         
-        // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+		// mibs path
+		$this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
         
-        // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+		// icinga2cmd path
+		$this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
         
-        // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+		// table prefix
+		$this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
         
-        // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
-        {
-            $this->apiUse=true;
-            // Get API options or throw exception as not configured correctly
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
-        }
-    }
+		// API options
+		if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+		{
+			$this->apiUse=true;
+			// Get API options or throw exception as not configured correctly
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
+			$this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
+		}
+	}
     
-    /**
-     * Create and setup database class for trap & ido (if no api) db
-     * @param array $trap_config : ini file array
-     */
-    protected function setupDatabase($trapConfig)
-    {
-        // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
-        {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
-            return;
-        }
-        $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+	/**
+	 * Create and setup database class for trap & ido (if no api) db
+	 * @param array $trap_config : ini file array
+	 */
+	protected function setupDatabase($trapConfig)
+	{
+		// Trap database
+		if (!array_key_exists('database',$trapConfig['config']))
+		{
+			$this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+			return;
+		}
+		$dbTrapName=$trapConfig['config']['database'];
+		$this->logging->log("Found database in config file: ".$dbTrapName,INFO );
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
-        {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
-        if (!array_key_exists($dbTrapName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
+		if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+		{
+			$this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
+		if (!array_key_exists($dbTrapName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+		$this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
         
-        $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
+		$this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
         
-        //TODO enable this again when API queries are all done :
-        //if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
+		//TODO enable this again when API queries are all done :
+		//if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
         
-        // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
-        {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
-        }
-        $dbIdoName=$trapConfig['config']['IDOdatabase'];
+		// IDO Database
+		if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+		{
+			$this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+		}
+		$dbIdoName=$trapConfig['config']['IDOdatabase'];
         
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
-        {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
-            return;
-        }
+		$this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
+		if (!array_key_exists($dbIdoName,$dbConfig))
+		{
+			$this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+			return;
+		}
         
-        $this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
-    }
+		$this->trapsDB->setupIDO($dbConfig[$dbIdoName]);
+	}
     
 }
\ No newline at end of file

Spacing +37 added lines, -37 removed lines

@@ -30,15 +30,15 @@ 
      * @param string $message warning message if not found
      * @return boolean true if found, or false
      */
-    protected function getOptionIfSet($option_array,$option_category,$option_name, &$option_var, $log_level = WARN, $message = null)
+    protected function getOptionIfSet($option_array, $option_category, $option_name, &$option_var, $log_level=WARN, $message=null)
     {
         if (!isset($option_array[$option_category][$option_name]))
         {
             if ($message === null)
             {
-                $message='No ' . $option_name . ' in config file: '. $this->trapModuleConfig;
+                $message='No '.$option_name.' in config file: '.$this->trapModuleConfig;
             }
-            $this->getLogging()->log($message,$log_level);
+            $this->getLogging()->log($message, $log_level);
             return false;
         }
         else
@@ -56,9 +56,9 @@ 
         // Database options
         if ($this->logSetup === false) // Only if logging was no setup in constructor
         {
-            $this->getDBConfigIfSet('log_level',$this->getLogging()->debugLevel);
-            $this->getDBConfigIfSet('log_destination',$this->getLogging()->outputMode);
-            $this->getDBConfigIfSet('log_file',$this->getLogging()->outputFile);
+            $this->getDBConfigIfSet('log_level', $this->getLogging()->debugLevel);
+            $this->getDBConfigIfSet('log_destination', $this->getLogging()->outputMode);
+            $this->getDBConfigIfSet('log_file', $this->getLogging()->outputFile);
         }
     }
         
@@ -66,7 +66,7 @@ 
      * @param string $element
      * @param string $variable
      */
-    protected function getDBConfigIfSet($element,&$variable)
+    protected function getDBConfigIfSet($element, &$variable)
     {
         $value=$this->getDBConfig($element);
         if ($value != null) $variable=$value;
@@ -82,7 +82,7 @@ 
         $db_conn=$this->trapsDB->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -101,10 +101,10 @@ 
     {
         
         $nodeStatus='';
-        $this->getOptionIfSet($trapConfig,'config','node', $nodeStatus);
+        $this->getOptionIfSet($trapConfig, 'config', 'node', $nodeStatus);
         if ($this->getTrapApi()->setStatus($nodeStatus) === FALSE)
         {
-            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER',WARN);
+            $this->getLogging()->log('Unknown node status '.$nodeStatus.' : setting to MASTER', WARN);
             $this->getTrapApi()->setStatusMaster();
         }
         else 
@@ -112,36 +112,36 @@ 
             if ($this->getTrapApi()->getStatus() != TrapApi::MASTER)
             {
                 // Get options to connect to API
-                $IP = $port = $user =  $pass = null;
-                $this->getOptionIfSet($trapConfig,'config','masterIP', $IP, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPort', $port, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterUser', $user, ERROR);
-                $this->getOptionIfSet($trapConfig,'config','masterPass', $pass, ERROR);
+                $IP=$port=$user=$pass=null;
+                $this->getOptionIfSet($trapConfig, 'config', 'masterIP', $IP, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterPort', $port, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterUser', $user, ERROR);
+                $this->getOptionIfSet($trapConfig, 'config', 'masterPass', $pass, ERROR);
                 $this->getTrapApi()->setParams($IP, $port, $user, $pass);
                 return;
             }
         }
         
         // Snmptranslate binary path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate', $this->snmptranslate);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate', $this->snmptranslate);
         
         // mibs path
-        $this->getOptionIfSet($trapConfig,'config','snmptranslate_dirs', $this->snmptranslate_dirs);
+        $this->getOptionIfSet($trapConfig, 'config', 'snmptranslate_dirs', $this->snmptranslate_dirs);
         
         // icinga2cmd path
-        $this->getOptionIfSet($trapConfig,'config','icingacmd', $this->icinga2cmd);
+        $this->getOptionIfSet($trapConfig, 'config', 'icingacmd', $this->icinga2cmd);
         
         // table prefix
-        $this->getOptionIfSet($trapConfig,'config','database_prefix', $this->dbPrefix);
+        $this->getOptionIfSet($trapConfig, 'config', 'database_prefix', $this->dbPrefix);
         
         // API options
-        if ($this->getOptionIfSet($trapConfig,'config','icingaAPI_host', $this->apiHostname))
+        if ($this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_host', $this->apiHostname))
         {
             $this->apiUse=true;
             // Get API options or throw exception as not configured correctly
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_port', $this->apiPort,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_user', $this->apiUsername,ERROR);
-            $this->getOptionIfSet($trapConfig,'config','icingaAPI_password', $this->apiPassword,ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_port', $this->apiPort, ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_user', $this->apiUsername, ERROR);
+            $this->getOptionIfSet($trapConfig, 'config', 'icingaAPI_password', $this->apiPassword, ERROR);
         }
     }
     
@@ -152,43 +152,43 @@ 
     protected function setupDatabase($trapConfig)
     {
         // Trap database
-        if (!array_key_exists('database',$trapConfig['config']))
+        if (!array_key_exists('database', $trapConfig['config']))
         {
-            $this->logging->log("No database in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No database in config file: ".$this->trapModuleConfig, ERROR, '');
             return;
         }
         $dbTrapName=$trapConfig['config']['database'];
-        $this->logging->log("Found database in config file: ".$dbTrapName,INFO );
+        $this->logging->log("Found database in config file: ".$dbTrapName, INFO);
         
-        if ( ($dbConfig=parse_ini_file($this->icingaweb2Ressources,true)) === false)
+        if (($dbConfig=parse_ini_file($this->icingaweb2Ressources, true)) === false)
         {
-            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("Error reading ini file : ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
-        if (!array_key_exists($dbTrapName,$dbConfig))
+        if (!array_key_exists($dbTrapName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbTrapName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         
-        $this->trapsDB = new Database($this->logging,$dbConfig[$dbTrapName],$this->dbPrefix);
+        $this->trapsDB=new Database($this->logging, $dbConfig[$dbTrapName], $this->dbPrefix);
         
-        $this->logging->log("API Use : ".print_r($this->apiUse,true),DEBUG );
+        $this->logging->log("API Use : ".print_r($this->apiUse, true), DEBUG);
         
         //TODO enable this again when API queries are all done :
         //if ($this->apiUse === true) return; // In case of API use, no IDO is necessary
         
         // IDO Database
-        if (!array_key_exists('IDOdatabase',$trapConfig['config']))
+        if (!array_key_exists('IDOdatabase', $trapConfig['config']))
         {
-            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig,ERROR,'');
+            $this->logging->log("No IDOdatabase in config file: ".$this->trapModuleConfig, ERROR, '');
         }
         $dbIdoName=$trapConfig['config']['IDOdatabase'];
         
-        $this->logging->log("Found IDO database in config file: ".$dbIdoName,INFO );
-        if (!array_key_exists($dbIdoName,$dbConfig))
+        $this->logging->log("Found IDO database in config file: ".$dbIdoName, INFO);
+        if (!array_key_exists($dbIdoName, $dbConfig))
         {
-            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources,ERROR,'');
+            $this->logging->log("No database '.$dbIdoName.' in config file: ".$this->icingaweb2Ressources, ERROR, '');
             return;
         }
         

library/Trapdirector/Config/TrapModuleConfig.php

Indentation +17 added lines, -17 removed lines

@@ -4,16 +4,16 @@ 
 
 class TrapModuleConfig
 {
-    /********** Database configuration ***********************/
+	/********** Database configuration ***********************/
 	// Database prefix for tables 
-    protected $table_prefix; //< Database prefix for tables 	
+	protected $table_prefix; //< Database prefix for tables 	
 	protected $DBConfigDefaults=array(
 		'db_remove_days' => 60, // number of days before removing traps
 		'log_destination' => 'syslog', // Log destination for trap handler
 		'log_file' => '/tmp/trapdirector.log', // Log file
 		'log_level' => 2, // log level
 		'use_SnmpTrapAddess' => 1, // use SnmpTrapAddress by default
-	    'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
+		'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
 	);
 	// get default values for dbconfig
 	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
@@ -120,27 +120,27 @@ 
 	// Note : must have 'source_ip' and 'last_sent'
 	public function getTrapHostListDisplayColumns()
 	{
-	    return array(
-	        'source_name'  =>  't.source_name',
-	        'source_ip'    =>  't.source_ip',
-	        'trap_oid'     =>  't.trap_oid',
-	        'count'        =>  'count(*)',
-	        'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
-	    );
+		return array(
+			'source_name'  =>  't.source_name',
+			'source_ip'    =>  't.source_ip',
+			'trap_oid'     =>  't.trap_oid',
+			'count'        =>  'count(*)',
+			'last_sent'    =>  'UNIX_TIMESTAMP(max(t.date_received))'
+		);
 	}
 
 	public function getTrapHostListSearchColumns()
 	{
-	    return array(); // No search needed on this table
+		return array(); // No search needed on this table
 	}
 	// Titles display in Trap List table
 	public function getTrapHostListTitles()
 	{
-	    return array(
-	        'trap_oid'		=> 'Trap OID',
-	        'count'		    => 'Number of traps received',
-	        'last_sent'     => 'Last trap received'
-	    );
+		return array(
+			'trap_oid'		=> 'Trap OID',
+			'count'		    => 'Number of traps received',
+			'last_sent'     => 'Last trap received'
+		);
 	}
 	
 	
@@ -195,7 +195,7 @@ 
 			'revert_ok'		=> 'r.revert_ok',
 			'display'		=> 'r.display',
 			'modified'		=> 'UNIX_TIMESTAMP(r.modified)',
-            'modifier'		=> 'r.modifier'
+			'modifier'		=> 'r.modifier'
 		);
 	}	
 		

Spacing +31 added lines, -31 removed lines

@@ -16,27 +16,27 @@ 
 	    'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	/** Minimum DB version
 	 * @return number
 	 */
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	/** Current DB version
 	 * @return number
 	 */
-	static public function getDbCurVersion() { return 2;}
+	static public function getDbCurVersion() { return 2; }
 
 	/************ Module configuration **********************/
 	// Module base path
 	static public function urlPath() { return 'trapdirector'; }
-	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service" , "actions/process-check-result"); } //< api user permissions required
+	static public function getapiUserPermissions() { return array("status", "objects/query/Host", "objects/query/Service", "actions/process-check-result"); } //< api user permissions required
 	
 	
 	/*********** Log configuration *************************/
 	protected $logLevels=array(0=>'No output', 1=>'critical', 2=>'warning', 3=>'trace', 4=>'ALL');
-	public function getlogLevels() { return $this->logLevels;}
-	protected $logDestinations=array('syslog'=>'syslog','file'=>'file','display'=>'display');
-	public function getLogDestinations() { return $this->logDestinations;}
+	public function getlogLevels() { return $this->logLevels; }
+	protected $logDestinations=array('syslog'=>'syslog', 'file'=>'file', 'display'=>'display');
+	public function getLogDestinations() { return $this->logDestinations; }
 	
 	function __construct($prefix)
 	{
@@ -47,29 +47,29 @@ 
 	// DB table name of trap received list : prefix 't'
 	public function getTrapTableName() 
 	{ 
-		return array('t' => $this->table_prefix . 'received'); 
+		return array('t' => $this->table_prefix.'received'); 
 	}
 	// DB table name of trap data  list : prefix 'd'
 	public function getTrapDataTableName() 
 	{ 
-		return array('d' => $this->table_prefix . 'received_data'); 
+		return array('d' => $this->table_prefix.'received_data'); 
 	}	
 
 	// DB table name of rules : prefix 'r'
 	public function getTrapRuleName() 
 	{ 
-		return array('r' => $this->table_prefix . 'rules'); 
+		return array('r' => $this->table_prefix.'rules'); 
 	}		
 	
 	// DB table name of db config : prefix 'c'
 	public function getDbConfigTableName() 
 	{ 
-		return array('c' => $this->table_prefix . 'db_config');
+		return array('c' => $this->table_prefix.'db_config');
 	}
 	
 	// Mib cache tables
-	public function getMIBCacheTableName() { return $this->table_prefix . 'mib_cache'; }
-	public function getMIBCacheTableTrapObjName() { return $this->table_prefix . 'mib_cache_trap_object'; }
+	public function getMIBCacheTableName() { return $this->table_prefix.'mib_cache'; }
+	public function getMIBCacheTableTrapObjName() { return $this->table_prefix.'mib_cache_trap_object'; }
 	
 	
 	/****************** Database queries *******************/
@@ -150,7 +150,7 @@ 
 	public function getHandlerListDisplayColumns()
 	{
 		return array(
-			'host_name'		=> 'r.host_name',//'UNIX_TIMESTAMP(t.date_received)',
+			'host_name'		=> 'r.host_name', //'UNIX_TIMESTAMP(t.date_received)',
 			'host_group_name'=> 'r.host_group_name',
 			'source_ip'		=> "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END",
 			'trap_oid'		=> 'r.trap_oid',
@@ -203,32 +203,32 @@ 
 	public function trapDetailQuery()
 	{
 		return array(
-			'timestamp'			=> array('Date','UNIX_TIMESTAMP(t.date_received)'),
-			'source_ip'			=> array('Source IP','t.source_ip'),
-			'source_name'		=> array('Source name','t.source_name'),
-			'source_port'		=> array('Source port','t.source_port'),
-			'destination_ip'	=> array('Destination IP','t.destination_ip'),
-			'destination_port'	=> array('Destination port','t.destination_port'),			
-			'trap_oid'			=> array('Numeric OID','t.trap_oid'),
-			'trap_name'			=> array('Trap name','t.trap_name'),
-			'trap_name_mib'		=> array('Trap MIB','t.trap_name_mib'),
-			'status'			=> array('Processing status','t.status'),
-			'status_detail'		=> array('Status details','t.status_detail'),
-			'process_time'		=> array('Trap processing time','t.process_time'),			
+			'timestamp'			=> array('Date', 'UNIX_TIMESTAMP(t.date_received)'),
+			'source_ip'			=> array('Source IP', 't.source_ip'),
+			'source_name'		=> array('Source name', 't.source_name'),
+			'source_port'		=> array('Source port', 't.source_port'),
+			'destination_ip'	=> array('Destination IP', 't.destination_ip'),
+			'destination_port'	=> array('Destination port', 't.destination_port'),			
+			'trap_oid'			=> array('Numeric OID', 't.trap_oid'),
+			'trap_name'			=> array('Trap name', 't.trap_name'),
+			'trap_name_mib'		=> array('Trap MIB', 't.trap_name_mib'),
+			'status'			=> array('Processing status', 't.status'),
+			'status_detail'		=> array('Status details', 't.status_detail'),
+			'process_time'		=> array('Trap processing time', 't.process_time'),			
 		);
 	}
 	// Trap detail : additional data (<key> => <title> <sql select>)
 	public function trapDataDetailQuery()
 	{
 		return array(
-			'oid'				=> array('Numeric OID','d.oid'),
-			'oid_name'			=> array('Text OID','d.oid_name'),
-			'oid_name_mib'		=> array('MIB','d.oid_name_mib'),
-			'value'				=> array('Value','d.value'),
+			'oid'				=> array('Numeric OID', 'd.oid'),
+			'oid_name'			=> array('Text OID', 'd.oid_name'),
+			'oid_name_mib'		=> array('MIB', 'd.oid_name_mib'),
+			'value'				=> array('Value', 'd.value'),
 		);
 	}
 	// foreign key of trap data table
-	public function trapDataFK() { return 'trap_id';}
+	public function trapDataFK() { return 'trap_id'; }
 	
 	// Max items in a list
 	public function itemListDisplay() { return 25; }

application/controllers/StatusController.php

Indentation +93 added lines, -93 removed lines

@@ -21,8 +21,8 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+			$dbConn = $this->getUIDatabase()->getDbConn();
+			if ($dbConn === null) throw new \ErrorException('uncatched db error');
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -51,7 +51,7 @@ 
 		
 		try
 		{		
-		    $this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
+			$this->view->currentLogDestination=$this->getUIDatabase()->getDBConfigValue('log_destination');
 			$this->view->logDestinations=$this->getModuleConfig()->getLogDestinations();
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
@@ -65,23 +65,23 @@ 
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
-		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+			$this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+			$this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
+			$this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status',$e->getMessage());
 		}		
 		
 	} 
   
 	/** Mib management
-	*	Post param : action=update_mib_db : update mib database
-	*	Post param : ation=check_update : check if mib update is finished
-	*	File post : mibfile -> save mib file
-	*/
+	 *	Post param : action=update_mib_db : update mib database
+	 *	Post param : ation=check_update : check if mib update is finished
+	 *	File post : mibfile -> save mib file
+	 */
 	public function mibAction()
 	{
 		$this->prepareTabs()->activate('mib');
@@ -100,22 +100,22 @@ 
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
 					if (preg_match('/OK/',$return))
 					{
-					    $this->_helper->json(array('status'=>'OK'));
+						$this->_helper->json(array('status'=>'OK'));
 					}
 					// Error
 					$this->_helper->json(array('status'=>$return));
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
-				    if ($file == false)
-				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
-				        return;
-				    }
-				    $pid=fgets($file);
-				    $output=array();
-				    $retVal=0;
+					$file=@fopen('/tmp/trapdirector_update.pid','r');
+					if ($file == false)
+					{   // process is dead
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+						return;
+					}
+					$pid=fgets($file);
+					$output=array();
+					$retVal=0;
 					exec('ps '.$pid,$output,$retVal);
 					if ($retVal == 0)
 					{ // process is alive
@@ -123,7 +123,7 @@ 
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+						$this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
 				}
 				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
@@ -131,32 +131,32 @@ 
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
+				$name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
 				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
-				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
+					$this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
 				}
 				else
 				{
-				    if (!is_writable($destDir))
-				    {
-				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
-				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
-    				    {
-    				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
-    				    {
-    				        $this->view->uploadStatus="File $name uploaded in $destDir";
-    				    }
-				    }
+					if (!is_writable($destDir))
+					{
+						$this->view->uploadStatus="ERROR : $destDir directory is not writable";
+					}
+					else
+					{
+						$destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+						$sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
+						if (move_uploaded_file($sourceTmpNam,$destination)===false)
+						{
+							$this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
+						}
+						else
+						{
+							$this->view->uploadStatus="File $name uploaded in $destDir";
+						}
+					}
 				}
 
 			}
@@ -276,47 +276,47 @@ 
 	 */
 	public function pluginsAction()
 	{
-	    $this->prepareTabs()->activate('plugins');
+		$this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+		require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+		$Trap = new Trap($icingaweb2_etc,4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+		$this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+		$enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+		$pluginList = $Trap->pluginClass->pluginList();
 	    
-	    // Plugin list and fill function name list
-	    $functionList=array();
-	    $this->view->pluginArray=array();
-	    foreach ($pluginList as $plugin)
-	    {
-	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
-	        array_push($this->view->pluginArray, $pluginDetails);
-	        // Get functions for function details
-	        foreach ($pluginDetails->funcArray as $function)
-	        {
-	            array_push($functionList,$function);
-	        }
-	    }
+		// Plugin list and fill function name list
+		$functionList=array();
+		$this->view->pluginArray=array();
+		foreach ($pluginList as $plugin)
+		{
+			$pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
+			$pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
+			$pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
+			$pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
+			$pluginDetails->description = htmlentities($pluginDetails->description);
+			$pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+			array_push($this->view->pluginArray, $pluginDetails);
+			// Get functions for function details
+			foreach ($pluginDetails->funcArray as $function)
+			{
+				array_push($functionList,$function);
+			}
+		}
 	    
-	    // Function list with details
-	    $this->view->functionList=array();
-	    foreach ($functionList as $function)
-	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
-	        array_push($this->view->functionList, $functionDetail);
-	    }
+		// Function list with details
+		$this->view->functionList=array();
+		foreach ($functionList as $function)
+		{
+			$functionDetail = $Trap->pluginClass->getFunctionDetails($function);
+			$functionDetail->params = htmlentities($functionDetail->params);
+			$functionDetail->description = htmlentities($functionDetail->description);
+			$functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+			array_push($this->view->functionList, $functionDetail);
+		}
 
 	}
 	
@@ -331,30 +331,30 @@ 
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
-	    )->add('plugins', array(
-	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
-	    );
+		)->add('plugins', array(
+			'label' => $this->translate('Plugins management'),
+			'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+		);
 	} 
 }
 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
-    {
-        parent::__construct($options);
-        $this->addElements2();
-    }
+	public function __construct($options = null) 
+	{
+		parent::__construct($options);
+		$this->addElements2();
+	}
 
-    public function addElements2()
-    {
-        // File Input
-        $file = new File('mib-file');
-        $file->setLabel('Mib upload');
-             //->setAttrib('multiple', null);
-        $this->addElement($file);
+	public function addElements2()
+	{
+		// File Input
+		$file = new File('mib-file');
+		$file->setLabel('Mib upload');
+			 //->setAttrib('multiple', null);
+		$this->addElement($file);
 		$button = new Submit("upload",array('ignore'=>false));
 		$this->addElement($button);//->setIgnore(false);
-    }
+	}
 }

Spacing +66 added lines, -66 removed lines

@@ -21,19 +21,19 @@ 
 		/************  Trapdb ***********/
 		try
 		{
-		    $dbConn = $this->getUIDatabase()->getDbConn();
+		    $dbConn=$this->getUIDatabase()->getDbConn();
 		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapDataTableName(),
 				array('COUNT(*)')
 			);			
 			$this->view->trap_object_count=$dbConn->fetchOne($query);
-			$query = $dbConn->select()->from(
+			$query=$dbConn->select()->from(
 				$this->getModuleConfig()->getTrapRuleName(),
 				array('COUNT(*)')
 			);			
@@ -44,7 +44,7 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** Log destination *******************/
@@ -59,20 +59,20 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('status',$e->getMessage());
+			$this->displayExitError('status', $e->getMessage());
 		}
 		
 		/*************** SNMP configuration ****************/
 		try
 		{
-		    $this->view->useSnmpTrapAddess= ( $this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1 ) ? TRUE : FALSE;
+		    $this->view->useSnmpTrapAddess=($this->getUIDatabase()->getDBConfigValue('use_SnmpTrapAddess') == 1) ? TRUE : FALSE;
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
-		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
+		    $this->view->SnmpTrapAddressOIDDefault=($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid']) ? TRUE : FALSE;
 		    
 		}
 		catch (Exception $e)
 		{
-		    $this->displayExitError('status',$e->getMessage());
+		    $this->displayExitError('status', $e->getMessage());
 		}		
 		
 	} 
@@ -98,7 +98,7 @@ 
 				if ($action == 'update_mib_db')
 				{ // Do the update in background
 					$return=exec('icingacli trapdirector mib update --pid /tmp/trapdirector_update.pid');
-					if (preg_match('/OK/',$return))
+					if (preg_match('/OK/', $return))
 					{
 					    $this->_helper->json(array('status'=>'OK'));
 					}
@@ -107,32 +107,32 @@ 
 				}
 				if ($action == 'check_update')
 				{
-				    $file=@fopen('/tmp/trapdirector_update.pid','r');
+				    $file=@fopen('/tmp/trapdirector_update.pid', 'r');
 				    if ($file == false)
 				    {   // process is dead
-				        $this->_helper->json(array('status'=>'tu quoque fili','err'=>'Cannot open file'));
+				        $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'Cannot open file'));
 				        return;
 				    }
 				    $pid=fgets($file);
 				    $output=array();
 				    $retVal=0;
-					exec('ps '.$pid,$output,$retVal);
+					exec('ps '.$pid, $output, $retVal);
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
 					}
 					else
 					{ // process is dead
-					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
+					    $this->_helper->json(array('status'=>'tu quoque fili', 'err'=>'no proc'.$pid));
 					}
 				}
-				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible' ));
+				$this->_helper->json(array('status'=>'ERR : no '.$action.' action possible'));
 			}
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
-				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
+			    $name=filter_var($_FILES['mibfile']['name'], FILTER_SANITIZE_STRING);
+				$DirConf=explode(':', $this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
 				{
@@ -146,9 +146,9 @@ 
 				    }
 				    else
 				    {
-				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
-				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
+				        $destination=$destDir.'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
+				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'], FILTER_SANITIZE_STRING);
+				        if (move_uploaded_file($sourceTmpNam, $destination) === false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
     				    }
@@ -164,13 +164,13 @@ 
 		}
 		
 		// snmptranslate tests
-		$snmptranslate = $this->Config()->get('config', 'snmptranslate');
+		$snmptranslate=$this->Config()->get('config', 'snmptranslate');
 		$this->view->snmptranslate_bin=$snmptranslate;
 		$this->view->snmptranslate_state='warn';
-		if (is_executable ( $snmptranslate ))
+		if (is_executable($snmptranslate))
 		{
-			$translate=exec($snmptranslate . ' 1');
-			if (preg_match('/iso/',$translate))
+			$translate=exec($snmptranslate.' 1');
+			if (preg_match('/iso/', $translate))
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
@@ -188,46 +188,46 @@ 
 		// mib database
 		
 		$this->view->mibDbCount=$this->getMIB()->countObjects();
-		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null,21);
+		$this->view->mibDbCountTrap=$this->getMIB()->countObjects(null, 21);
 		
 		// mib dirs
 		$DirConf=$this->Config()->get('config', 'snmptranslate_dirs');
-		$dirArray=explode(':',$DirConf);
+		$dirArray=explode(':', $DirConf);
 
 		// Get base directories from net-snmp-config
 		$output=$matches=array();
 		$retVal=0;
-		$sysDirs=exec('net-snmp-config --default-mibdirs',$output,$retVal);
-		if ($retVal==0)
+		$sysDirs=exec('net-snmp-config --default-mibdirs', $output, $retVal);
+		if ($retVal == 0)
 		{
-			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
+			$dirArray=array_merge($dirArray, explode(':', $sysDirs));
 		}
 		else
 		{
-			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
-			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
+			$translateOut=exec($this->Config()->get('config', 'snmptranslate').' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
+			if (preg_match('/MIBDIRS.*\'([^\']+)\'/', $translateOut, $matches))
 			{
-				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
+				$dirArray=array_merge($dirArray, explode(':', $matches[1]));
 			}
 			else
 			{
-				array_push($dirArray,'Install net-snmp-config to see system directories');
+				array_push($dirArray, 'Install net-snmp-config to see system directories');
 			}
 		}
 		
 		$this->view->dirArray=$dirArray;
 		
 		$output=null;
-		foreach (explode(':',$DirConf) as $mibdir)
+		foreach (explode(':', $DirConf) as $mibdir)
 		{
-			exec('ls '.$mibdir.' | grep -v traplist.txt',$output);
+			exec('ls '.$mibdir.' | grep -v traplist.txt', $output);
 		}
 		//$i=0;$listFiles='';while (isset($output[$i])) $listFiles.=$output[$i++];
 		//$this->view->fileList=explode(' ',$listFiles);
 		$this->view->fileList=$output;
 		
 		// Zend form 
-		$this->view->form= new UploadForm();
+		$this->view->form=new UploadForm();
 		//$this->view->form= new Form('upload-form');
 		
 		
@@ -251,18 +251,18 @@ 
 		$this->view->templateForm_output='';
 		if (isset($postData['template_name']) && isset($postData['template_revert_time']))
 		{
-			$template_create = 'icingacli director service create --json \'{ "check_command": "dummy", ';
-			$template_create .= '"check_interval": "' .$postData['template_revert_time']. '", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
-			$template_create .= '"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
+			$template_create='icingacli director service create --json \'{ "check_command": "dummy", ';
+			$template_create.='"check_interval": "'.$postData['template_revert_time'].'", "check_timeout": "20", "disabled": false, "enable_active_checks": true, "enable_event_handler": true, "enable_notifications": true, "enable_passive_checks": true, "enable_perfdata": true, "max_check_attempts": "1", ';
+			$template_create.='"object_name": "'.$postData['template_name'].'", "object_type": "template", "retry_interval": "'.$postData['template_revert_time'].'"}\'';
 			$output=array();
 			$ret_code=0;
-			exec($template_create,$output,$ret_code);
+			exec($template_create, $output, $ret_code);
 			if ($ret_code != 0)
 			{
-				$this->displayExitError("Status -> Services","Error creating template : ".$output[0].'<br>Command was : '.$template_create);
+				$this->displayExitError("Status -> Services", "Error creating template : ".$output[0].'<br>Command was : '.$template_create);
 			}
-			exec('icingacli director config deploy',$output,$ret_code);
-			$this->view->templateForm_output='Template '.$postData['template_name']. ' created';
+			exec('icingacli director config deploy', $output, $ret_code);
+			$this->view->templateForm_output='Template '.$postData['template_name'].' created';
 		}
 		
 		// template creation form
@@ -278,15 +278,15 @@ 
 	{
 	    $this->prepareTabs()->activate('plugins');
 	    
-	    require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	    require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	    $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	    $Trap = new Trap($icingaweb2_etc,4);
+	    $Trap=new Trap($icingaweb2_etc, 4);
 	    
-	    $this->view->pluginLoaded = htmlentities($Trap->pluginClass->registerAllPlugins(false));
+	    $this->view->pluginLoaded=htmlentities($Trap->pluginClass->registerAllPlugins(false));
 	    
-	    $enabledPlugins = $Trap->pluginClass->getEnabledPlugins();
+	    $enabledPlugins=$Trap->pluginClass->getEnabledPlugins();
 
-	    $pluginList = $Trap->pluginClass->pluginList();
+	    $pluginList=$Trap->pluginClass->pluginList();
 	    
 	    // Plugin list and fill function name list
 	    $functionList=array();
@@ -294,16 +294,16 @@ 
 	    foreach ($pluginList as $plugin)
 	    {
 	        $pluginDetails=$Trap->pluginClass->pluginDetails($plugin);
-	        $pluginDetails->enabled =  (in_array($plugin, $enabledPlugins)) ? true : false;
-	        $pluginDetails->catchAllTraps = ($pluginDetails->catchAllTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->processTraps = ($pluginDetails->processTraps === true )? 'Yes' : 'No';
-	        $pluginDetails->description = htmlentities($pluginDetails->description);
-	        $pluginDetails->description = preg_replace('/\n/','<br>',$pluginDetails->description);
+	        $pluginDetails->enabled=(in_array($plugin, $enabledPlugins)) ? true : false;
+	        $pluginDetails->catchAllTraps=($pluginDetails->catchAllTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->processTraps=($pluginDetails->processTraps === true) ? 'Yes' : 'No';
+	        $pluginDetails->description=htmlentities($pluginDetails->description);
+	        $pluginDetails->description=preg_replace('/\n/', '<br>', $pluginDetails->description);
 	        array_push($this->view->pluginArray, $pluginDetails);
 	        // Get functions for function details
 	        foreach ($pluginDetails->funcArray as $function)
 	        {
-	            array_push($functionList,$function);
+	            array_push($functionList, $function);
 	        }
 	    }
 	    
@@ -311,10 +311,10 @@ 
 	    $this->view->functionList=array();
 	    foreach ($functionList as $function)
 	    {
-	        $functionDetail = $Trap->pluginClass->getFunctionDetails($function);
-	        $functionDetail->params = htmlentities($functionDetail->params);
-	        $functionDetail->description = htmlentities($functionDetail->description);
-	        $functionDetail->description = preg_replace('/\n/','<br>',$functionDetail->description);
+	        $functionDetail=$Trap->pluginClass->getFunctionDetails($function);
+	        $functionDetail->params=htmlentities($functionDetail->params);
+	        $functionDetail->description=htmlentities($functionDetail->description);
+	        $functionDetail->description=preg_replace('/\n/', '<br>', $functionDetail->description);
 	        array_push($this->view->functionList, $functionDetail);
 	    }
 
@@ -324,16 +324,16 @@ 
 	{
 		return $this->getTabs()->add('status', array(
 			'label' => $this->translate('Status'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status')
+			'url'   => $this->getModuleConfig()->urlPath().'/status')
 		)->add('mib', array(
 			'label' => $this->translate('MIB Management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/mib')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/mib')
 		)->add('services', array(
 			'label' => $this->translate('Services management'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/status/services')
+			'url'   => $this->getModuleConfig()->urlPath().'/status/services')
 	    )->add('plugins', array(
 	        'label' => $this->translate('Plugins management'),
-	        'url'   => $this->getModuleConfig()->urlPath() . '/status/plugins')
+	        'url'   => $this->getModuleConfig()->urlPath().'/status/plugins')
 	    );
 	} 
 }
@@ -341,7 +341,7 @@ 
 // TODO : see if useless 
 class UploadForm extends Form
 { 
-    public function __construct($options = null) 
+    public function __construct($options=null) 
     {
         parent::__construct($options);
         $this->addElements2();
@@ -350,11 +350,11 @@ 
     public function addElements2()
     {
         // File Input
-        $file = new File('mib-file');
+        $file=new File('mib-file');
         $file->setLabel('Mib upload');
              //->setAttrib('multiple', null);
         $this->addElement($file);
-		$button = new Submit("upload",array('ignore'=>false));
-		$this->addElement($button);//->setIgnore(false);
+		$button=new Submit("upload", array('ignore'=>false));
+		$this->addElement($button); //->setIgnore(false);
     }
 }

Braces +14 added lines, -23 removed lines

@@ -22,7 +22,9 @@ 
 		try
 		{
 		    $dbConn = $this->getUIDatabase()->getDbConn();
-		    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		    if ($dbConn === null) {
+		    	throw new \ErrorException('uncatched db error');
+		    }
 			$query = $dbConn->select()->from(
 				$this->getModuleConfig()->getTrapTableName(),
 				array('COUNT(*)')
@@ -41,8 +43,7 @@ 
  			
 			$this->view->trap_days_delete=$this->getUIDatabase()->getDBConfigValue('db_remove_days');
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -56,8 +57,7 @@ 
 			$this->view->currentLogFile=$this->getUIDatabase()->getDBConfigValue('log_file');
 			$this->view->logLevels=$this->getModuleConfig()->getlogLevels();
 			$this->view->currentLogLevel=$this->getUIDatabase()->getDBConfigValue('log_level');
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('status',$e->getMessage());
 		}
@@ -69,8 +69,7 @@ 
 		    $this->view->SnmpTrapAddressOID=$this->getUIDatabase()->getDBConfigValue('SnmpTrapAddess_oid');
 		    $this->view->SnmpTrapAddressOIDDefault = ($this->view->SnmpTrapAddressOID == $this->getModuleConfig()->getDBConfigDefaults()['SnmpTrapAddess_oid'] ) ? TRUE : FALSE;
 		    
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 		    $this->displayExitError('status',$e->getMessage());
 		}		
@@ -120,8 +119,7 @@ 
 					if ($retVal == 0)
 					{ // process is alive
 						$this->_helper->json(array('status'=>'Alive and kicking'));
-					}
-					else
+					} else
 					{ // process is dead
 					    $this->_helper->json(array('status'=>'tu quoque fili','err'=>'no proc'.$pid));
 					}
@@ -137,22 +135,19 @@ 
 				if (!is_dir($destDir))
 				{
 				    $this->view->uploadStatus="ERROR : no $destDir directory, check module configuration";
-				}
-				else
+				} else
 				{
 				    if (!is_writable($destDir))
 				    {
 				        $this->view->uploadStatus="ERROR : $destDir directory is not writable";
-				    }
-				    else
+				    } else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
 				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";
-    				    }
-    				    else
+    				    } else
     				    {
     				        $this->view->uploadStatus="File $name uploaded in $destDir";
     				    }
@@ -174,13 +169,11 @@ 
 			{
 				$this->view->snmptranslate='works fine';
 				$this->view->snmptranslate_state='ok';
-			}
-			else
+			} else
 			{
 				$this->view->snmptranslate='can execute but no resolution';
 			}
-		}
-		else
+		} else
 		{
 			$this->view->snmptranslate='cannot execute';
 		}
@@ -201,15 +194,13 @@ 
 		if ($retVal==0)
 		{
 			$dirArray=array_merge($dirArray,explode(':',$sysDirs));
-		}
-		else
+		} else
 		{
 			$translateOut=exec($this->Config()->get('config', 'snmptranslate') . ' -Dinit_mib .1.3 2>&1 | grep MIBDIRS');
 			if (preg_match('/MIBDIRS.*\'([^\']+)\'/',$translateOut,$matches))
 			{
 				$dirArray=array_merge($dirArray,explode(':',$matches[1]));
-			}
-			else
+			} else
 			{
 				array_push($dirArray,'Install net-snmp-config to see system directories');
 			}

application/controllers/HelperController.php

Indentation +143 added lines, -143 removed lines

@@ -12,8 +12,8 @@ 
 {
 	
 	/** Get host list with filter (IP or name) : host=<filter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -32,8 +32,8 @@ 
 	}
 	
 	/** Get hostgroup list with filter (name) : hostgroup=<hostFilter>
-	*	returns in JSON : status=>OK/NOK  hosts=>array of hosts
-	*/
+	 *	returns in JSON : status=>OK/NOK  hosts=>array of hosts
+	 */
 	public function gethostgroupsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -52,11 +52,11 @@ 
 	}
 	
 	/** Get service list by host name ( host=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		hostid = host object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		hostid = host object id or -1 if not found.
+	 */
 	public function getservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -98,11 +98,11 @@ 
 	}
 	
 	/** Get service list by host group ( name=<host> )
-	*	returns in JSON : 
-	*		status=>OK/No services found/More than one host matches
-	*		services=>array of services (name)
-	*		groupid = group object id or -1 if not found.
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No services found/More than one host matches
+	 *		services=>array of services (name)
+	 *		groupid = group object id or -1 if not found.
+	 */
 	public function gethostgroupservicesAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -132,10 +132,10 @@ 
 	}
 
 	/** Get traps from mib  : entry : mib=<mib>
-	*	returns in JSON : 
-	*		status=>OK/No mib/Error getting mibs
-	*		traps=>array of array( oid -> name)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/No mib/Error getting mibs
+	 *		traps=>array of array( oid -> name)
+	 */
 	public function gettrapsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -155,10 +155,10 @@ 
 	}	
 
 	/** Get trap objects from mib  : entry : trap=<oid>
-	*	returns in JSON : 
-	*		status=>OK/no trap/not found
-	*		objects=>array of array( oid -> name, oid->mib)
-	*/
+	 *	returns in JSON : 
+	 *		status=>OK/no trap/not found
+	 *		objects=>array of array( oid -> name, oid->mib)
+	 */
 	public function gettrapobjectsAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -178,8 +178,8 @@ 
 	}	
 	
 	/** Get list of all loaded mibs : entry : none
-	*	return : array of strings.
-	*/
+	 *	return : array of strings.
+	 */
 	public function getmiblistAction()
 	{
 		try
@@ -194,10 +194,10 @@ 
 	}
 	
 	/** Get MIB::Name from OID : entry : oid
-	*		status=>OK/No oid/not found
-	*		mib=>string
-	*		name=>string
-	*/	
+	 *		status=>OK/No oid/not found
+	 *		mib=>string
+	 *		name=>string
+	 */	
 	public function translateoidAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -218,7 +218,7 @@ 
 					'name' => $object['name'],
 					'type' => $object['type'],
 					'type_enum' => $object['type_enum'],
-				    'description' => $object['description']
+					'description' => $object['description']
 				)
 			);
 		}
@@ -226,10 +226,10 @@ 
 	}
 	
 	/** Save or execute database purge of <n> days
-	*	days=>int 
-	*	action=>save/execute
-	*	return : status=>OK/Message error
-	*/
+	 *	days=>int 
+	 *	action=>save/execute
+	 *	return : status=>OK/Message error
+	 */
 	public function dbmaintenanceAction()
 	{
 		
@@ -244,7 +244,7 @@ 
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+				$this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
 			}
 			catch (Exception $e)
 			{
@@ -282,33 +282,33 @@ 
 	 */
 	public function snmpconfigAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
+		$snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
 	    
-	    $snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
+		$snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
 	    	    
-	    try
-	    {
-	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
-	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
-	        return;
-	    }
-	    $this->_helper->json(array('status'=>'OK'));
-	    return;
+		try
+		{
+			$this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
+			$this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			return;
+		}
+		$this->_helper->json(array('status'=>'OK'));
+		return;
 	    
 	}
 	
 	/** Save log output to db
-	*	destination=>log destination 
-	*	file=>file name
-	*	level => int 
-	*	return : status=>OK/Message error
-	*/
+	 *	destination=>log destination 
+	 *	file=>file name
+	 *	level => int 
+	 *	return : status=>OK/Message error
+	 */
 	public function logdestinationAction()
 	{
 		$postData=$this->getRequest()->getPost();
@@ -327,8 +327,8 @@ 
 			$fileHandler=@fopen($file,'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
-			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
-			    return;
+				$this->_helper->json(array('status'=>'File not writable :  '.$file));
+				return;
 			}
 		}
 		else
@@ -348,9 +348,9 @@ 
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+			$this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
+			$this->getUIDatabase()->setDBConfigValue('log_file',$file);
+			$this->getUIDatabase()->setDBConfigValue('log_level',$level);
 		}
 		catch (Exception $e)
 		{
@@ -370,33 +370,33 @@ 
 	public function testruleAction()
 	{
 	    
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+		$rule = $this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+		$action = $this->checkPostVar($postData, 'action', 'evaluate');
 
-	    if ($action == 'evaluate')
-	    {
-	        try
-	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
-	            // Cleanup spaces before eval
-	            $rule=$trap->ruleClass->eval_cleanup($rule);
-	            // Eval
-	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
-	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
-	            return;
-	        }
-	        $return=($rule==true)?'true':'false';
-	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
-	    }
+		if ($action == 'evaluate')
+		{
+			try
+			{
+				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+				$trap = new Trap($icingaweb2_etc);
+				// Cleanup spaces before eval
+				$rule=$trap->ruleClass->eval_cleanup($rule);
+				// Eval
+				$item=0;
+				$rule=$trap->ruleClass->evaluation($rule,$item);
+			}
+			catch (Exception $e)
+			{
+				$this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+				return;
+			}
+			$return=($rule==true)?'true':'false';
+			$this->_helper->json(array('status'=>'OK', 'message' => $return));
+		}
 	    
 	}	
 
@@ -407,35 +407,35 @@ 
 	 */
 	public function pluginAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+		$pluginName = $this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+		$action = $this->checkPostVar($postData, 'action', 'enable|disable');
 	    
-        try
-        {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
-            // Enable plugin.
-            $action=($action == 'enable') ? true : false;
-            $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2_etc);
+			// Enable plugin.
+			$action=($action == 'enable') ? true : false;
+			$retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
-        {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-            return;
-        }
-        if ($retVal === true)
-        {
-            $this->_helper->json(array('status'=>'OK'));
-        }
-        else
-        {
-            $this->_helper->json(array('status'=>'Error, see logs'));
-        }
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
+		if ($retVal === true)
+		{
+			$this->_helper->json(array('status'=>'OK'));
+		}
+		else
+		{
+			$this->_helper->json(array('status'=>'Error, see logs'));
+		}
 	}
 	
 	/** Function evaluation
@@ -445,49 +445,49 @@ 
 	 */
 	public function functionAction()
 	{
-	    $postData=$this->getRequest()->getPost();
+		$postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+		$functionString = $this->checkPostVar($postData, 'function', '.*');
 	    
-	    $this->checkPostVar($postData, 'action', 'evaluate');
+		$this->checkPostVar($postData, 'action', 'evaluate');
 	    
-	    // Only one action possible for now, no tests on action.
-	    try
-	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
-	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
-	        // load all plugins in case tested function is not enabled.
-	        $trap->pluginClass->registerAllPlugins(false);
-	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
-	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
-	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
-	        return;
-	    }
+		// Only one action possible for now, no tests on action.
+		try
+		{
+			require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+			$icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
+			$trap = new Trap($icingaweb2Etc);
+			// load all plugins in case tested function is not enabled.
+			$trap->pluginClass->registerAllPlugins(false);
+			// Clean all spaces
+			$functionString = $trap->ruleClass->eval_cleanup($functionString);
+			// Eval functions
+			$result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+		}
+		catch (Exception $e)
+		{
+			$this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+			return;
+		}
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+		$result = ($result === true)?'True':'False';
+		$this->_helper->json(array('status'=>'OK','message' => $result));
 	}
 
-    /**************   Utilities **********************/
+	/**************   Utilities **********************/
 
 	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
 	{
-	    if (!isset ($postData[$postVar]))
-	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
-	        return '';
-	    }
-	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
-	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
-	        return '';
-	    }
-	    return $postData[$postVar];
+		if (!isset ($postData[$postVar]))
+		{
+			$this->_helper->json(array('status'=>'No ' . $postVar));
+			return '';
+		}
+		if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
+		{
+			$this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+			return '';
+		}
+		return $postData[$postVar];
 	}
 }

Spacing +65 added lines, -65 removed lines

@@ -18,14 +18,14 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getUIDatabase()->getHostByIP($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -38,14 +38,14 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$hostFilter = $this->checkPostVar($postData, 'hostFilter', '.*');
+		$hostFilter=$this->checkPostVar($postData, 'hostFilter', '.*');
 		
-		$retHosts=array('status'=>'OK','hosts' => array());
+		$retHosts=array('status'=>'OK', 'hosts' => array());
 
 		$hosts=$this->getUIDatabase()->getHostGroupByName($hostFilter);
 		foreach ($hosts as $val)
 		{
-			array_push($retHosts['hosts'],$val->name);
+			array_push($retHosts['hosts'], $val->name);
 		}
 		
 		$this->_helper->json($retHosts);
@@ -68,31 +68,31 @@ 
 		}
 		else
 		{
-			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
+			$this->_helper->json(array('status'=>'No Hosts', 'hostid' => -1));
 			return;
 		}
 		
 		$hostArray=$this->getUIDatabase()->getHostByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one host matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No host matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getUIDatabase()->getServicesByHostid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for host','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for host', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => array(),'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => array(), 'hostid' => $hostArray[0]->id);
 		foreach ($services as $val)
 		{
-			array_push($retServices['services'],array($val->id , $val->name));
+			array_push($retServices['services'], array($val->id, $val->name));
 		}
 		$this->_helper->json($retServices);
 	}
@@ -107,26 +107,26 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$host = $this->checkPostVar($postData, 'host', '.+');
+		$host=$this->checkPostVar($postData, 'host', '.+');
 		
 		$hostArray=$this->getUIDatabase()->getHostGroupByName($host);
 		if (count($hostArray) > 1)
 		{	
-			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'More than one hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		else if (count($hostArray) == 0)
 		{
-			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
+			$this->_helper->json(array('status'=>'No hostgroup matches', 'hostid' => -1));
 			return;
 		}
 		$services=$this->getUIDatabase()->getServicesByHostGroupid($hostArray[0]->id);
 		if (count($services) < 1)
 		{
-			$this->_helper->json(array('status'=>'No services found for hostgroup','hostid' => $hostArray[0]->id));
+			$this->_helper->json(array('status'=>'No services found for hostgroup', 'hostid' => $hostArray[0]->id));
 			return;
 		}
-		$retServices=array('status'=>'OK','services' => $services,'hostid' => $hostArray[0]->id);
+		$retServices=array('status'=>'OK', 'services' => $services, 'hostid' => $hostArray[0]->id);
 		
 		$this->_helper->json($retServices);
 	}
@@ -140,12 +140,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$mib = $this->checkPostVar($postData, 'mib', '.*');
+		$mib=$this->checkPostVar($postData, 'mib', '.*');
 
 		try
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
-			$retTraps=array('status'=>'OK','traps' => $traplist);
+			$retTraps=array('status'=>'OK', 'traps' => $traplist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -163,12 +163,12 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$trap = $this->checkPostVar($postData, 'trap', '.*');
+		$trap=$this->checkPostVar($postData, 'trap', '.*');
 		
 		try
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
-			$retObjects=array('status'=>'OK','objects' => $objectlist);
+			$retObjects=array('status'=>'OK', 'objects' => $objectlist);
 		} 
 		catch (Exception $e) 
 		{ 
@@ -202,7 +202,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$oid = $this->checkPostVar($postData, 'oid', '.*');
+		$oid=$this->checkPostVar($postData, 'oid', '.*');
 		
 		// Try to get oid name from snmptranslate
 		if (($object=$this->getMIB()->translateOID($oid)) == null)
@@ -235,20 +235,20 @@ 
 		
 		$postData=$this->getRequest()->getPost();
 		
-		$days = $this->checkPostVar($postData, 'days', '^[0-9]+$');
+		$days=$this->checkPostVar($postData, 'days', '^[0-9]+$');
 		$days=intval($days);
 
-		$action = $this->checkPostVar($postData, 'action', 'save|execute');
+		$action=$this->checkPostVar($postData, 'action', 'save|execute');
 		
 		if ($action == 'save')
 		{
 			try
 			{
-			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
+			    $this->getUIDatabase()->setDBConfigValue('db_remove_days', $days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 				return;
 			}
 			$this->_helper->json(array('status'=>'OK'));
@@ -258,16 +258,16 @@ 
 		{
 			try
 			{
-				require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+				require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 				$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 				$debug_level=4;
-				$trap = new Trap($icingaweb2_etc);
-				$trap->setLogging($debug_level,'syslog');
+				$trap=new Trap($icingaweb2_etc);
+				$trap->setLogging($debug_level, 'syslog');
 				$trap->eraseOldTraps($days);
 			}
 			catch (Exception $e)
 			{
-				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
+				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage()));
 				return;
 			}			
 			$this->_helper->json(array('status'=>'OK'));
@@ -284,18 +284,18 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $snmpUse = $this->checkPostVar($postData, 'useTrapAddr', '0|1');
+	    $snmpUse=$this->checkPostVar($postData, 'useTrapAddr', '0|1');
 	    
-	    $snmpOID = $this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
+	    $snmpOID=$this->checkPostVar($postData, 'trapAddrOID', '^[\.0-9]+$');
 	    	    
 	    try
 	    {
-	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
-	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
+	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess', $snmpUse);
+	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid', $snmpOID);
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 	        return;
 	    }
 	    $this->_helper->json(array('status'=>'OK'));
@@ -313,7 +313,7 @@ 
 	{
 		$postData=$this->getRequest()->getPost();
 		
-		$destination = $this->checkPostVar($postData, 'destination', '.*');
+		$destination=$this->checkPostVar($postData, 'destination', '.*');
 		$logDest=$this->getModuleConfig()->getLogDestinations();
 		if (!isset($logDest[$destination]))
 		{
@@ -324,7 +324,7 @@ 
 		if (isset($postData['file']))
 		{ 
 			$file=$postData['file'];
-			$fileHandler=@fopen($file,'w');
+			$fileHandler=@fopen($file, 'w');
 			if ($fileHandler == false)
 			{   // File os note writabe / cannot create
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
@@ -344,17 +344,17 @@ 
 			}
 		}
 
-		$level = $this->checkPostVar($postData, 'level', '[0-9]');
+		$level=$this->checkPostVar($postData, 'level', '[0-9]');
 				
 		try
 		{
-		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
-		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
-		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
+		    $this->getUIDatabase()->setDBConfigValue('log_destination', $destination);
+		    $this->getUIDatabase()->setDBConfigValue('log_file', $file);
+		    $this->getUIDatabase()->setDBConfigValue('log_level', $level);
 		}
 		catch (Exception $e)
 		{
-			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
+			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage()));
 			return;
 		}
 		$this->_helper->json(array('status'=>'OK'));
@@ -372,29 +372,29 @@ 
 	    
 	    $postData=$this->getRequest()->getPost();
 	   
-	    $rule = $this->checkPostVar($postData, 'rule', '.*');
+	    $rule=$this->checkPostVar($postData, 'rule', '.*');
 
-	    $action = $this->checkPostVar($postData, 'action', 'evaluate');
+	    $action=$this->checkPostVar($postData, 'action', 'evaluate');
 
 	    if ($action == 'evaluate')
 	    {
 	        try
 	        {
-	            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	            $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-	            $trap = new Trap($icingaweb2_etc);
+	            $trap=new Trap($icingaweb2_etc);
 	            // Cleanup spaces before eval
 	            $rule=$trap->ruleClass->eval_cleanup($rule);
 	            // Eval
 	            $item=0;
-	            $rule=$trap->ruleClass->evaluation($rule,$item);
+	            $rule=$trap->ruleClass->evaluation($rule, $item);
 	        }
 	        catch (Exception $e)
 	        {
-	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
+	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage()));
 	            return;
 	        }
-	        $return=($rule==true)?'true':'false';
+	        $return=($rule == true) ? 'true' : 'false';
 	        $this->_helper->json(array('status'=>'OK', 'message' => $return));
 	    }
 	    
@@ -409,15 +409,15 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $pluginName = $this->checkPostVar($postData, 'name', '.*');
+	    $pluginName=$this->checkPostVar($postData, 'name', '.*');
 	    
-	    $action = $this->checkPostVar($postData, 'action', 'enable|disable');
+	    $action=$this->checkPostVar($postData, 'action', 'enable|disable');
 	    
         try
         {
-            require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+            require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
             $icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-            $trap = new Trap($icingaweb2_etc);
+            $trap=new Trap($icingaweb2_etc);
             // Enable plugin.
             $action=($action == 'enable') ? true : false;
             $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
@@ -425,7 +425,7 @@ 
         }
         catch (Exception $e)
         {
-            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+            $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
             return;
         }
         if ($retVal === true)
@@ -447,45 +447,45 @@ 
 	{
 	    $postData=$this->getRequest()->getPost();
 	    
-	    $functionString = $this->checkPostVar($postData, 'function', '.*');
+	    $functionString=$this->checkPostVar($postData, 'function', '.*');
 	    
 	    $this->checkPostVar($postData, 'action', 'evaluate');
 	    
 	    // Only one action possible for now, no tests on action.
 	    try
 	    {
-	        require_once($this->Module()->getBaseDir() .'/bin/trap_class.php');
+	        require_once($this->Module()->getBaseDir().'/bin/trap_class.php');
 	        $icingaweb2Etc=$this->Config()->get('config', 'icingaweb2_etc');
-	        $trap = new Trap($icingaweb2Etc);
+	        $trap=new Trap($icingaweb2Etc);
 	        // load all plugins in case tested function is not enabled.
 	        $trap->pluginClass->registerAllPlugins(false);
 	        // Clean all spaces
-	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
+	        $functionString=$trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
-	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
+	        $result=$trap->pluginClass->evaluateFunctionString($functionString);	        
 	    }
 	    catch (Exception $e)
 	    {
-	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
+	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage()));
 	        return;
 	    }
 	    
-        $result = ($result === true)?'True':'False';
-        $this->_helper->json(array('status'=>'OK','message' => $result));
+        $result=($result === true) ? 'True' : 'False';
+        $this->_helper->json(array('status'=>'OK', 'message' => $result));
 	}
 
     /**************   Utilities **********************/
 
-	private function checkPostVar(array $postData,string $postVar, string $validRegexp) : string
+	private function checkPostVar(array $postData, string $postVar, string $validRegexp) : string
 	{
 	    if (!isset ($postData[$postVar]))
 	    {
-	        $this->_helper->json(array('status'=>'No ' . $postVar));
+	        $this->_helper->json(array('status'=>'No '.$postVar));
 	        return '';
 	    }
 	    if (preg_match('/'.$validRegexp.'/', $postData[$postVar]) != 1)
 	    {
-	        $this->_helper->json(array('status'=>'Unknown ' . $postVar . ' value '.$postData[$postVar]));
+	        $this->_helper->json(array('status'=>'Unknown '.$postVar.' value '.$postData[$postVar]));
 	        return '';
 	    }
 	    return $postData[$postVar];

Braces +17 added lines, -34 removed lines

@@ -65,8 +65,7 @@ 
 		if (isset($postData['host']))
 		{
 			$host=$postData['host'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'No Hosts','hostid' => -1));
 			return;
@@ -77,8 +76,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one host matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No host matches','hostid' => -1));
 			return;
@@ -114,8 +112,7 @@ 
 		{	
 			$this->_helper->json(array('status'=>'More than one hostgroup matches','hostid' => -1));
 			return;
-		}
-		else if (count($hostArray) == 0)
+		} else if (count($hostArray) == 0)
 		{
 			$this->_helper->json(array('status'=>'No hostgroup matches','hostid' => -1));
 			return;
@@ -146,8 +143,7 @@ 
 		{
 			$traplist=$this->getMIB()->getTrapList($mib);
 			$retTraps=array('status'=>'OK','traps' => $traplist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retTraps=array('status' => 'Error getting mibs');
 		}
@@ -169,8 +165,7 @@ 
 		{
 			$objectlist=$this->getMIB()->getObjectList($trap);
 			$retObjects=array('status'=>'OK','objects' => $objectlist);
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$retObjects=array('status' => 'not found');
 		}
@@ -185,8 +180,7 @@ 
 		try
 		{
 			$miblist=$this->getMIB()->getMIBList();
-		} 
-		catch (Exception $e) 
+		} catch (Exception $e) 
 		{ 
 			$miblist=array('Error getting mibs');
 		}
@@ -209,8 +203,7 @@ 
 		{
 			$this->_helper->json(array('status'=>'Not found'));
 			return;
-		}
-		else
+		} else
 		{
 			$this->_helper->json(
 				array('status'=>'OK',
@@ -245,8 +238,7 @@ 
 			try
 			{
 			    $this->getUIDatabase()->setDBConfigValue('db_remove_days',$days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 				return;
@@ -264,8 +256,7 @@ 
 				$trap = new Trap($icingaweb2_etc);
 				$trap->setLogging($debug_level,'syslog');
 				$trap->eraseOldTraps($days);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->_helper->json(array('status'=>'execute error : '.$e->getMessage() ));
 				return;
@@ -292,8 +283,7 @@ 
 	    {
 	        $this->getUIDatabase()->setDBConfigValue('use_SnmpTrapAddess',$snmpUse);
 	        $this->getUIDatabase()->setDBConfigValue('SnmpTrapAddess_oid',$snmpOID);
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 	        return;
@@ -330,14 +320,12 @@ 
 			    $this->_helper->json(array('status'=>'File not writable :  '.$file));
 			    return;
 			}
-		}
-		else
+		} else
 		{
 			if ($destination != 'file')
 			{
 				$file=null;
-			}
-			else
+			} else
 			{
 				$this->_helper->json(array('status'=>'No file'));
 				return;
@@ -351,8 +339,7 @@ 
 		    $this->getUIDatabase()->setDBConfigValue('log_destination',$destination);
 		    $this->getUIDatabase()->setDBConfigValue('log_file',$file);
 		    $this->getUIDatabase()->setDBConfigValue('log_level',$level);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->_helper->json(array('status'=>'Save error : '.$e->getMessage() ));
 			return;
@@ -388,8 +375,7 @@ 
 	            // Eval
 	            $item=0;
 	            $rule=$trap->ruleClass->evaluation($rule,$item);
-	        }
-	        catch (Exception $e)
+	        } catch (Exception $e)
 	        {
 	            $this->_helper->json(array('status'=>'Evaluation error : '.$e->getMessage() ));
 	            return;
@@ -422,8 +408,7 @@ 
             $action=($action == 'enable') ? true : false;
             $retVal=$trap->pluginClass->enablePlugin($pluginName, $action);
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
             return;
@@ -431,8 +416,7 @@ 
         if ($retVal === true)
         {
             $this->_helper->json(array('status'=>'OK'));
-        }
-        else
+        } else
         {
             $this->_helper->json(array('status'=>'Error, see logs'));
         }
@@ -463,8 +447,7 @@ 
 	        $functionString = $trap->ruleClass->eval_cleanup($functionString);
 	        // Eval functions
 	        $result = $trap->pluginClass->evaluateFunctionString($functionString);	        
-	    }
-	    catch (Exception $e)
+	    } catch (Exception $e)
 	    {
 	        $this->_helper->json(array('status'=>'Action error : '.$e->getMessage() ));
 	        return;