patrickpr / trapdirector

library/Trapdirector/Icinga2Api.php

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,13 +84,13 @@ 
         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;
@@ -105,12 +105,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');
     }
     
     
@@ -125,9 +125,9 @@ 
      */
     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) {
-                throw new Exception('CURL INIT ERROR: ' . curl_error($this->curl));
+                throw new Exception('CURL INIT ERROR: '.curl_error($this->curl));
             }
         }
         return $this->curl;
@@ -141,7 +141,7 @@ 
      * @param string $display : service passive check output
      * @return array (status = true (oK) or false (nok), string message)
      */
-    public function serviceCheckResult($host,$service,$state,$display)
+    public function serviceCheckResult($host, $service, $state, $display)
     {
         //Send a POST request to the URL endpoint /v1/actions/process-check-result
         //actions/process-check-result?service=example.localdomain!passive-ping6
@@ -159,9 +159,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;
             }
@@ -169,21 +169,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));
     }
  
     /**
@@ -204,7 +204,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
         {
@@ -214,24 +214,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;            
@@ -250,7 +250,7 @@ 
         $url='objects/hosts';
         $body=array(
             "filter"        => '\"'.$hostGroup.'\" in host.groups',
-            "attrs"         => array('address','address','name')
+            "attrs"         => array('address', 'address', 'name')
         );
         try
         {
@@ -260,25 +260,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;
@@ -296,23 +296,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,
@@ -323,14 +323,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');
         }
@@ -344,7 +344,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()));

Indentation +330 added lines, -330 removed lines

@@ -8,361 +8,361 @@
 
 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 (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 (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) {
-                throw new Exception('CURL INIT ERROR: ' . curl_error($this->curl));
-            }
-        }
-        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) {
+				throw new Exception('CURL INIT ERROR: ' . curl_error($this->curl));
+			}
+		}
+		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
-     * @return array (status = true (oK) or false (nok), string message)
-     */
-    public function serviceCheckResult($host,$service,$state,$display)
-    {
-        //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
-        );
-        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
+	 * @return array (status = true (oK) or false (nok), string message)
+	 */
+	public function serviceCheckResult($host,$service,$state,$display)
+	{
+		//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
+		);
+		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];
+	}
 }
 

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
        try
         {
             $result=$this->request('GET', "", NULL, NULL);
-        } 
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return array(true, 'Error with API : '.$e->getMessage());
         }
@@ -165,8 +164,7 @@ 
             if (property_exists($result,'status'))
             {
                 $message=$result->status;
-            }
-            else 
+            } else 
             {
                 $message="Unkown status";
             }
@@ -177,8 +175,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');
             }
@@ -220,8 +217,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');
             }
@@ -266,8 +262,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/Config/TrapModuleConfig.php

Indentation +16 added lines, -16 removed lines

@@ -4,9 +4,9 @@ 
 
 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
@@ -113,27 +113,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'
+		);
 	}
 	
 	
@@ -188,7 +188,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

@@ -14,22 +14,22 @@ 
 		'log_level' => 2, // log level
 	);
 	// get default values for dbconfig
-	public function getDBConfigDefaults() { return $this->DBConfigDefaults;}
+	public function getDBConfigDefaults() { return $this->DBConfigDefaults; }
 	// Minimum DB version
-	static public function getDbMinVersion() { return 2;}	
+	static public function getDbMinVersion() { return 2; }	
 	// Current DB version
-	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)
 	{
@@ -40,29 +40,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 *******************/
@@ -143,7 +143,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',
@@ -196,32 +196,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; }

bin/trap_in.php

Braces +2 added lines, -4 removed lines

@@ -30,15 +30,13 @@
 
 	$Trap->add_rule_final(microtime(true) - $time1);
 	
-}
-catch (Exception $e) 
+} catch (Exception $e) 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
         $logging = new Logging();
         $logging->log("Caught exception creating Trap class",2);
-    }
-    else
+    } else
     {
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
     }

Indentation +14 added lines, -14 removed lines

@@ -15,13 +15,13 @@ 
 
 try
 {
-    //$Trap = new Trap($icingaweb2_etc);
-    //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    $Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	//$Trap = new Trap($icingaweb2_etc);
+	//$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
+	$Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
+	//$Trap->setLogging(4,'syslog'); 
     
-    // TODO : tranfer this to reset_trap cli command
-    $Trap->eraseOldTraps();
+	// TODO : tranfer this to reset_trap cli command
+	$Trap->eraseOldTraps();
 
 	$Trap->read_trap('php://stdin');
 
@@ -34,15 +34,15 @@ 
 }
 catch (Exception $e) 
 {
-    if ($Trap == null)
-    {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
-    }
-    else
-    {
+	if ($Trap == null)
+	{  // Exception in trap creation : log in display & syslog
+		$logging = new Logging();
+		$logging->log("Caught exception creating Trap class",2);
+	}
+	else
+	{
 	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
-    }
+	}
 }
 
 //end

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 use Trapdirector\Logging;
 
 // start
-$time1 = microtime(true);
+$time1=microtime(true);
 
 require_once ('trap_class.php');
 
@@ -17,7 +17,7 @@ 
 {
     //$Trap = new Trap($icingaweb2_etc);
     //$Trap = new Trap($icingaweb2_etc,4,'display'); // For debug
-    $Trap = new Trap($icingaweb2_etc,4,'syslog'); // For debug
+    $Trap=new Trap($icingaweb2_etc, 4, 'syslog'); // For debug
     //$Trap->setLogging(4,'syslog'); 
     
     // TODO : tranfer this to reset_trap cli command
@@ -36,12 +36,12 @@ 
 {
     if ($Trap == null)
     {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
+        $logging=new Logging();
+        $logging->log("Caught exception creating Trap class", 2);
     }
     else
     {
-	   $Trap->trapLog("Exception : ". $e->getMessage(),2,0);
+	   $Trap->trapLog("Exception : ".$e->getMessage(), 2, 0);
     }
 }
 

library/Trapdirector/Config/MIBLoader.php

Braces +12 added lines, -7 removed lines

@@ -94,7 +94,9 @@ 
 					array('id' => 'id'))
 				->where("oid = '".$trap."'") ;
 		$id=$dbconn->fetchRow($query);
-		if ( ($id == null) || ! property_exists($id,'id') ) return null;
+		if ( ($id == null) || ! property_exists($id,'id') ) {
+			return null;
+		}
 		
 		$query=$dbconn->select()
 		        ->from(
@@ -107,7 +109,9 @@ 
 		            'o.trap_id='.$id->id )
 		        ->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
-		if ( count($listObjects)==0 ) return null;
+		if ( count($listObjects)==0 ) {
+			return null;
+		}
 		
 		foreach ($listObjects as $val)
 		{
@@ -128,7 +132,10 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
+	    if (!preg_match('/^\./',$oid)) {
+	    	$oid = '.' . $oid;
+	    }
+	    // Add a leading '.'
 		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
 		$dbconn = $this->db->getConnection();
 
@@ -166,8 +173,7 @@ 
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
-		}
-		else
+		} else
 		{
 			$retArray['type']=$translate;
 			$retArray['type_enum']='';			
@@ -233,8 +239,7 @@ 
 	    if ($oid===null)
 	    {
 	        $where="c.id = '$id'";
-	    }
-	    else
+	    } else
 	    {
 	        $where="c.oid = '$oid'";
 	    }

Indentation +46 added lines, -46 removed lines

@@ -31,10 +31,10 @@ 
 				
 	}
 
-    /**
-     * Get all mibs in db which have at least one trap
-     * @return array
-     */	
+	/**
+	 * Get all mibs in db which have at least one trap
+	 * @return array
+	 */	
 	
 	public function getMIBList()
 	{
@@ -58,9 +58,9 @@ 
 	
 	
 	/** Get trap list from a mib 
-	*	@param $mib string mib name
-	*	@return array : traps
-	*/
+	 *	@param $mib string mib name
+	 *	@return array : traps
+	 */
 	public function getTrapList($mib)
 	{
 		$traps=array();
@@ -68,7 +68,7 @@ 
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
-				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
+					array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
 				->where("mib = '".$mib."' AND type='21'") ;
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
@@ -79,9 +79,9 @@ 
 	}
 	
 	/** Get objects a trap can have
-	*	@param int $trap oid of trap
-	*	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
-	*/
+	 *	@param int $trap oid of trap
+	 *	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
+	 */
 	public function getObjectList($trap)
 	{
 		$objects=array();
@@ -97,15 +97,15 @@ 
 		if ( ($id == null) || ! property_exists($id,'id') ) return null;
 		
 		$query=$dbconn->select()
-		        ->from(
-		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-		                'description' => 'c.description'))
-		        ->join(
-		            array('o' => $this->config->getMIBCacheTableTrapObjName()),
-		            'o.trap_id='.$id->id )
-		        ->where("o.object_id = c.id");
+				->from(
+					array('c' => $this->config->getMIBCacheTableName()),
+					array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+						'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+						'description' => 'c.description'))
+				->join(
+					array('o' => $this->config->getMIBCacheTableTrapObjName()),
+					'o.trap_id='.$id->id )
+				->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
 		if ( count($listObjects)==0 ) return null;
 		
@@ -123,12 +123,12 @@ 
 	}
 
 	/** translate oid in MIB::Name 
-	*	@param string $oid
-	*	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
-	*/
+	 *	@param string $oid
+	 *	@return array|null :  return array with index (oid -> oid, mib -> mib name, name -> oid name, type -> oid type)
+	 */
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
+		if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
 		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
 		$dbconn = $this->db->getConnection();
 
@@ -136,7 +136,7 @@ 
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
 					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
-					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
+						'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
 		if ($object != null) 
@@ -152,7 +152,7 @@ 
 		// Try to get oid name from snmptranslate
 		$matches=array();
 		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-		    ' '.$oid);
+			' '.$oid);
 		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
 		if ($ret_code===0 || $ret_code===false) {
 			return null;
@@ -164,8 +164,8 @@ 
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
 		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
 		{
-		    $retArray['type']=$matches[1];
-		    $retArray['type_enum']=$matches[2];
+			$retArray['type']=$matches[1];
+			$retArray['type_enum']=$matches[2];
 		}
 		else
 		{
@@ -229,25 +229,25 @@ 
 	 */
 	public function getTrapDetails($oid=null,$id=null)
 	{	    
-	    // Get trap id in DB
-	    if ($oid===null)
-	    {
-	        $where="c.id = '$id'";
-	    }
-	    else
-	    {
-	        $where="c.oid = '$oid'";
-	    }
-	    $query=$this->db->getConnection()->select()
-           ->from(
-            array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
-                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
-                'description' => 'c.description'))
-            ->where($where);
-        $trap=$this->db->getConnection()->fetchRow($query);
+		// Get trap id in DB
+		if ($oid===null)
+		{
+			$where="c.id = '$id'";
+		}
+		else
+		{
+			$where="c.oid = '$oid'";
+		}
+		$query=$this->db->getConnection()->select()
+		   ->from(
+			array('c' => $this->config->getMIBCacheTableName()),
+			array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+				'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
+				'description' => 'c.description'))
+			->where($where);
+		$trap=$this->db->getConnection()->fetchRow($query);
         
-        return $trap;
+		return $trap;
 	}
 	
 }

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param string $db current database
 	 * @param TrapModuleConfig $config TrapModuleConfig class instance
 	 */
-	public function __construct($snmptranslate,$snmptranslate_dirs,$db,$config)
+	public function __construct($snmptranslate, $snmptranslate_dirs, $db, $config)
 	{
 		$this->snmptranslate=$snmptranslate;
 		$this->snmptranslate_dirs=$snmptranslate_dirs;
@@ -38,19 +38,19 @@ 
 	
 	public function getMIBList()
 	{
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->distinct()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('mib' => 'mib'))
 				->where("type = '21'")
-				->order('mib ASC');				;
+				->order('mib ASC'); ;
 		$names=$dbconn->fetchAll($query);
 		$mib=array();
-		foreach($names as $val)
+		foreach ($names as $val)
 		{
-			array_push($mib,$val->mib);
+			array_push($mib, $val->mib);
 		}
 		return $mib;
 		
@@ -64,12 +64,12 @@ 
 	public function getTrapList($mib)
 	{
 		$traps=array();
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 				    array('name' => 'name', 'oid' => 'oid', 'description' => 'description'))
-				->where("mib = '".$mib."' AND type='21'") ;
+				->where("mib = '".$mib."' AND type='21'");
 		$names=$dbconn->fetchAll($query);
 		foreach ($names as $val)
 		{
@@ -87,19 +87,19 @@ 
 		$objects=array();
 		
 		// Get trap id in DB
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
 					array('id' => 'id'))
-				->where("oid = '".$trap."'") ;
+				->where("oid = '".$trap."'");
 		$id=$dbconn->fetchRow($query);
-		if ( ($id == null) || ! property_exists($id,'id') ) return null;
+		if (($id == null) || !property_exists($id, 'id')) return null;
 		
 		$query=$dbconn->select()
 		        ->from(
 		            array('c' => $this->config->getMIBCacheTableName()),
-		            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+		            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
 		                'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
 		                'description' => 'c.description'))
 		        ->join(
@@ -107,7 +107,7 @@ 
 		            'o.trap_id='.$id->id )
 		        ->where("o.object_id = c.id");
 		$listObjects=$dbconn->fetchAll($query);
-		if ( count($listObjects)==0 ) return null;
+		if (count($listObjects) == 0) return null;
 		
 		foreach ($listObjects as $val)
 		{
@@ -128,14 +128,14 @@ 
 	*/
 	public function translateOID($oid)
 	{
-	    if (!preg_match('/^\./',$oid)) $oid = '.' . $oid; // Add a leading '.'
-		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null,'type'=>null);
-		$dbconn = $this->db->getConnection();
+	    if (!preg_match('/^\./', $oid)) $oid='.'.$oid; // Add a leading '.'
+		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null, 'type'=>null);
+		$dbconn=$this->db->getConnection();
 
 		$query=$dbconn->select()
 				->from(
 					array('o' => $this->config->getMIBCacheTableName()),
-					array('mib'=>'o.mib','name' => 'o.name','type'=>'o.syntax',
+					array('mib'=>'o.mib', 'name' => 'o.name', 'type'=>'o.syntax',
 					    'type_enum'=>'o.type_enum', 'description'=>'o.description'))
 				->where('o.oid=\''.$oid.'\'');
 		$object=$dbconn->fetchRow($query);
@@ -151,18 +151,18 @@ 
 		
 		// Try to get oid name from snmptranslate
 		$matches=array();
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.
 		    ' '.$oid);
-		$ret_code=preg_match('/(.*)::(.*)/',$translate,$matches);
-		if ($ret_code===0 || $ret_code===false) {
+		$ret_code=preg_match('/(.*)::(.*)/', $translate, $matches);
+		if ($ret_code === 0 || $ret_code === false) {
 			return null;
 		} 
 		$retArray['mib']=$matches[1];
 		$retArray['name']=$matches[2];
 		
-		$translate=exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On ' . $matches[0] .
+		$translate=exec($this->snmptranslate.' -m ALL -M +'.$this->snmptranslate_dirs.' -Td -On '.$matches[0].
 			" | grep SYNTAX | sed 's/SYNTAX[[:blank:]]*//'");
-		if (preg_match('/(.*)\{(.*)\}/',$translate,$matches))
+		if (preg_match('/(.*)\{(.*)\}/', $translate, $matches))
 		{
 		    $retArray['type']=$matches[1];
 		    $retArray['type_enum']=$matches[2];
@@ -197,9 +197,9 @@ 
 	 * @param string $type filter by type (21=trap)
 	 * @return number number of entries in db.
 	 */
-	public function countObjects($mib=null,$type=null)
+	public function countObjects($mib=null, $type=null)
 	{
-		$dbconn = $this->db->getConnection();
+		$dbconn=$this->db->getConnection();
 		$query=$dbconn->select()
 				->from(
 					$this->config->getMIBCacheTableName(),
@@ -207,11 +207,11 @@ 
 		$where=null;
 		if ($mib !== null)
 		{
-			$where ="mib = '$mib' ";
+			$where="mib = '$mib' ";
 		}
 		if ($type !== null)
 		{
-			$where=($where !== null)?' AND ':'';
+			$where=($where !== null) ? ' AND ' : '';
 			$where.="type='$type'";
 		}
 		if ($where !== null)
@@ -227,10 +227,10 @@ 
 	 * @param integer $id
 	 * @return array trap details
 	 */
-	public function getTrapDetails($oid=null,$id=null)
+	public function getTrapDetails($oid=null, $id=null)
 	{	    
 	    // Get trap id in DB
-	    if ($oid===null)
+	    if ($oid === null)
 	    {
 	        $where="c.id = '$id'";
 	    }
@@ -241,7 +241,7 @@ 
 	    $query=$this->db->getConnection()->select()
            ->from(
             array('c' => $this->config->getMIBCacheTableName()),
-            array('name' => 'c.name','mib' => 'c.mib','oid' => 'c.oid','type_enum'=>'c.type_enum',
+            array('name' => 'c.name', 'mib' => 'c.mib', 'oid' => 'c.oid', 'type_enum'=>'c.type_enum',
                 'type' => 'c.syntax', 'text_conv' => 'c.textual_convention', 'disp' => 'display_hint',
                 'description' => 'c.description'))
             ->where($where);

library/Trapdirector/TrapsProcess/Logging.php

Indentation +102 added lines, -102 removed lines

@@ -9,113 +9,113 @@
 class Logging
 {
 
-    //**** Options from config database
-    // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
-    public $outputMode='syslog'; // alert type : file, syslog, display
-    public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
-    protected $outputList=array('file', 'syslog', 'display');
+	//**** Options from config database
+	// Default values
+	public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+	public $outputMode='syslog'; // alert type : file, syslog, display
+	public $outputFile="/tmp/trapdebug.txt";
+	protected $logLevels=array("","Error","Warning","Info","Debug");
+	protected $outputList=array('file', 'syslog', 'display');
     
-    /** Send log. Throws exception on critical error
-     *	@param	string $message Message to log
-     *	@param	int $level 1=critical 2=warning 3=trace 4=debug
-     *	@param  string $destination file/syslog/display
-     *	@return void
-     *  @throws Exception
-     **/
-    public function log( $message, $level, $destination ='')
-    {
-        if ($this->debugLevel >= $level)
-        {
-            $message = '['.  date("Y/m/d H:i:s") . '] ' .
-                '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+	/** Send log. Throws exception on critical error
+	 *	@param	string $message Message to log
+	 *	@param	int $level 1=critical 2=warning 3=trace 4=debug
+	 *	@param  string $destination file/syslog/display
+	 *	@return void
+	 *  @throws Exception
+	 **/
+	public function log( $message, $level, $destination ='')
+	{
+		if ($this->debugLevel >= $level)
+		{
+			$message = '['.  date("Y/m/d H:i:s") . '] ' .
+				'[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
-            switch ($output)
-            {
-                case 'file':
-                    file_put_contents ($this->outputFile, $message , FILE_APPEND);
-                    break;
-                case 'syslog':
-                    switch($level)
-                    {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_DEBUG;break;
-                        default: $prio = LOG_ERR;
-                    }
-                    syslog($prio,$message);
-                    break;
-                case 'display':
-                    echo $message;
-                    break;
-                default : // nothing we can do at this point
-                    throw new Exception($message);
-            }
-        }
-        if ($level == 1)
-        {
-            throw new Exception($message);
-        }
-    }
+			$output = ( $destination != '' ) ? $destination : $this->outputMode;
+			switch ($output)
+			{
+				case 'file':
+					file_put_contents ($this->outputFile, $message , FILE_APPEND);
+					break;
+				case 'syslog':
+					switch($level)
+					{
+						case 1 : $prio = LOG_ERR;break;
+						case 2 : $prio = LOG_WARNING;break;
+						case 3 : $prio = LOG_INFO;break;
+						case 4 : $prio = LOG_DEBUG;break;
+						default: $prio = LOG_ERR;
+					}
+					syslog($prio,$message);
+					break;
+				case 'display':
+					echo $message;
+					break;
+				default : // nothing we can do at this point
+					throw new Exception($message);
+			}
+		}
+		if ($level == 1)
+		{
+			throw new Exception($message);
+		}
+	}
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
-    {
-        $this->setLevel($debugLvl);
-        switch ($outputType)
-        {
-            case 'file':
-                if ($outputFile == null) throw new Exception("File logging without file !");
-                $this->setFile($outputFile);
-                $this->setDestination('file');
-                break;
-            default:
-                $this->setDestination($outputType);
-        }
-    }
+	public function setLogging($debugLvl,$outputType,$outputFile=null)
+	{
+		$this->setLevel($debugLvl);
+		switch ($outputType)
+		{
+			case 'file':
+				if ($outputFile == null) throw new Exception("File logging without file !");
+				$this->setFile($outputFile);
+				$this->setDestination('file');
+				break;
+			default:
+				$this->setDestination($outputType);
+		}
+	}
     
-    /**
-     * Set logging level
-     * @param integer $level
-     * @throws Exception
-     */
-    public function setLevel($level)
-    {
-        if (!is_integer($level) || $level < 0 || $level > 10)
-        {
-            throw new Exception('Invalid log level');
-        }
-        $this->debugLevel=$level;
-    }
+	/**
+	 * Set logging level
+	 * @param integer $level
+	 * @throws Exception
+	 */
+	public function setLevel($level)
+	{
+		if (!is_integer($level) || $level < 0 || $level > 10)
+		{
+			throw new Exception('Invalid log level');
+		}
+		$this->debugLevel=$level;
+	}
 
-    /**
-     * Set logging destination
-     * @param string $destination
-     * @throws Exception
-     */
-    public function setDestination($destination)
-    {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
-        {
-            throw new Exception('Invalid log destination');
-        }
-        $this->outputMode=$destination;
-    }
-    /**
-     * Set file destination
-     * @param string $file
-     * @throws Exception
-     */
-    public function setFile($file)
-    {
-        if (!is_string($file))
-        {
-            throw new Exception('Invalid log file');
-        }
-        $this->outputFile=$file;
-    }
+	/**
+	 * Set logging destination
+	 * @param string $destination
+	 * @throws Exception
+	 */
+	public function setDestination($destination)
+	{
+		if (!is_string($destination) || ! in_array($destination, $this->outputList))
+		{
+			throw new Exception('Invalid log destination');
+		}
+		$this->outputMode=$destination;
+	}
+	/**
+	 * Set file destination
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function setFile($file)
+	{
+		if (!is_string($file))
+		{
+			throw new Exception('Invalid log file');
+		}
+		$this->outputFile=$file;
+	}
     
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -4,17 +4,17 @@ 
 
 use Exception;
 
-define("ERROR", 1);define("WARN", 2);define("INFO", 3);define("DEBUG", 4);
+define("ERROR", 1); define("WARN", 2); define("INFO", 3); define("DEBUG", 4);
 
 class Logging
 {
 
     //**** Options from config database
     // Default values
-    public $debugLevel=2;  // 0=No output 1=critical 2=warning 3=trace 4=ALL
+    public $debugLevel=2; // 0=No output 1=critical 2=warning 3=trace 4=ALL
     public $outputMode='syslog'; // alert type : file, syslog, display
     public $outputFile="/tmp/trapdebug.txt";
-    protected $logLevels=array("","Error","Warning","Info","Debug");
+    protected $logLevels=array("", "Error", "Warning", "Info", "Debug");
     protected $outputList=array('file', 'syslog', 'display');
     
     /** Send log. Throws exception on critical error
@@ -24,29 +24,29 @@ 
      *	@return void
      *  @throws Exception
      **/
-    public function log( $message, $level, $destination ='')
+    public function log($message, $level, $destination='')
     {
         if ($this->debugLevel >= $level)
         {
-            $message = '['.  date("Y/m/d H:i:s") . '] ' .
-                '[TrapDirector] ['.$this->logLevels[$level].']: ' .$message . "\n";
+            $message='['.date("Y/m/d H:i:s").'] '.
+                '[TrapDirector] ['.$this->logLevels[$level].']: '.$message."\n";
             
-            $output = ( $destination != '' ) ? $destination : $this->outputMode;
+            $output=($destination != '') ? $destination : $this->outputMode;
             switch ($output)
             {
                 case 'file':
-                    file_put_contents ($this->outputFile, $message , FILE_APPEND);
+                    file_put_contents($this->outputFile, $message, FILE_APPEND);
                     break;
                 case 'syslog':
-                    switch($level)
+                    switch ($level)
                     {
-                        case 1 : $prio = LOG_ERR;break;
-                        case 2 : $prio = LOG_WARNING;break;
-                        case 3 : $prio = LOG_INFO;break;
-                        case 4 : $prio = LOG_DEBUG;break;
-                        default: $prio = LOG_ERR;
+                        case 1 : $prio=LOG_ERR; break;
+                        case 2 : $prio=LOG_WARNING; break;
+                        case 3 : $prio=LOG_INFO; break;
+                        case 4 : $prio=LOG_DEBUG; break;
+                        default: $prio=LOG_ERR;
                     }
-                    syslog($prio,$message);
+                    syslog($prio, $message);
                     break;
                 case 'display':
                     echo $message;
@@ -62,7 +62,7 @@ 
     }
     
         
-    public function setLogging($debugLvl,$outputType,$outputFile=null)
+    public function setLogging($debugLvl, $outputType, $outputFile=null)
     {
         $this->setLevel($debugLvl);
         switch ($outputType)
@@ -98,7 +98,7 @@ 
      */
     public function setDestination($destination)
     {
-        if (!is_string($destination) || ! in_array($destination, $this->outputList))
+        if (!is_string($destination) || !in_array($destination, $this->outputList))
         {
             throw new Exception('Invalid log destination');
         }

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
         switch ($outputType)
         {
             case 'file':
-                if ($outputFile == null) throw new Exception("File logging without file !");
+                if ($outputFile == null) {
+                	throw new Exception("File logging without file !");
+                }
                 $this->setFile($outputFile);
                 $this->setDestination('file');
                 break;

library/Trapdirector/TrapsController.php

Indentation +116 added lines, -116 removed lines

@@ -32,8 +32,8 @@ 
 	protected $trapClass;		//< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
-	*	@return TrapModuleConfig
-	*/
+	 *	@return TrapModuleConfig
+	 */
 	public function getModuleConfig() 
 	{
 		if ($this->moduleConfig == Null) 
@@ -58,12 +58,12 @@ 
 	
 	public function getTrapHostListTable()
 	{
-	    if ($this->trapTableHostList == Null) 
+		if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
-	        $this->trapTableHostList->setConfig($this->getModuleConfig());
-	    }
-	    return $this->trapTableHostList;
+			$this->trapTableHostList = new TrapTableHostList();
+			$this->trapTableHostList->setConfig($this->getModuleConfig());
+		}
+		return $this->trapTableHostList;
 	}
 	
 	public function getHandlerListTable() 
@@ -77,11 +77,11 @@ 
 	}	
 	
 	/**	Get Database connexion
-	*	@param $DBname string DB name in resource.ini_ge
-	*	@param $test bool if set to true, returns error code and not database
-	*	@param $test_version bool if set to flase, does not test database version of trapDB
-	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
-	*/
+	 *	@param $DBname string DB name in resource.ini_ge
+	 *	@param $test bool if set to true, returns error code and not database
+	 *	@param $test_version bool if set to flase, does not test database version of trapDB
+	 *	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
+	 */
 	public function getDbByName($DBname,$test=false,$test_version=true)
 	{
 		try 
@@ -166,20 +166,20 @@ 
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
-		    $this->redirectNow('trapdirector/settings?idodberror=1');
-		    return null;
+			if ($test) return array(1,'No database in config.ini');
+			$this->redirectNow('trapdirector/settings?idodberror=1');
+			return null;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+			$dbconn = IcingaDbConnection::fromResourceName($dbresource);
 		}
 		catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
-		    $this->redirectNow('trapdirector/settings?idodberror=2');
-		    return null;
+			if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+			$this->redirectNow('trapdirector/settings?idodberror=2');
+			return null;
 		}
 		
 		if ($test == false) 
@@ -190,13 +190,13 @@ 
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
-		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
-		    {
-		        return array(4,"$dbresource does not look like an IDO database");
-		    }
+			$query = $dbconn->select()
+			->from('icinga_dbversion',array('version'));
+			$version=$dbconn->fetchRow($query);
+			if ( ($version == null) || ! property_exists($version,'version') )
+			{
+				return array(4,"$dbresource does not look like an IDO database");
+			}
 		}
 		catch (Exception $e)
 		{
@@ -206,15 +206,15 @@ 
 		return array(0,'');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
-    {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+	protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+	{
+		$limit = $this->params->get('limit', $limit);
+		$page = $this->params->get('page', $offset);
 
-        $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
+		$paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
-        return $paginatable;
-    }	
+		return $paginatable;
+	}	
 	
 	public function displayExitError($source,$message)
 	{	// TODO : check better ways to transmit data (with POST ?)
@@ -223,33 +223,33 @@ 
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/view')) {
+			$this->displayExitError('Permissions','No permission fo view content');
+		}		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
-        }		
+		if (! $this->Auth()->hasPermission('trapdirector/config')) {
+			$this->displayExitError('Permissions','No permission fo configure');
+		}		
 	}
 	
-    /**
-     * Check if user has write permission
-     * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
-     * @return boolean : user has permission
-     */
+	/**
+	 * Check if user has write permission
+	 * @param number $check optional : if set to 1, return true (user has permission) or false instead of displaying error page
+	 * @return boolean : user has permission
+	 */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
-            if ($check == 0)
-            {
-                $this->displayExitError('Permissions','No permission fo configure module');
-            }
-            return false;
-        }
-        return true;
+		if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+			if ($check == 0)
+			{
+				$this->displayExitError('Permissions','No permission fo configure module');
+			}
+			return false;
+		}
+		return true;
 	}
 
 	/*************************  Trap class get **********************/
@@ -269,8 +269,8 @@ 
 	/************************** MIB related **************************/
 	
 	/** Get MIBLoader class
-	*	@return MIBLoader class
-	*/
+	 *	@return MIBLoader class
+	 */
 	protected function getMIB()
 	{
 		if ($this->MIBData == null)
@@ -288,9 +288,9 @@ 
 	/**************************  Database queries *******************/
 	
 	/** Get host(s) by IP (v4 or v6) or by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -309,9 +309,9 @@ 
 	}
 
 	/** Get host(s) by name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -330,9 +330,9 @@ 
 	}	
 	
 	/** Get host groups by  name in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( name, id (object_id), display_name)
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( name, id (object_id), display_name)
+	 */
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -352,9 +352,9 @@ 
 
 	
 	/** Get host IP (v4 and v6) by name in IDO database
-	*	does not catch exceptions
-	*	@return array ( name, display_name, ip4, ip6)
-	*/
+	 *	does not catch exceptions
+	 *	@return array ( name, display_name, ip4, ip6)
+	 */
 	protected function getHostInfoByID($id) 
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -373,9 +373,9 @@ 
 
 	
 	/** Get host by objectid  in IDO database
-	*	does not catch exceptions
-	*	@return array of objects ( id, name, display_name, ip, ip6,  )
-	*/
+	 *	does not catch exceptions
+	 *	@return array of objects ( id, name, display_name, ip, ip6,  )
+	 */
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -393,10 +393,10 @@ 
 	}	
 	
 	/** Get services from object ( host_object_id) in IDO database
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -416,11 +416,11 @@ 
 	}	
 	
 	/** Get services from hostgroup object id ( hostgroup_object_id) in IDO database
-	* 	gets all hosts in hostgroup and return common services
-	*	does not catch exceptions
-	*	@param $id	int object_id
-	*	@return array display_name (of service), service_object_id
-	*/
+	 * 	gets all hosts in hostgroup and return common services
+	 *	does not catch exceptions
+	 *	@param $id	int object_id
+	 *	@return array display_name (of service), service_object_id
+	 */
 	protected function getServicesByHostGroupid($id) 
 	{		
 		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
@@ -459,7 +459,7 @@ 
 		//print_r($common_services);
 		foreach (array_keys($common_services) as $key)
 		{
-		    if ($common_services[$key]['num'] == $num_hosts)
+			if ($common_services[$key]['num'] == $num_hosts)
 			{
 				array_push($result,array($key,$common_services[$key]['name']));
 			}
@@ -469,11 +469,11 @@ 
 	}	
 
 	/** Get services object id by host name / service name in IDO database
-	*	does not catch exceptions
-	*	@param $hostname string host name
-	*	@param $name string service name
-	*	@return array  service id
-	*/
+	 *	does not catch exceptions
+	 *	@param $hostname string host name
+	 *	@param $name string service name
+	 *	@return array  service id
+	 */
 	protected function getServiceIDByName($hostname,$name) 
 	{
 		$db = $this->getIdoDb()->getConnection();
@@ -496,10 +496,10 @@ 
 	}
 	
 	/** Get object name from object_id  in IDO database
-	*	does not catch exceptions
-	*	@param int $id object_id (default to null, used first if not null)
-	*	@return array name1 (host) name2 (service)
-	*/
+	 *	does not catch exceptions
+	 *	@param int $id object_id (default to null, used first if not null)
+	 *	@return array name1 (host) name2 (service)
+	 */
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
@@ -515,9 +515,9 @@ 
 	}		
 
 	/** Add handler rule in traps DB
-	*	@param array $params : array(<db item>=><value>)
-	*	@return int inserted id
-	*/
+	 *	@param array $params : array(<db item>=><value>)
+	 *	@return int inserted id
+	 */
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
@@ -539,10 +539,10 @@ 
 	}	
 
 	/** Update handler rule in traps DB
-	*	@param array $params : (<db item>=><value>)
-	*   @param integer $ruleID : rule id in db
-	*	@return array affected rows
-	*/
+	 *	@param array $params : (<db item>=><value>)
+	 *   @param integer $ruleID : rule id in db
+	 *	@return array affected rows
+	 */
 	protected function updateHandlerRule($params,$ruleID)
 	{
 		// TODO Check for rule consistency
@@ -560,8 +560,8 @@ 
 	}	
 	
 	/** Delete rule by id
-	*	@param int $ruleID rule id
-	*/
+	 *	@param int $ruleID rule id
+	 */
 	protected function deleteRule($ruleID)
 	{
 		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
@@ -575,9 +575,9 @@ 
 	}
 
 	/** Delete trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function deleteTrap($ip,$oid)
 	{
 		
@@ -603,9 +603,9 @@ 
    
 
 	/** count trap by ip & oid
-	*	@param $ip string source IP (v4 or v6)
-	*	@param $oid string oid
-	*/
+	 *	@param $ip string source IP (v4 or v6)
+	 *	@param $oid string oid
+	 */
 	protected function countTrap($ip,$oid)
 	{
 		
@@ -631,8 +631,8 @@ 
 	}		
 	
 	/** get configuration value
-	*	@param string $element : configuration name in db
-	*/
+	 *	@param string $element : configuration name in db
+	 */
 	protected function getDBConfigValue($element)
 	{
 	
@@ -663,9 +663,9 @@ 
 	}
 
 	/** add configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 		
 	protected function addDBConfigValue($element,$value)
 	{
@@ -683,9 +683,9 @@ 
 	}
 
 	/** set configuration value
-	*	@param string $element : name of config element
-	*   @param string $value : value
-	*/
+	 *	@param string $element : name of config element
+	 *   @param string $value : value
+	 */
 	protected function setDBConfigValue($element,$value)
 	{
 	
@@ -699,13 +699,13 @@ 
 	}
 	
 	/** Check if director is installed
-	*	@return bool true/false
-	*/
+	 *	@return bool true/false
+	 */
 	protected function isDirectorInstalled()
 	{
-	    $output=array();
-	    exec('icingacli module list',$output);
-	    foreach ($output as $line)
+		$output=array();
+		exec('icingacli module list',$output);
+		foreach ($output as $line)
 		{
 			if (preg_match('/^director .*enabled/',$line))
 			{

Spacing +112 added lines, -112 removed lines

@@ -22,14 +22,14 @@ 
 
 class TrapsController extends Controller
 {
-	protected $moduleConfig;  	//< TrapModuleConfig instance
-	protected $trapTableList; 	//< TrapTableList (by date)
-	protected $trapTableHostList; 	//< TrapTableList (by hosts)
-	protected $handlerTableList; 	//< HandlerTableList instance
-	protected $trapDB;			//< Trap database
-	protected $icingaDB;		//< Icinga IDO database;
-	protected $MIBData; 		//< MIBLoader class
-	protected $trapClass;		//< Trap class for bin/trap_class.php
+	protected $moduleConfig; //< TrapModuleConfig instance
+	protected $trapTableList; //< TrapTableList (by date)
+	protected $trapTableHostList; //< TrapTableList (by hosts)
+	protected $handlerTableList; //< HandlerTableList instance
+	protected $trapDB; //< Trap database
+	protected $icingaDB; //< Icinga IDO database;
+	protected $MIBData; //< MIBLoader class
+	protected $trapClass; //< Trap class for bin/trap_class.php
 		
 	/** Get instance of TrapModuleConfig class
 	*	@return TrapModuleConfig
@@ -43,14 +43,14 @@ 
 			{
 				$this->redirectNow('trapdirector/settings?message=No database prefix');
 			}
-			$this->moduleConfig = new TrapModuleConfig($db_prefix);
+			$this->moduleConfig=new TrapModuleConfig($db_prefix);
 		}
 		return $this->moduleConfig;
 	}
 	
 	public function getTrapListTable() {
 		if ($this->trapTableList == Null) {
-			$this->trapTableList = new TrapTableList();
+			$this->trapTableList=new TrapTableList();
 			$this->trapTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->trapTableList;
@@ -60,7 +60,7 @@ 
 	{
 	    if ($this->trapTableHostList == Null) 
 		{
-	        $this->trapTableHostList = new TrapTableHostList();
+	        $this->trapTableHostList=new TrapTableHostList();
 	        $this->trapTableHostList->setConfig($this->getModuleConfig());
 	    }
 	    return $this->trapTableHostList;
@@ -70,7 +70,7 @@ 
 	{
 		if ($this->handlerTableList == Null) 
 		{
-			$this->handlerTableList = new HandlerTableList();
+			$this->handlerTableList=new HandlerTableList();
 			$this->handlerTableList->setConfig($this->getModuleConfig());
 		}
 		return $this->handlerTableList;
@@ -82,15 +82,15 @@ 
 	*	@param $test_version bool if set to flase, does not test database version of trapDB
 	*	@return array<integer,mixed>|mixed : if test=false, returns DB connexion, else array(error_num,message) or null on error.
 	*/
-	public function getDbByName($DBname,$test=false,$test_version=true)
+	public function getDbByName($DBname, $test=false, $test_version=true)
 	{
 		try 
 		{
-			$dbconn = IcingaDbConnection::fromResourceName($DBname);
+			$dbconn=IcingaDbConnection::fromResourceName($DBname);
 		} 
 		catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) return array(2, $DBname);
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -101,37 +101,37 @@ 
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
 			try
 			{
-				$query = $db->select()
-					->from($this->getModuleConfig()->getDbConfigTableName(),'value')
+				$query=$db->select()
+					->from($this->getModuleConfig()->getDbConfigTableName(), 'value')
 					->where('name=\'db_version\'');
 				$version=$db->fetchRow($query);
-				if ( ($version == null) || ! property_exists($version,'value') )
+				if (($version == null) || !property_exists($version, 'value'))
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) return array(4, $DBname);
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) return array(5, $version->value, $this->getModuleConfig()->getDbMinVersion());
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
 			}
 			catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) return array(3, $DBname, $e->getMessage());
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) return array(0, '');
 		return $dbconn;
 	}
 
@@ -142,17 +142,17 @@ 
 	 */
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test=false) return $this->trapDB;
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{	
-			if ($test) return array(1,'');
+			if ($test) return array(1, '');
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
-		$retDB=$this->getDbByName($dbresource,$test,true);
+		$retDB=$this->getDbByName($dbresource, $test, true);
 		if ($test == true) return $retDB;
 		$this->trapDB=$retDB;
 		return $this->trapDB;
@@ -160,78 +160,78 @@ 
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test=false) return $this->icingaDB;
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
+		$dbresource=$this->Config()->get('config', 'IDOdatabase'); ;
 
-		if ( ! $dbresource )
+		if (!$dbresource)
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) return array(1, 'No database in config.ini');
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
 		
 		try
 		{
-		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+		    $dbconn=IcingaDbConnection::fromResourceName($dbresource);
 		}
 		catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) return array(2, "Database $dbresource does not exists in IcingaWeb2");
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
 		
 		if ($test == false) 
 		{ 
-			$this->icingaDB = $dbconn; 
+			$this->icingaDB=$dbconn; 
 			return $this->icingaDB;
 		}
 		
 		try
 		{
-		    $query = $dbconn->select()
-		    ->from('icinga_dbversion',array('version'));
+		    $query=$dbconn->select()
+		    ->from('icinga_dbversion', array('version'));
 		    $version=$dbconn->fetchRow($query);
-		    if ( ($version == null) || ! property_exists($version,'version') )
+		    if (($version == null) || !property_exists($version, 'version'))
 		    {
-		        return array(4,"$dbresource does not look like an IDO database");
+		        return array(4, "$dbresource does not look like an IDO database");
 		    }
 		}
 		catch (Exception $e)
 		{
-			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
+			return array(3, "Error connecting to $dbresource : ".$e->getMessage());
 		}
 		
-		return array(0,'');
+		return array(0, '');
 	}
 	
-    protected function applyPaginationLimits(Paginatable $paginatable, $limit = 25, $offset = null)
+    protected function applyPaginationLimits(Paginatable $paginatable, $limit=25, $offset=null)
     {
-        $limit = $this->params->get('limit', $limit);
-        $page = $this->params->get('page', $offset);
+        $limit=$this->params->get('limit', $limit);
+        $page=$this->params->get('page', $offset);
 
         $paginatable->limit($limit, $page > 0 ? ($page - 1) * $limit : 0);
 
         return $paginatable;
     }	
 	
-	public function displayExitError($source,$message)
+	public function displayExitError($source, $message)
 	{	// TODO : check better ways to transmit data (with POST ?)
 		$this->redirectNow('trapdirector/error?source='.$source.'&message='.$message);
 	}
 	
 	protected function checkReadPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/view')) {
-            $this->displayExitError('Permissions','No permission fo view content');
+        if (!$this->Auth()->hasPermission('trapdirector/view')) {
+            $this->displayExitError('Permissions', 'No permission fo view content');
         }		
 	}
 
 	protected function checkConfigPermission()
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/config')) {
-            $this->displayExitError('Permissions','No permission fo configure');
+        if (!$this->Auth()->hasPermission('trapdirector/config')) {
+            $this->displayExitError('Permissions', 'No permission fo configure');
         }		
 	}
 	
@@ -242,10 +242,10 @@ 
      */
 	protected function checkModuleConfigPermission($check=0)
 	{
-        if (! $this->Auth()->hasPermission('trapdirector/module_config')) {
+        if (!$this->Auth()->hasPermission('trapdirector/module_config')) {
             if ($check == 0)
             {
-                $this->displayExitError('Permissions','No permission fo configure module');
+                $this->displayExitError('Permissions', 'No permission fo configure module');
             }
             return false;
         }
@@ -257,10 +257,10 @@ 
 	{ // TODO : try/catch here ? or within caller
 		if ($this->trapClass == null)
 		{
-			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;
-			$this->trapClass = new Trap($icingaweb2_etc);
+			$this->trapClass=new Trap($icingaweb2_etc);
 			//$Trap->setLogging($debug_level,'syslog');
 		}
 		return $this->trapClass;
@@ -294,12 +294,12 @@ 
 	protected function getHostByIP($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -315,12 +315,12 @@ 
 	protected function getHostByName($name) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
@@ -336,12 +336,12 @@ 
 	protected function getHostGroupByName($ip) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		// TODO : check for SQL injections
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'object_id'))
+					array('name' => 'a.name1', 'id' => 'object_id'))
 				->join(
 					array('b' => 'icinga_hostgroups'),
 					'b.hostgroup_object_id=a.object_id',
@@ -357,8 +357,8 @@ 
 	*/
 	protected function getHostInfoByID($id) 
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
@@ -378,17 +378,17 @@ 
 	*/
 	protected function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
 	{
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name' => 'a.name1','id' => 'a.object_id'))
+					array('name' => 'a.name1', 'id' => 'a.object_id'))
 				->join(
 					array('b' => 'icinga_hosts'),
 					'b.host_object_id=a.object_id',
-					array('display_name' => 'b.display_name' , 'ip' => 'b.address', 'ip6' => 'b.address6'))
-				->where('a.object_id = ?',$id);
+					array('display_name' => 'b.display_name', 'ip' => 'b.address', 'ip6' => 'b.address6'))
+				->where('a.object_id = ?', $id);
 		return $db->fetchRow($query);
 	}	
 	
@@ -400,16 +400,16 @@ 
 	protected function getServicesByHostid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
-					array('is_active'=>'a.is_active','name2'=>'a.name2'))
+					array('is_active'=>'a.is_active', 'name2'=>'a.name2'))
 				->where('s.host_object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchAll($query);
@@ -423,8 +423,8 @@ 
 	*/
 	protected function getServicesByHostGroupid($id) 
 	{		
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_hostgroup_members'),
@@ -441,11 +441,11 @@ 
 		foreach ($hosts as $key => $host)
 		{ // For each host, get all services and add in common_services if not found or add counter
 			$host_services=$this->getServicesByHostid($host->host_object_id);
-			foreach($host_services as $service)
+			foreach ($host_services as $service)
 			{
 				if (isset($common_services[$service->name2]['num']))
 				{
-					$common_services[$service->name2]['num'] +=1;
+					$common_services[$service->name2]['num']+=1;
 				}
 				else
 				{
@@ -461,7 +461,7 @@ 
 		{
 		    if ($common_services[$key]['num'] == $num_hosts)
 			{
-				array_push($result,array($key,$common_services[$key]['name']));
+				array_push($result, array($key, $common_services[$key]['name']));
 			}
 		}
 		
@@ -474,9 +474,9 @@ 
 	*	@param $name string service name
 	*	@return array  service id
 	*/
-	protected function getServiceIDByName($hostname,$name) 
+	protected function getServiceIDByName($hostname, $name) 
 	{
-		$db = $this->getIdoDb()->getConnection();
+		$db=$this->getIdoDb()->getConnection();
 		if ($name == null)
 		{
 			return array();
@@ -485,7 +485,7 @@ 
 		$query=$db->select()
 				->from(
 					array('s' => 'icinga_services'),
-					array('name' => 's.display_name','id' => 's.service_object_id'))
+					array('name' => 's.display_name', 'id' => 's.service_object_id'))
 				->join(
 					array('a' => 'icinga_objects'),
 					's.service_object_id=a.object_id',
@@ -503,12 +503,12 @@ 
 	protected function getObjectNameByid($id) 
 	{
 		// select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-		if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-		$db = $this->getIdoDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+		$db=$this->getIdoDb()->getConnection();
 		$query=$db->select()
 				->from(
 					array('a' => 'icinga_objects'),
-					array('name1' => 'a.name1','name2' => 'a.name2'))
+					array('name1' => 'a.name1', 'name2' => 'a.name2'))
 				->where('a.object_id='.$id.' AND a.is_active = 1');
 
 		return $db->fetchRow($query);
@@ -521,17 +521,17 @@ 
 	protected function addHandlerRule($params)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// 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->Auth()->getUser()->getUsername();
+		$params['created']=new Zend_Db_Expr('NOW()');
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$query=$db->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$params
 		);
-		if($query==false)
+		if ($query == false)
 		{
 		  return null;
 		}
@@ -543,13 +543,13 @@ 
 	*   @param integer $ruleID : rule id in db
 	*	@return array affected rows
 	*/
-	protected function updateHandlerRule($params,$ruleID)
+	protected function updateHandlerRule($params, $ruleID)
 	{
 		// TODO Check for rule consistency
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		// Add last modified date = creation date and username
-		$params['modified'] = new 	Zend_Db_Expr('NOW()');
-		$params['modifier'] = $this->Auth()->getUser()->getUsername();
+		$params['modified']=new 	Zend_Db_Expr('NOW()');
+		$params['modifier']=$this->Auth()->getUser()->getUsername();
 		
 		$numRows=$db->update(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -564,8 +564,8 @@ 
 	*/
 	protected function deleteRule($ruleID)
 	{
-		if (!preg_match('/^[0-9]+$/',$ruleID)) { throw new Exception('Invalid id');  }
-		$db = $this->getDb()->getConnection();
+		if (!preg_match('/^[0-9]+$/', $ruleID)) { throw new Exception('Invalid id'); }
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapRuleName(),
@@ -578,10 +578,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function deleteTrap($ip,$oid)
+	protected function deleteTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -589,10 +589,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=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -606,10 +606,10 @@ 
 	*	@param $ip string source IP (v4 or v6)
 	*	@param $oid string oid
 	*/
-	protected function countTrap($ip,$oid)
+	protected function countTrap($ip, $oid)
 	{
 		
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$condition=null;
 		if ($ip != null)
 		{
@@ -617,10 +617,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=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -636,27 +636,27 @@ 
 	protected function getDBConfigValue($element)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>'value'))
-			->where('name=?',$element);
+			->where('name=?', $element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row == null)  // value does not exists
 		{
 			$default=$this->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 ($return_row->value == null) // value id empty
 		{
 			$default=$this->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 $return_row->value;		
@@ -667,10 +667,10 @@ 
 	*   @param string $value : value
 	*/
 		
-	protected function addDBConfigValue($element,$value)
+	protected function addDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		
 		$query=$db->insert(
 				$this->getModuleConfig()->getDbConfigTableName(),
@@ -686,10 +686,10 @@ 
 	*	@param string $element : name of config element
 	*   @param string $value : value
 	*/
-	protected function setDBConfigValue($element,$value)
+	protected function setDBConfigValue($element, $value)
 	{
 	
-		$db = $this->getDb()->getConnection();
+		$db=$this->getDb()->getConnection();
 		$query=$db->update(
 				$this->getModuleConfig()->getDbConfigTableName(),
 				array('value'=>$value),
@@ -704,10 +704,10 @@ 
 	protected function isDirectorInstalled()
 	{
 	    $output=array();
-	    exec('icingacli module list',$output);
+	    exec('icingacli module list', $output);
 	    foreach ($output as $line)
 		{
-			if (preg_match('/^director .*enabled/',$line))
+			if (preg_match('/^director .*enabled/', $line))
 			{
 				return true;
 			}

Braces +62 added lines, -30 removed lines

@@ -87,10 +87,11 @@ 
 		try 
 		{
 			$dbconn = IcingaDbConnection::fromResourceName($DBname);
-		} 
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-			if ($test) return array(2,$DBname);
+			if ($test) {
+				return array(2,$DBname);
+			}
 			$this->redirectNow('trapdirector/settings?dberror=2');
 			return null;
 		}
@@ -98,10 +99,11 @@ 
 			try 
 			{
 				$db=$dbconn->getConnection();
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=3');
 				return null;
 			}
@@ -113,25 +115,32 @@ 
 				$version=$db->fetchRow($query);
 				if ( ($version == null) || ! property_exists($version,'value') )
 				{
-					if ($test) return array(4,$DBname);
+					if ($test) {
+						return array(4,$DBname);
+					}
 					$this->redirectNow('trapdirector/settings?dberror=4');
 					return null;
 				}
 				if ($version->value < $this->getModuleConfig()->getDbMinVersion()) 
 				{
-					if ($test) return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					if ($test) {
+						return array(5,$version->value,$this->getModuleConfig()->getDbMinVersion());
+					}
 					$this->redirectNow('trapdirector/settings?dberror=5');
 					return null;
 				}
-			}
-			catch (Exception $e) 
+			} catch (Exception $e) 
 			{
-				if ($test) return array(3,$DBname,$e->getMessage());
+				if ($test) {
+					return array(3,$DBname,$e->getMessage());
+				}
 				$this->redirectNow('trapdirector/settings?dberror=4');
 				return null;
 			}
 		}
-		if ($test) return array(0,'');
+		if ($test) {
+			return array(0,'');
+		}
 		return $dbconn;
 	}
 
@@ -142,31 +151,41 @@ 
 	 */
 	public function getDb($test=false)
 	{
-		if ($this->trapDB != null && $test = false) return $this->trapDB;
+		if ($this->trapDB != null && $test = false) {
+			return $this->trapDB;
+		}
 		
 		$dbresource=$this->Config()->get('config', 'database');
 		
 		if ( ! $dbresource )
 		{	
-			if ($test) return array(1,'');
+			if ($test) {
+				return array(1,'');
+			}
 			$this->redirectNow('trapdirector/settings?dberror=1');
 			return null;
 		}
 		$retDB=$this->getDbByName($dbresource,$test,true);
-		if ($test == true) return $retDB;
+		if ($test == true) {
+			return $retDB;
+		}
 		$this->trapDB=$retDB;
 		return $this->trapDB;
 	}
 	
 	public function getIdoDb($test=false)
 	{
-		if ($this->icingaDB != null && $test = false) return $this->icingaDB;
+		if ($this->icingaDB != null && $test = false) {
+			return $this->icingaDB;
+		}
 		// TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
 		$dbresource=$this->Config()->get('config', 'IDOdatabase');;
 
 		if ( ! $dbresource )
 		{
-		    if ($test) return array(1,'No database in config.ini');
+		    if ($test) {
+		    	return array(1,'No database in config.ini');
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=1');
 		    return null;
 		}
@@ -174,10 +193,11 @@ 
 		try
 		{
 		    $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
-		    if ($test) return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    if ($test) {
+		    	return array(2,"Database $dbresource does not exists in IcingaWeb2");
+		    }
 		    $this->redirectNow('trapdirector/settings?idodberror=2');
 		    return null;
 		}
@@ -197,8 +217,7 @@ 
 		    {
 		        return array(4,"$dbresource does not look like an IDO database");
 		    }
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			return array(3,"Error connecting to $dbresource : " . $e->getMessage());
 		}
@@ -446,8 +465,7 @@ 
 				if (isset($common_services[$service->name2]['num']))
 				{
 					$common_services[$service->name2]['num'] +=1;
-				}
-				else
+				} else
 				{
 					$common_services[$service->name2]['num']=1;
 					$common_services[$service->name2]['name']=$service->name;
@@ -592,7 +610,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return null;
+		if($condition === null) {
+			return null;
+		}
 		$query=$db->delete(
 			$this->getModuleConfig()->getTrapTableName(),
 			$condition
@@ -620,7 +640,9 @@ 
 			$condition=($condition===null)?'':$condition.' AND ';
 			$condition.="trap_oid='$oid'";
 		}
-		if($condition === null) return 0;
+		if($condition === null) {
+			return 0;
+		}
 		$query=$db->select()
 			->from(
 				$this->getModuleConfig()->getTrapTableName(),
@@ -644,18 +666,28 @@ 
 				array('value'=>'value'))
 			->where('name=?',$element);
 		$return_row=$db->fetchRow($query);
-		if ($return_row==null)  // value does not exists
+		if ($return_row==null) {
+			// value does not exists
 		{
 			$default=$this->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 ($return_row->value == null) // value id empty
+		if ($return_row->value == null) {
+			// value id empty
 		{
 			$default=$this->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];			
 		}

library/Trapdirector/TrapsProcess/Database.php

Braces +7 added lines, -7 removed lines

@@ -171,8 +171,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -217,8 +216,7 @@ 
         if ($this->trapDBType == 'pgsql')
         {
             $prefix .= 'update_pgsql/schema_';
-        }
-        else
+        } else
         {
             $prefix .= 'update_sql/schema_';
         }
@@ -264,7 +262,10 @@ 
             $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             while (($line=fgets($input_stream)) !== false)
             {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
+                if (preg_match('/^#/', $line)) {
+                	continue;
+                }
+                // ignore comment lines
                 $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
                 if (preg_match('/; *$/', $newline))
                 {
@@ -276,8 +277,7 @@ 
                     if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
                     {
                         $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
+                    } else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;

Indentation +296 added lines, -296 removed lines

@@ -11,330 +11,330 @@
 class Database
 {
 
-    // Databases
-    protected $trapDB=null; //< trap database
-    protected $idoDB=null; //< ido database
-    public $trapDBType; //< Type of database for traps (mysql, pgsql)
-    public $idoDBType; //< Type of database for ido (mysql, pgsql)
+	// Databases
+	protected $trapDB=null; //< trap database
+	protected $idoDB=null; //< ido database
+	public $trapDBType; //< Type of database for traps (mysql, pgsql)
+	public $idoDBType; //< Type of database for ido (mysql, pgsql)
     
-    protected $trapDSN; //< trap database connection params
-    protected $trapUsername; //< trap database connection params
-    protected $trapPass; //< trap database connection params
-    public $dbPrefix; //< database tables prefix
+	protected $trapDSN; //< trap database connection params
+	protected $trapUsername; //< trap database connection params
+	protected $trapPass; //< trap database connection params
+	public $dbPrefix; //< database tables prefix
     
-    protected $idoSet; //< bool true is ido database set
-    protected $idoDSN; //< trap database connection params
-    protected $idoUsername; //< trap database connection params
-    protected $idoPass; //< trap database connection params
+	protected $idoSet; //< bool true is ido database set
+	protected $idoDSN; //< trap database connection params
+	protected $idoUsername; //< trap database connection params
+	protected $idoPass; //< trap database connection params
     
-    // Logging function
+	// Logging function
     
-    protected $logging; //< logging class
+	protected $logging; //< logging class
     
-    /**
-     * @param Logging $logClass : where to log
-     * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
-     */
-    function __construct($logClass,$dbParam,$dbPrefix)
-    {
-        $this->logging=$logClass;
-        $this->dbPrefix=$dbPrefix;
+	/**
+	 * @param Logging $logClass : where to log
+	 * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
+	 */
+	function __construct($logClass,$dbParam,$dbPrefix)
+	{
+		$this->logging=$logClass;
+		$this->dbPrefix=$dbPrefix;
         
-        $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
-        $this->db_connect_trap();
+		$this->trapDSN=$this->setupDSN($dbParam);
+		$this->trapUsername = $dbParam['username'];
+		$this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->trapDBType=$dbParam['db'];
+		$this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+		$this->db_connect_trap();
         
-    }
+	}
     
-    /**
-     * Setup and connect to IDO database
-     * @param array $dbParam : array of named params
-     */
-    public function setupIDO($dbParam)
-    {
-        $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
-        $this->idoDBType=$dbParam['db'];
-        $this->db_connect_ido();
-    }
+	/**
+	 * Setup and connect to IDO database
+	 * @param array $dbParam : array of named params
+	 */
+	public function setupIDO($dbParam)
+	{
+		$this->idoDSN=$this->setupDSN($dbParam);
+		$this->idoUsername = $dbParam['username'];
+		$this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+		$this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+		$this->idoDBType=$dbParam['db'];
+		$this->db_connect_ido();
+	}
     
-    /**
-     * Connect to IDO database
-     * @return \PDO
-     */
-    public function db_connect_ido()
-    {
-        if ($this->idoDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->idoDB->query('select 1')->fetchColumn();
-                return $this->idoDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
-            }
-        }
-        try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->idoDB;
-    }
+	/**
+	 * Connect to IDO database
+	 * @return \PDO
+	 */
+	public function db_connect_ido()
+	{
+		if ($this->idoDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->idoDB->query('select 1')->fetchColumn();
+				return $this->idoDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database IDO connection lost, reconnecting',WARN);
+			}
+		}
+		try {
+			$this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->idoDB;
+	}
     
-    /**
-     * Connect to Trap database
-     * @return \PDO
-     */
-    public function db_connect_trap()
-    {
+	/**
+	 * Connect to Trap database
+	 * @return \PDO
+	 */
+	public function db_connect_trap()
+	{
         
-        if ($this->trapDB != null) {
-            // Check if connection is still alive
-            try {
-                $this->trapDB->query('select 1')->fetchColumn();
-                return $this->trapDB;
-            } catch (Exception $e) {
-                // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
-            }           
-        }       
-        try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
-        } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
-        }
-        return $this->trapDB;
-    }
+		if ($this->trapDB != null) {
+			// Check if connection is still alive
+			try {
+				$this->trapDB->query('select 1')->fetchColumn();
+				return $this->trapDB;
+			} catch (Exception $e) {
+				// select 1 failed, try to reconnect.
+				$this->logging->log('Database connection lost, reconnecting',WARN);
+			}           
+		}       
+		try {
+			$this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+		} catch (PDOException $e) {
+			$this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+		}
+		return $this->trapDB;
+	}
     
-    /**
-     * Setup dsn and check parameters
-     * @param array $configElmt
-     * @return string
-     */
-    protected function setupDSN($configElmt)  
-    {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
-        {
-            $this->logging->log('Missing DB params',ERROR);
-            return ''; 
-        }
+	/**
+	 * Setup dsn and check parameters
+	 * @param array $configElmt
+	 * @return string
+	 */
+	protected function setupDSN($configElmt)  
+	{
+		if (!array_key_exists('db',$configElmt) ||
+			!array_key_exists('host',$configElmt) ||
+			!array_key_exists('dbname',$configElmt) ||
+			!array_key_exists('username',$configElmt))
+		{
+			$this->logging->log('Missing DB params',ERROR);
+			return ''; 
+		}
         
-        //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+		//	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
+		$dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
-        if (array_key_exists('port', $configElmt))
-        {
-            $dsn .= ';port='.$configElmt['port'];
-        }
-        return $dsn;
-    }
+		if (array_key_exists('port', $configElmt))
+		{
+			$dsn .= ';port='.$configElmt['port'];
+		}
+		return $dsn;
+	}
 
     
-    /** Create database schema
-     *	@param $schema_file	string File to read schema from
-     *	@param $table_prefix string to replace #PREFIX# in schema file by this
-     */
-    public function create_schema($schema_file,$table_prefix)
-    {
-        //Read data from snmptrapd from stdin
-        $input_stream=fopen($schema_file, 'r');
+	/** Create database schema
+	 *	@param $schema_file	string File to read schema from
+	 *	@param $table_prefix string to replace #PREFIX# in schema file by this
+	 */
+	public function create_schema($schema_file,$table_prefix)
+	{
+		//Read data from snmptrapd from stdin
+		$input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
-        {
-            $this->logging->log("Error reading schema !",ERROR,'');
-            return;
-        }
-        $newline='';
-        $cur_table='';
-        $cur_table_array=array();
-        $db_conn=$this->db_connect_trap();
+		if ($input_stream=== false)
+		{
+			$this->logging->log("Error reading schema !",ERROR,'');
+			return;
+		}
+		$newline='';
+		$cur_table='';
+		$cur_table_array=array();
+		$db_conn=$this->db_connect_trap();
         
-        while (($line=fgets($input_stream)) !== false)
-        {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-            if (preg_match('/; *$/', $newline))
-            {
-                $sql= $newline;
-                if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                    return;
-                }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
-                {
-                    $cur_table='table '.$cur_table_array[1];
-                }
-                else
-                {
-                    $cur_table='secret SQL stuff :-)';
-                }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
-                $newline='';
-            }
-        }
+		while (($line=fgets($input_stream)) !== false)
+		{
+			$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+			if (preg_match('/; *$/', $newline))
+			{
+				$sql= $newline;
+				if ($db_conn->query($sql) === false) {
+					$this->logging->log('Error create schema : '.$sql,ERROR,'');
+					return;
+				}
+				if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+				{
+					$cur_table='table '.$cur_table_array[1];
+				}
+				else
+				{
+					$cur_table='secret SQL stuff :-)';
+				}
+				$this->logging->log('Creating : ' . $cur_table,INFO );
+				$newline='';
+			}
+		}
         
-        $sql= $newline;
-        if ($sql != '' )
-        {
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
-                return;
-            }
-        }
-        $this->logging->log('Schema created',INFO);
-    }
+		$sql= $newline;
+		if ($sql != '' )
+		{
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Error create schema : '.$sql,ERROR,'');
+				return;
+			}
+		}
+		$this->logging->log('Schema created',INFO);
+	}
     
-    /**
-     * Update database schema from current (as set in db) to $target_version
-     *     @param $prefix string file prefix of sql update File
-     *     @param $target_version int target db version number
-     *     @param $table_prefix string to replace #PREFIX# in schema file by this
-     *     @param bool $getmsg : only get messages from version upgrades
-     *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
-     */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
-    {
-        // Get current db number
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
-            return 'ERROR';
-        }
-        $version=$ret_code->fetchAll();
-        $cur_version=$version[0]['value'];
+	/**
+	 * Update database schema from current (as set in db) to $target_version
+	 *     @param $prefix string file prefix of sql update File
+	 *     @param $target_version int target db version number
+	 *     @param $table_prefix string to replace #PREFIX# in schema file by this
+	 *     @param bool $getmsg : only get messages from version upgrades
+	 *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
+	 */
+	public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+	{
+		// Get current db number
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+			return 'ERROR';
+		}
+		$version=$ret_code->fetchAll();
+		$cur_version=$version[0]['value'];
         
-        if ($this->trapDBType == 'pgsql')
-        {
-            $prefix .= 'update_pgsql/schema_';
-        }
-        else
-        {
-            $prefix .= 'update_sql/schema_';
-        }
-        //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
-        if ($getmsg === true)
-        {
-            return $this->update_schema_message($prefix, $cur_version, $target_version);
-        }
+		if ($this->trapDBType == 'pgsql')
+		{
+			$prefix .= 'update_pgsql/schema_';
+		}
+		else
+		{
+			$prefix .= 'update_sql/schema_';
+		}
+		//echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
+		if ($getmsg === true)
+		{
+			return $this->update_schema_message($prefix, $cur_version, $target_version);
+		}
         
-        if ($this->update_schema_do($prefix, $cur_version, $target_version, $table_prefix) === true)
-        {
-            return 'ERROR';
-        }
-        return '';
+		if ($this->update_schema_do($prefix, $cur_version, $target_version, $table_prefix) === true)
+		{
+			return 'ERROR';
+		}
+		return '';
 
-    }
+	}
 
-    /**
-     * Update database schema from current (as set in db) to $target_version
-     *     @param string $prefix  file prefix of sql update File
-     *     @param int $cur_version  current db version number
-     *     @param int $target_version  target db version number
-     *     @param string $table_prefix   to replace #PREFIX# in schema file by this
-     *     @return bool : true on error
-     */
-    public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
-    {
-        while($cur_version<$target_version)
-        { // TODO : execute pre & post scripts
-            $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-            $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
-            {
-                $this->logging->log("Error reading update file ". $updateFile,ERROR);
-                return true;
-            }
-            $newline='';
-            $db_conn=$this->db_connect_trap();
-            $db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            while (($line=fgets($input_stream)) !== false)
-            {
-                if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
-                if (preg_match('/; *$/', $newline))
-                {
-                    $sql_req=$db_conn->prepare($newline);
-                    if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,ERROR);
-                        return true;
-                    }
-                    $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
-                    {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
-                    }
-                    else
-                    {
-                        $cur_table='secret SQL stuff :-)';
-                        //$cur_table=$newline;
-                    }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+	/**
+	 * Update database schema from current (as set in db) to $target_version
+	 *     @param string $prefix  file prefix of sql update File
+	 *     @param int $cur_version  current db version number
+	 *     @param int $target_version  target db version number
+	 *     @param string $table_prefix   to replace #PREFIX# in schema file by this
+	 *     @return bool : true on error
+	 */
+	public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
+	{
+		while($cur_version<$target_version)
+		{ // TODO : execute pre & post scripts
+			$cur_version++;
+			$this->logging->log('Updating to version : ' .$cur_version ,INFO );
+			$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+			$input_stream=fopen($updateFile, 'r');
+			if ($input_stream=== false)
+			{
+				$this->logging->log("Error reading update file ". $updateFile,ERROR);
+				return true;
+			}
+			$newline='';
+			$db_conn=$this->db_connect_trap();
+			$db_conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			while (($line=fgets($input_stream)) !== false)
+			{
+				if (preg_match('/^#/', $line)) continue; // ignore comment lines
+				$newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+				if (preg_match('/; *$/', $newline))
+				{
+					$sql_req=$db_conn->prepare($newline);
+					if ($sql_req->execute() === false) {
+						$this->logging->log('Error create schema : '.$newline,ERROR);
+						return true;
+					}
+					$cur_table_array=array();
+					if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+					{
+						$cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+					}
+					else
+					{
+						$cur_table='secret SQL stuff :-)';
+						//$cur_table=$newline;
+					}
+					$this->logging->log('Doing : ' . $cur_table,INFO );
                     
-                    $newline='';
-                }
-            }
-            fclose($input_stream);
+					$newline='';
+				}
+			}
+			fclose($input_stream);
             
-            $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
-            if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
-                return true;
-            }
+			$sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
+			$this->logging->log('SQL query : '.$sql,DEBUG );
+			if ($db_conn->query($sql) === false) {
+				$this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
+				return true;
+			}
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
-        }
-        return false;
-    }
+			$this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+		}
+		return false;
+	}
     
-    /**
-     * Get database message for update to $target_version
-     *     @param string $prefix  file prefix of sql update File
-     *     @param int $cur_version  current db version number
-     *     @param int $target_version  target db version number
-     *     @return string : return messages or 'ERROR'.
-     */
-    private function update_schema_message($prefix,$cur_version,$target_version)
-    {
+	/**
+	 * Get database message for update to $target_version
+	 *     @param string $prefix  file prefix of sql update File
+	 *     @param int $cur_version  current db version number
+	 *     @param int $target_version  target db version number
+	 *     @return string : return messages or 'ERROR'.
+	 */
+	private function update_schema_message($prefix,$cur_version,$target_version)
+	{
  
-        $message='';
-        $this->logging->log('getting message for upgrade',DEBUG );
-        while($cur_version<$target_version)
-        {
-            $cur_version++;
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
-            $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
-            {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
-                return 'ERROR';
-            }
-            do 
-            { 
-                $line=fgets($input_stream); 
-            }
-            while ($line !== false && !preg_match('/#MESSAGE/',$line));
-            fclose($input_stream);
-            if ($line === false)
-            {
-                $this->logging->log("No message in file ". $updateFile,2,'');
-                return '';
-            }
-            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
-        }
-        return $message;
-    }
+		$message='';
+		$this->logging->log('getting message for upgrade',DEBUG );
+		while($cur_version<$target_version)
+		{
+			$cur_version++;
+			$updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+			$input_stream=fopen($updateFile, 'r');
+			if ($input_stream=== false)
+			{
+				$this->logging->log("Error reading update file ". $updateFile,2,'');
+				return 'ERROR';
+			}
+			do 
+			{ 
+				$line=fgets($input_stream); 
+			}
+			while ($line !== false && !preg_match('/#MESSAGE/',$line));
+			fclose($input_stream);
+			if ($line === false)
+			{
+				$this->logging->log("No message in file ". $updateFile,2,'');
+				return '';
+			}
+			$message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+		}
+		return $message;
+	}
     
 }
\ No newline at end of file

Spacing +60 added lines, -60 removed lines

@@ -35,16 +35,16 @@ 
      * @param Logging $logClass : where to log
      * @param array $dbParam : array of named params  type,host,dbname,username,[port],[password]
      */
-    function __construct($logClass,$dbParam,$dbPrefix)
+    function __construct($logClass, $dbParam, $dbPrefix)
     {
         $this->logging=$logClass;
         $this->dbPrefix=$dbPrefix;
         
         $this->trapDSN=$this->setupDSN($dbParam);
-        $this->trapUsername = $dbParam['username'];
-        $this->trapPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
+        $this->trapUsername=$dbParam['username'];
+        $this->trapPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
         $this->trapDBType=$dbParam['db'];
-        $this->logging->log('DSN : '.$this->trapDSN. ';user '.$this->trapUsername.' / prefix : '. $this->dbPrefix,INFO);
+        $this->logging->log('DSN : '.$this->trapDSN.';user '.$this->trapUsername.' / prefix : '.$this->dbPrefix, INFO);
         $this->db_connect_trap();
         
     }
@@ -56,9 +56,9 @@ 
     public function setupIDO($dbParam)
     {
         $this->idoDSN=$this->setupDSN($dbParam);
-        $this->idoUsername = $dbParam['username'];
-        $this->idoPass = (array_key_exists('password', $dbParam)) ? $dbParam['password']:'';
-        $this->logging->log('DSN : '.$this->idoDSN. ';user '.$this->idoUsername,INFO);
+        $this->idoUsername=$dbParam['username'];
+        $this->idoPass=(array_key_exists('password', $dbParam)) ? $dbParam['password'] : '';
+        $this->logging->log('DSN : '.$this->idoDSN.';user '.$this->idoUsername, INFO);
         $this->idoDBType=$dbParam['db'];
         $this->db_connect_ido();
     }
@@ -76,13 +76,13 @@ 
                 return $this->idoDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database IDO connection lost, reconnecting',WARN);
+                $this->logging->log('Database IDO connection lost, reconnecting', WARN);
             }
         }
         try {
-            $this->idoDB = new PDO($this->idoDSN,$this->idoUsername,$this->idoPass);
+            $this->idoDB=new PDO($this->idoDSN, $this->idoUsername, $this->idoPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed to IDO : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed to IDO : '.$e->getMessage(), ERROR, '');
         }
         return $this->idoDB;
     }
@@ -101,13 +101,13 @@ 
                 return $this->trapDB;
             } catch (Exception $e) {
                 // select 1 failed, try to reconnect.
-                $this->logging->log('Database connection lost, reconnecting',WARN);
+                $this->logging->log('Database connection lost, reconnecting', WARN);
             }           
         }       
         try {
-            $this->trapDB = new PDO($this->trapDSN,$this->trapUsername,$this->trapPass);
+            $this->trapDB=new PDO($this->trapDSN, $this->trapUsername, $this->trapPass);
         } catch (PDOException $e) {
-            $this->logging->log('Connection failed : ' . $e->getMessage(),ERROR,'');
+            $this->logging->log('Connection failed : '.$e->getMessage(), ERROR, '');
         }
         return $this->trapDB;
     }
@@ -119,21 +119,21 @@ 
      */
     protected function setupDSN($configElmt)  
     {
-        if (!array_key_exists('db',$configElmt) ||
-            !array_key_exists('host',$configElmt) ||
-            !array_key_exists('dbname',$configElmt) ||
-            !array_key_exists('username',$configElmt))
+        if (!array_key_exists('db', $configElmt) ||
+            !array_key_exists('host', $configElmt) ||
+            !array_key_exists('dbname', $configElmt) ||
+            !array_key_exists('username', $configElmt))
         {
-            $this->logging->log('Missing DB params',ERROR);
+            $this->logging->log('Missing DB params', ERROR);
             return ''; 
         }
         
         //	$dsn = 'mysql:dbname=traps;host=127.0.0.1';
-        $dsn= $configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
+        $dsn=$configElmt['db'].':dbname='.$configElmt['dbname'].';host='.$configElmt['host'];
         
         if (array_key_exists('port', $configElmt))
         {
-            $dsn .= ';port='.$configElmt['port'];
+            $dsn.=';port='.$configElmt['port'];
         }
         return $dsn;
     }
@@ -143,14 +143,14 @@ 
      *	@param $schema_file	string File to read schema from
      *	@param $table_prefix string to replace #PREFIX# in schema file by this
      */
-    public function create_schema($schema_file,$table_prefix)
+    public function create_schema($schema_file, $table_prefix)
     {
         //Read data from snmptrapd from stdin
         $input_stream=fopen($schema_file, 'r');
         
-        if ($input_stream=== false)
+        if ($input_stream === false)
         {
-            $this->logging->log("Error reading schema !",ERROR,'');
+            $this->logging->log("Error reading schema !", ERROR, '');
             return;
         }
         $newline='';
@@ -160,15 +160,15 @@ 
         
         while (($line=fgets($input_stream)) !== false)
         {
-            $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+            $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
             if (preg_match('/; *$/', $newline))
             {
-                $sql= $newline;
+                $sql=$newline;
                 if ($db_conn->query($sql) === false) {
-                    $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                    $this->logging->log('Error create schema : '.$sql, ERROR, '');
                     return;
                 }
-                if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
+                if (preg_match('/^ *CREATE TABLE ([^ ]+)/', $newline, $cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
                 }
@@ -176,20 +176,20 @@ 
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
-                $this->logging->log('Creating : ' . $cur_table,INFO );
+                $this->logging->log('Creating : '.$cur_table, INFO);
                 $newline='';
             }
         }
         
-        $sql= $newline;
-        if ($sql != '' )
+        $sql=$newline;
+        if ($sql != '')
         {
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Error create schema : '.$sql,ERROR,'');
+                $this->logging->log('Error create schema : '.$sql, ERROR, '');
                 return;
             }
         }
-        $this->logging->log('Schema created',INFO);
+        $this->logging->log('Schema created', INFO);
     }
     
     /**
@@ -200,14 +200,14 @@ 
      *     @param bool $getmsg : only get messages from version upgrades
      *     @return string : if $getmsg=true, return messages or 'ERROR' on error.
      */
-    public function update_schema($prefix,$target_version,$table_prefix,$getmsg=false)
+    public function update_schema($prefix, $target_version, $table_prefix, $getmsg=false)
     {
         // Get current db number
         $db_conn=$this->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE name=\'db_version\' ';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
+        $this->logging->log('SQL query : '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Cannot get db version. Query : ' . $sql,2,'');
+            $this->logging->log('Cannot get db version. Query : '.$sql, 2, '');
             return 'ERROR';
         }
         $version=$ret_code->fetchAll();
@@ -215,11 +215,11 @@ 
         
         if ($this->trapDBType == 'pgsql')
         {
-            $prefix .= 'update_pgsql/schema_';
+            $prefix.='update_pgsql/schema_';
         }
         else
         {
-            $prefix .= 'update_sql/schema_';
+            $prefix.='update_sql/schema_';
         }
         //echo "version all :\n";print_r($version);echo " \n $cur_ver \n";
         if ($getmsg === true)
@@ -243,17 +243,17 @@ 
      *     @param string $table_prefix   to replace #PREFIX# in schema file by this
      *     @return bool : true on error
      */
-    public function update_schema_do($prefix,$cur_version,$target_version,$table_prefix)
+    public function update_schema_do($prefix, $cur_version, $target_version, $table_prefix)
     {
-        while($cur_version<$target_version)
+        while ($cur_version < $target_version)
         { // TODO : execute pre & post scripts
             $cur_version++;
-            $this->logging->log('Updating to version : ' .$cur_version ,INFO );
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+            $this->logging->log('Updating to version : '.$cur_version, INFO);
+            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
             $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
+            if ($input_stream === false)
             {
-                $this->logging->log("Error reading update file ". $updateFile,ERROR);
+                $this->logging->log("Error reading update file ".$updateFile, ERROR);
                 return true;
             }
             $newline='';
@@ -262,25 +262,25 @@ 
             while (($line=fgets($input_stream)) !== false)
             {
                 if (preg_match('/^#/', $line)) continue; // ignore comment lines
-                $newline.=chop(preg_replace('/#PREFIX#/',$table_prefix,$line));
+                $newline.=chop(preg_replace('/#PREFIX#/', $table_prefix, $line));
                 if (preg_match('/; *$/', $newline))
                 {
                     $sql_req=$db_conn->prepare($newline);
                     if ($sql_req->execute() === false) {
-                        $this->logging->log('Error create schema : '.$newline,ERROR);
+                        $this->logging->log('Error create schema : '.$newline, ERROR);
                         return true;
                     }
                     $cur_table_array=array();
-                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/',$newline,$cur_table_array))
+                    if (preg_match('/^ *([^ ]+) TABLE ([^ ]+)/', $newline, $cur_table_array))
                     {
-                        $cur_table=$cur_table_array[1] . ' SQL table '.$cur_table_array[2];
+                        $cur_table=$cur_table_array[1].' SQL table '.$cur_table_array[2];
                     }
                     else
                     {
                         $cur_table='secret SQL stuff :-)';
                         //$cur_table=$newline;
                     }
-                    $this->logging->log('Doing : ' . $cur_table,INFO );
+                    $this->logging->log('Doing : '.$cur_table, INFO);
                     
                     $newline='';
                 }
@@ -288,13 +288,13 @@ 
             fclose($input_stream);
             
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value='.$cur_version.' WHERE ( name=\'db_version\' )';
-            $this->logging->log('SQL query : '.$sql,DEBUG );
+            $this->logging->log('SQL query : '.$sql, DEBUG);
             if ($db_conn->query($sql) === false) {
-                $this->logging->log('Cannot update db version. Query : ' . $sql,WARN);
+                $this->logging->log('Cannot update db version. Query : '.$sql, WARN);
                 return true;
             }
             
-            $this->logging->log('Schema updated to version : '.$cur_version ,INFO);
+            $this->logging->log('Schema updated to version : '.$cur_version, INFO);
         }
         return false;
     }
@@ -306,33 +306,33 @@ 
      *     @param int $target_version  target db version number
      *     @return string : return messages or 'ERROR'.
      */
-    private function update_schema_message($prefix,$cur_version,$target_version)
+    private function update_schema_message($prefix, $cur_version, $target_version)
     {
  
         $message='';
-        $this->logging->log('getting message for upgrade',DEBUG );
-        while($cur_version<$target_version)
+        $this->logging->log('getting message for upgrade', DEBUG);
+        while ($cur_version < $target_version)
         {
             $cur_version++;
-            $updateFile=$prefix.'v'.($cur_version-1).'_v'.$cur_version.'.sql';
+            $updateFile=$prefix.'v'.($cur_version - 1).'_v'.$cur_version.'.sql';
             $input_stream=fopen($updateFile, 'r');
-            if ($input_stream=== false)
+            if ($input_stream === false)
             {
-                $this->logging->log("Error reading update file ". $updateFile,2,'');
+                $this->logging->log("Error reading update file ".$updateFile, 2, '');
                 return 'ERROR';
             }
             do 
             { 
                 $line=fgets($input_stream); 
             }
-            while ($line !== false && !preg_match('/#MESSAGE/',$line));
+            while ($line !== false && !preg_match('/#MESSAGE/', $line));
             fclose($input_stream);
             if ($line === false)
             {
-                $this->logging->log("No message in file ". $updateFile,2,'');
+                $this->logging->log("No message in file ".$updateFile, 2, '');
                 return '';
             }
-            $message .= ($cur_version-1) . '->' . $cur_version. ' : ' . preg_replace('/#MESSAGE : /','',$line)."\n";
+            $message.=($cur_version - 1).'->'.$cur_version.' : '.preg_replace('/#MESSAGE : /', '', $line)."\n";
         }
         return $message;
     }

tests/db_test.php

Indentation +29 added lines, -29 removed lines

@@ -14,40 +14,40 @@
 
 if (!array_key_exists('v',$options) || !array_key_exists('c',$options) || !array_key_exists('b',$options)|| !array_key_exists('a',$options))
 {
-    printf("Need version -v, path -a, database -b (mysql,pgsql) command -c (create/update)\n");
-    exit(1);
+	printf("Need version -v, path -a, database -b (mysql,pgsql) command -c (create/update)\n");
+	exit(1);
 }
 $command=$options['c'];
 $path=$options['a'];
 try {
-    switch($command)
-    {
-        case 'create':
-            $schema=($options['b']=='mysql')?'schema_v'.$options['v'].'.sql':'schema_v'.$options['v'].'.pgsql';
-            $schema=$path.'/SQL/'.$schema;
-            $trap->trapsDB->create_schema($schema, 'traps_');
-            break;
-        case 'update':
-            $message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_',true);
-            printf("Update message : %s\n",$message);
-            if ($message == 'ERROR')
-            {
-                exit(1);
-            }
-            printf("Messages DONE, updating : \n");
-            $message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_');
-            if ($message == 'ERROR')
-            {
-                exit(1);
-            }
-            break;
-        default:
-            printf("Unknown command\n");
-            exit(1);
-    }
+	switch($command)
+	{
+		case 'create':
+			$schema=($options['b']=='mysql')?'schema_v'.$options['v'].'.sql':'schema_v'.$options['v'].'.pgsql';
+			$schema=$path.'/SQL/'.$schema;
+			$trap->trapsDB->create_schema($schema, 'traps_');
+			break;
+		case 'update':
+			$message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_',true);
+			printf("Update message : %s\n",$message);
+			if ($message == 'ERROR')
+			{
+				exit(1);
+			}
+			printf("Messages DONE, updating : \n");
+			$message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_');
+			if ($message == 'ERROR')
+			{
+				exit(1);
+			}
+			break;
+		default:
+			printf("Unknown command\n");
+			exit(1);
+	}
 } catch (Exception $e) {
-    printf("Caught Exception %s\n",$e->getMessage());
-    exit (1);
+	printf("Caught Exception %s\n",$e->getMessage());
+	exit (1);
 }
 
 exit(0);

Spacing +12 added lines, -12 removed lines

@@ -3,16 +3,16 @@ 
 
 require_once 'bin/trap_class.php';
 
-$options = getopt("c:v:d:b:a:");
+$options=getopt("c:v:d:b:a:");
 
-$icingaweb2Etc=(array_key_exists('d',$options))?$options['d']:"/etc/icingaweb2";
+$icingaweb2Etc=(array_key_exists('d', $options)) ? $options['d'] : "/etc/icingaweb2";
 
-$debugLevel=4;// 0=No output 1=critical 2=warning 3=trace 4=ALL
+$debugLevel=4; // 0=No output 1=critical 2=warning 3=trace 4=ALL
 
-$trap = new trap($icingaweb2Etc,$debugLevel,'display');
-$trap->setLogging($debugLevel,'display');
+$trap=new trap($icingaweb2Etc, $debugLevel, 'display');
+$trap->setLogging($debugLevel, 'display');
 
-if (!array_key_exists('v',$options) || !array_key_exists('c',$options) || !array_key_exists('b',$options)|| !array_key_exists('a',$options))
+if (!array_key_exists('v', $options) || !array_key_exists('c', $options) || !array_key_exists('b', $options) || !array_key_exists('a', $options))
 {
     printf("Need version -v, path -a, database -b (mysql,pgsql) command -c (create/update)\n");
     exit(1);
@@ -20,22 +20,22 @@ 
 $command=$options['c'];
 $path=$options['a'];
 try {
-    switch($command)
+    switch ($command)
     {
         case 'create':
-            $schema=($options['b']=='mysql')?'schema_v'.$options['v'].'.sql':'schema_v'.$options['v'].'.pgsql';
+            $schema=($options['b'] == 'mysql') ? 'schema_v'.$options['v'].'.sql' : 'schema_v'.$options['v'].'.pgsql';
             $schema=$path.'/SQL/'.$schema;
             $trap->trapsDB->create_schema($schema, 'traps_');
             break;
         case 'update':
-            $message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_',true);
-            printf("Update message : %s\n",$message);
+            $message=$trap->trapsDB->update_schema($path."/SQL/", $options['v'], 'traps_', true);
+            printf("Update message : %s\n", $message);
             if ($message == 'ERROR')
             {
                 exit(1);
             }
             printf("Messages DONE, updating : \n");
-            $message=$trap->trapsDB->update_schema($path."/SQL/",$options['v'], 'traps_');
+            $message=$trap->trapsDB->update_schema($path."/SQL/", $options['v'], 'traps_');
             if ($message == 'ERROR')
             {
                 exit(1);
@@ -46,7 +46,7 @@ 
             exit(1);
     }
 } catch (Exception $e) {
-    printf("Caught Exception %s\n",$e->getMessage());
+    printf("Caught Exception %s\n", $e->getMessage());
     exit (1);
 }
 

application/clicommands/MibCommand.php

Indentation +76 added lines, -76 removed lines

@@ -22,77 +22,77 @@ 
 class MibCommand extends Command
 {
 	/**
-	*	Update mib database
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib update
-	*	
-	*	OPTIONS
-	*	
-	*	--pid <file> : run in background with pid in <file>
-	*
-	*	--verb    : Set output log to verbose
-	*
-	*   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
-	*/
+	 *	Update mib database
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib update
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--pid <file> : run in background with pid in <file>
+	 *
+	 *	--verb    : Set output log to verbose
+	 *
+	 *   --force-check : force check of all traps & objects for change. (NOT IMPLEMENTED)
+	 */
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
-	    $pid=1;
-	    if ($background != null)
-	    {
-	        $file=@fopen($background,'w');
-	        if ($file == false)
-	        {
-	            echo 'Error : cannot open pid file '.$background;
-	            return 1;
-	        }
-	        $pid = pcntl_fork();
-	        if ($pid == -1) {
-	            echo 'Error : Cannot fork process';
-	            return 1;
-	        }
-	    }
-	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
+		$background = $this->params->get('pid', null);
+		$logLevel= $this->params->has('verb') ? 4 : 2;
+		if ($this->params->has('force-check')) { echo "Not implemented"; return;}
+		$forceCheck=$this->params->has('force-check')?True:False;
+		$pid=1;
+		if ($background != null)
+		{
+			$file=@fopen($background,'w');
+			if ($file == false)
+			{
+				echo 'Error : cannot open pid file '.$background;
+				return 1;
+			}
+			$pid = pcntl_fork();
+			if ($pid == -1) {
+				echo 'Error : Cannot fork process';
+				return 1;
+			}
+		}
+		$module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
 		require_once($module->getBaseDir() .'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
 		$trap = new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+			$trap->setLogging($logLevel,'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
-		    if ($pid != 0)
-		    {
-		        // father process
-		        fwrite($file,$pid);
-		        fclose($file);
-		        echo "OK : process $pid in bckground";
-		        return 0;
-		    }
-		    else
-		    {  // son process : close all file descriptors and go to a new session
-		        fclose($file);		        
+			if ($pid != 0)
+			{
+				// father process
+				fwrite($file,$pid);
+				fclose($file);
+				echo "OK : process $pid in bckground";
+				return 0;
+			}
+			else
+			{  // son process : close all file descriptors and go to a new session
+				fclose($file);		        
 // 		        $sid = posix_setsid();
-                fclose(STDIN);
-                fclose(STDOUT);
-                fclose(STDERR);
-                try
-                {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
-                {
-                    $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
-                }
-                unlink($background);
-                return 0;
-		    }
+				fclose(STDIN);
+				fclose(STDOUT);
+				fclose(STDERR);
+				try
+				{
+					$trap->mibClass->update_mib_database(false,$forceCheck);
+				}
+				catch (Exception $e)
+				{
+					$trap->trapLog('Error in updating : ' . $e->getMessage(),2);
+				}
+				unlink($background);
+				return 0;
+			}
 		    
 		}
 		
@@ -110,28 +110,28 @@ 
 		}
 		if ($pid != 1)
 		{
-		    unlink($background);
+			unlink($background);
 		}
 	}
 	/**
-	*	purge all mib database NOT IMPLEMENTED
-	*
-	*	USAGE 
-	*
-	*	icingli trapdirector mib purge --confirm
-	*	
-	*	OPTIONS
-	*	
-	*	--confirm : needed to execute purge
-	*/
+	 *	purge all mib database NOT IMPLEMENTED
+	 *
+	 *	USAGE 
+	 *
+	 *	icingli trapdirector mib purge --confirm
+	 *	
+	 *	OPTIONS
+	 *	
+	 *	--confirm : needed to execute purge
+	 */
 	public function purgeAction()
 	{
 		$db_prefix=$this->Config()->get('config', 'database_prefix');
 		
 		if (!$this->params->has('confirm'))
 		{
-		    echo "This needs confirmation with '--confirm'\n";
-		    return;
+			echo "This needs confirmation with '--confirm'\n";
+			return;
 		}
 		
 		$Config = new TrapModuleConfig($db_prefix);
@@ -144,9 +144,9 @@ 
 			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
 			$query = $db->delete(
-			    $Config->getMIBCacheTableName(),
-			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+				$Config->getMIBCacheTableName(),
+				'id>0');
+			echo 'Deleted '. $query . " traps and objects\n";
 		}
 		catch (Exception $e)
 		{

Spacing +19 added lines, -19 removed lines

@@ -38,39 +38,39 @@ 
 	*/
 	public function updateAction()
 	{
-	    $background = $this->params->get('pid', null);
-	    $logLevel= $this->params->has('verb') ? 4 : 2;
-	    if ($this->params->has('force-check')) { echo "Not implemented"; return;}
-	    $forceCheck=$this->params->has('force-check')?True:False;
+	    $background=$this->params->get('pid', null);
+	    $logLevel=$this->params->has('verb') ? 4 : 2;
+	    if ($this->params->has('force-check')) { echo "Not implemented"; return; }
+	    $forceCheck=$this->params->has('force-check') ?True:False;
 	    $pid=1;
 	    if ($background != null)
 	    {
-	        $file=@fopen($background,'w');
+	        $file=@fopen($background, 'w');
 	        if ($file == false)
 	        {
 	            echo 'Error : cannot open pid file '.$background;
 	            return 1;
 	        }
-	        $pid = pcntl_fork();
+	        $pid=pcntl_fork();
 	        if ($pid == -1) {
 	            echo 'Error : Cannot fork process';
 	            return 1;
 	        }
 	    }
 	    $module=Icinga::app()->getModuleManager()->getModule($this->getModuleName());
-		require_once($module->getBaseDir() .'/bin/trap_class.php');
+		require_once($module->getBaseDir().'/bin/trap_class.php');
 		$icingaweb2_etc=$this->Config()->get('config', 'icingaweb2_etc');
-		$trap = new Trap($icingaweb2_etc);
+		$trap=new Trap($icingaweb2_etc);
 		if ($pid == 1)
 		{
-		    $trap->setLogging($logLevel,'display');
+		    $trap->setLogging($logLevel, 'display');
 		}
 		else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
 		        // father process
-		        fwrite($file,$pid);
+		        fwrite($file, $pid);
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
@@ -84,11 +84,11 @@ 
                 fclose(STDERR);
                 try
                 {
-                    $trap->mibClass->update_mib_database(false,$forceCheck);
+                    $trap->mibClass->update_mib_database(false, $forceCheck);
                 }
                 catch (Exception $e)
                 {
-                    $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
+                    $trap->trapLog('Error in updating : '.$e->getMessage(), 2);
                 }
                 unlink($background);
                 return 0;
@@ -100,13 +100,13 @@ 
 		{
 			echo "Update main mib database : \n";
 			echo "# (trap found) C (trap already processed) . (every 2 seconds) : \n";
-			$trap->mibClass->update_mib_database(true,$forceCheck);
+			$trap->mibClass->update_mib_database(true, $forceCheck);
 			echo "Done\n";
 			
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in updating : ' . $e->getMessage();
+			echo 'Error in updating : '.$e->getMessage();
 		}
 		if ($pid != 1)
 		{
@@ -134,23 +134,23 @@ 
 		    return;
 		}
 		
-		$Config = new TrapModuleConfig($db_prefix);
+		$Config=new TrapModuleConfig($db_prefix);
 		
 		try
 		{
 			
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$db=IcingaDbConnection::fromResourceName($dbresource)->getConnection();
 			
-			$query = $db->delete(
+			$query=$db->delete(
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
-            echo 'Deleted '. $query . " traps and objects\n";
+            echo 'Deleted '.$query." traps and objects\n";
 		}
 		catch (Exception $e)
 		{
-			echo 'Error in DB : ' . $e->getMessage();
+			echo 'Error in DB : '.$e->getMessage();
 		}	   
 	}  	 	
 

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
 		if ($pid == 1)
 		{
 		    $trap->setLogging($logLevel,'display');
-		}
-		else
+		} else
 		{  // use default display TODO : if default is 'display' son process will be killed at first output....
 		    if ($pid != 0)
 		    {
@@ -74,8 +73,7 @@ 
 		        fclose($file);
 		        echo "OK : process $pid in bckground";
 		        return 0;
-		    }
-		    else
+		    } else
 		    {  // son process : close all file descriptors and go to a new session
 		        fclose($file);		        
 // 		        $sid = posix_setsid();
@@ -85,8 +83,7 @@ 
                 try
                 {
                     $trap->mibClass->update_mib_database(false,$forceCheck);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     $trap->trapLog('Error in updating : ' . $e->getMessage(),2);
                 }
@@ -103,8 +100,7 @@ 
 			$trap->mibClass->update_mib_database(true,$forceCheck);
 			echo "Done\n";
 			
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in updating : ' . $e->getMessage();
 		}
@@ -147,8 +143,7 @@ 
 			    $Config->getMIBCacheTableName(),
 			    'id>0');
             echo 'Deleted '. $query . " traps and objects\n";
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			echo 'Error in DB : ' . $e->getMessage();
 		}