patrickpr / trapdirector

library/Trapdirector/TrapsProcess/Plugins.php

Braces +10 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
         if ($pluginDir == '')
         {
             $this->pluginDir=dirname(__DIR__).'/Plugins';
-        }
-        else 
+        } else 
         {
             $this->pluginDir=$pluginDir;
         }
@@ -94,8 +93,7 @@ 
         {
             $this->logClass->log('No enabled plugins',DEBUG);
             return;
-        }
-        else
+        } else
         {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
             $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
             
@@ -233,9 +231,11 @@ 
      */
     public function registerPlugin(string $pluginName)
     {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+        if ( ! isset($this->pluginsList[$pluginName]) ) {
+        	// Plugin isn't enable, create entry
         {
             $pluginListElmt = array();
+        }
             $pluginListElmt['object'] = null; // class not loaded
             $pluginListElmt['enabled'] = false;
             $this->pluginsList[$pluginName] = $pluginListElmt;
@@ -282,8 +282,7 @@ 
                             . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
                     }
                     
-                }
-                else
+                } else
                 {
                     $this->functionList[$fname]=array();
                     $this->functionList[$fname]['plugin'] = $pluginName;
@@ -326,11 +325,13 @@ 
                 $retDisplay .= $e->getMessage() . ' / ';
             }
         }
-        if ($checkEnabled === false) // Load all php files in plugin dir
+        if ($checkEnabled === false) {
+        	// Load all php files in plugin dir
         {
             foreach (glob($this->pluginDir."/*.php") as $filename)
             {             
                 $pluginName=basename($filename,'.php');
+        }
                 if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
                 {
                     $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
@@ -348,8 +349,7 @@ 
         if ($retDisplay == '')
         {
             return 'All plugins loaded OK';
-        }
-        else
+        } else
         {
             return $retDisplay;
         }

Spacing +86 added lines, -86 removed lines

@@ -24,7 +24,7 @@ 
      * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
      * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
      **/
-    protected $pluginsList = array();
+    protected $pluginsList=array();
 
     /** Array of functions names
      * @var array $functionList 
@@ -51,7 +51,7 @@ 
      * @param string $plugin_dir optional plugin directory
      * @throws \Exception
      */
-    function __construct(Trap $trapClass,string $pluginDir='')
+    function __construct(Trap $trapClass, string $pluginDir='')
     {
         if ($pluginDir == '')
         {
@@ -88,42 +88,42 @@ 
      */
     private function loadEnabledPlugins()
     {
-        $PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
+        $PluginList=$this->trapClass->trapsDB->getDBConfig('enabled_plugins');
                
         if ($PluginList === null || $PluginList == '')
         {
-            $this->logClass->log('No enabled plugins',DEBUG);
+            $this->logClass->log('No enabled plugins', DEBUG);
             return;
         }
         else
         {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
-            $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
+            $this->logClass->log('Enabled plugins = '.$PluginList, DEBUG);
             
-            $pluginArray = explode(',', $PluginList);
+            $pluginArray=explode(',', $PluginList);
             foreach ($pluginArray as $pluginElmt)
             {
-                $pluginElmt = explode(';',$pluginElmt);
+                $pluginElmt=explode(';', $pluginElmt);
                 if ($pluginElmt === false || count($pluginElmt) != 4)
                 {
-                    throw new \Exception('Invalid plugin configuration : '. $PluginList );
+                    throw new \Exception('Invalid plugin configuration : '.$PluginList);
                 }
                 $pluginName=$pluginElmt[0];
                 
-                $pluginListElmt = array();
-                $pluginListElmt['object'] = null; // class not loaded
-                $pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
-                $pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
-                $pluginListElmt['enabled'] = true;
+                $pluginListElmt=array();
+                $pluginListElmt['object']=null; // class not loaded
+                $pluginListElmt['allOID']=($pluginElmt[1] == '1') ? true : false;
+                $pluginListElmt['target']=($pluginElmt[2] == '1') ? true : false;
+                $pluginListElmt['enabled']=true;
                 
-                $this->pluginsList[$pluginName] = $pluginListElmt;
+                $this->pluginsList[$pluginName]=$pluginListElmt;
                 
                 // deal with plugin functions
-                $pluginFunctions = explode('|',$pluginElmt[3]);
+                $pluginFunctions=explode('|', $pluginElmt[3]);
                 if ($pluginFunctions !== false)
                 {
                     foreach ($pluginFunctions as $function)
                     {
-                        $this->functionList[$function] = array(
+                        $this->functionList[$function]=array(
                             'plugin'    =>   $pluginName,
                             'function'  =>  null
                         );
@@ -155,16 +155,16 @@ 
                 {
                     continue;
                 }
-                $functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
-                $functionString .= $fName;
+                $functionString.=($functionString == '') ? '' : '|'; // add separator if not empty
+                $functionString.=$fName;
             }
-            $saveString .= ($saveString == '')?'':',' ;
+            $saveString.=($saveString == '') ? '' : ',';
             
-            $allOID = ($value['allOID'] === true) ? 1 : 0;
-            $target = ($value['target'] === true) ? 1 : 0;
-            $saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
+            $allOID=($value['allOID'] === true) ? 1 : 0;
+            $target=($value['target'] === true) ? 1 : 0;
+            $saveString.=$name.';'.$allOID.';'.$target.';'.$functionString;
         }
-        $this->logClass->log('Saving : ' . $saveString,DEBUG);
+        $this->logClass->log('Saving : '.$saveString, DEBUG);
         return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
     }
     
@@ -178,7 +178,7 @@ 
         {
             if ($value['enabled'] == true)
             {
-                array_push($retArray,$name);
+                array_push($retArray, $name);
             }
         }
         return $retArray;
@@ -190,29 +190,29 @@ 
      * @param bool $enabled true to enable, false to disable
      * @return bool true if OK, or false (error logged)
      */
-    public function enablePlugin(string $pluginName,bool $enabled)
+    public function enablePlugin(string $pluginName, bool $enabled)
     {
         if ($enabled === false)
         {
             // If plugin is defined set to disable
-            if ( isset($this->pluginsList[$pluginName]))
+            if (isset($this->pluginsList[$pluginName]))
             {
-                $this->pluginsList[$pluginName]['enabled'] = false;
+                $this->pluginsList[$pluginName]['enabled']=false;
             }            
             return $this->saveEnabledPlugins();
         }
         // Check if plugin is loaded / exists
-        if ( ! isset($this->pluginsList[$pluginName]) || 
+        if (!isset($this->pluginsList[$pluginName]) || 
                 $this->pluginsList[$pluginName]['object'] === null)
         {
             try {
                 $this->registerPlugin($pluginName);
             } catch (Exception $e) {
-                $this->logClass->log('Cannot enable plugin : ' . $e->getMessage(),WARN);
+                $this->logClass->log('Cannot enable plugin : '.$e->getMessage(), WARN);
                 return false;
             }
         }
-        $this->pluginsList[$pluginName]['enabled'] = true;
+        $this->pluginsList[$pluginName]['enabled']=true;
         // save in DB and return 
         return $this->saveEnabledPlugins();
     }
@@ -233,12 +233,12 @@ 
      */
     public function registerPlugin(string $pluginName)
     {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+        if (!isset($this->pluginsList[$pluginName])) // Plugin isn't enable, create entry
         {
-            $pluginListElmt = array();
-            $pluginListElmt['object'] = null; // class not loaded
-            $pluginListElmt['enabled'] = false;
-            $this->pluginsList[$pluginName] = $pluginListElmt;
+            $pluginListElmt=array();
+            $pluginListElmt['object']=null; // class not loaded
+            $pluginListElmt['enabled']=false;
+            $this->pluginsList[$pluginName]=$pluginListElmt;
         }
         
         if ($this->pluginsList[$pluginName]['object'] !== null)
@@ -247,13 +247,13 @@ 
         }
         try {
             // Include plugin file
-            include_once($this->pluginDir.'/' . $pluginName . '.php');
+            include_once($this->pluginDir.'/'.$pluginName.'.php');
             
             // Create full class name with namespace
-            $pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
+            $pluginClassName=__NAMESPACE__.'\\Plugins\\'.$pluginName;
             
             // Create class
-            $newClass = new $pluginClassName();
+            $newClass=new $pluginClassName();
             
             // Set logging
             $newClass->setLoggingClass($this->logClass);
@@ -276,33 +276,33 @@ 
             {
                 if (isset($this->functionList[$fname]))
                 {
-                    if ($this->functionList[$fname]['plugin'] != $pluginName )
+                    if ($this->functionList[$fname]['plugin'] != $pluginName)
                     {
-                        throw new Exception('Duplicate function name '.$fname . ' in ' 
-                            . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
+                        throw new Exception('Duplicate function name '.$fname.' in ' 
+                            . $pluginName.' and '.$this->functionList[$fname]['plugin']);
                     }
                     
                 }
                 else
                 {
                     $this->functionList[$fname]=array();
-                    $this->functionList[$fname]['plugin'] = $pluginName;
+                    $this->functionList[$fname]['plugin']=$pluginName;
                 }
                 $this->functionList[$fname]['function']=$function['function'];
             }
-            $this->logClass->log('Registered plugin '.$pluginName,DEBUG);
+            $this->logClass->log('Registered plugin '.$pluginName, DEBUG);
             
         } catch (Exception $e) {
             unset($this->pluginsList[$pluginName]);
-            $errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
-            $this->logClass->log($errorMessage,WARN);
+            $errorMessage="Error registering plugin $pluginName : ".$e->getMessage();
+            $this->logClass->log($errorMessage, WARN);
             // Disable the plugin
             $this->enablePlugin($pluginName, false);
             throw new \Exception($errorMessage);
         } catch (Throwable $t) {
             unset($this->pluginsList[$pluginName]);
-            $errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
-            $this->logClass->log($errorMessage,WARN);
+            $errorMessage=$t->getMessage().' in file '.$t->getFile().' line '.$t->getLine();
+            $this->logClass->log($errorMessage, WARN);
             // Disable the plugin
             $this->enablePlugin($pluginName, false);
             throw new \Exception($errorMessage);
@@ -323,24 +323,24 @@ 
             try {
                 $this->registerPlugin($pluginName);
             } catch (Exception $e) {
-                $retDisplay .= $e->getMessage() . ' / ';
+                $retDisplay.=$e->getMessage().' / ';
             }
         }
         if ($checkEnabled === false) // Load all php files in plugin dir
         {
             foreach (glob($this->pluginDir."/*.php") as $filename)
             {             
-                $pluginName=basename($filename,'.php');
-                if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
+                $pluginName=basename($filename, '.php');
+                if (!preg_match('/^[a-zA-Z0-9]+$/', $pluginName))
                 {
                     $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
-                    $retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
+                    $retDisplay.="Invalid plugin name : ".$pluginName." / ";
                     break;
                 }
                 try { // Already registerd plugin will simply return false
                     $this->registerPlugin($pluginName);               
                 } catch (Exception $e) {
-                    $retDisplay .= $e->getMessage() . ' / ';
+                    $retDisplay.=$e->getMessage().' / ';
                 }
             }
         }
@@ -380,17 +380,17 @@ 
         {
             $this->registerPlugin($name); // can throw exception handled by caller
         }
-        $retObj = new stdClass();
-        $retObj->name           = $name;
-        $retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
-        $retObj->processTraps   = $this->pluginsList[$name]['target'];
-        $retObj->description    = $this->pluginsList[$name]['object']->description;
+        $retObj=new stdClass();
+        $retObj->name=$name;
+        $retObj->catchAllTraps=$this->pluginsList[$name]['allOID'];
+        $retObj->processTraps=$this->pluginsList[$name]['target'];
+        $retObj->description=$this->pluginsList[$name]['object']->description;
         $functions=array();
         foreach ($this->functionList as $fName => $func)
         {
             if ($func['plugin'] == $name)
             {
-                array_push($functions,$fName);
+                array_push($functions, $fName);
             }
         }
         $retObj->funcArray=$functions;
@@ -403,13 +403,13 @@ 
      * @param string $pluginName
      * @return boolean returns plugin object of false;
      */
-    public function getFunction($funcName,&$pluginName)
+    public function getFunction($funcName, &$pluginName)
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
             return false;
         }
-        $pluginName = $this->functionList[$funcName]['plugin'];
+        $pluginName=$this->functionList[$funcName]['plugin'];
         return true;
     }
     
@@ -421,21 +421,21 @@ 
      */
     public function getFunctionDetails($funcName)
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
             return false;
         }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+        $pluginName=$this->functionList[$funcName]['plugin']; // plugin name
+        $plugin=$this->pluginsList[$pluginName]['object']; // plugin object
         if ($plugin === null)
         {
             $this->registerPlugin($pluginName); // can throw exception handled by caller
         }
-        $retObj = new stdClass();
-        $retObj->name           = $funcName;
-        $retObj->plugin         = $pluginName;
-        $retObj->params         = $plugin->functions[$funcName]['params'];
-        $retObj->description    = $plugin->functions[$funcName]['description'];
+        $retObj=new stdClass();
+        $retObj->name=$funcName;
+        $retObj->plugin=$pluginName;
+        $retObj->params=$plugin->functions[$funcName]['params'];
+        $retObj->description=$plugin->functions[$funcName]['description'];
         return $retObj;
     }
     
@@ -446,23 +446,23 @@ 
      * @throws Exception
      * @return bool
      */
-    public function getFunctionEval(string $funcName,$params) : bool
+    public function getFunctionEval(string $funcName, $params) : bool
     {
-        if (! isset($this->functionList[$funcName]) )
+        if (!isset($this->functionList[$funcName]))
         {
-            throw new Exception($funcName . ' not found.');
+            throw new Exception($funcName.' not found.');
         }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+        $pluginName=$this->functionList[$funcName]['plugin']; // plugin name
+        $plugin=$this->pluginsList[$pluginName]['object']; // plugin object
 
         if ($plugin === null)
         {
             $this->registerPlugin($pluginName); // can throw exception handled by caller
-            $plugin = $this->pluginsList[$pluginName]['object'];
+            $plugin=$this->pluginsList[$pluginName]['object'];
         }
         
-        $propertyName = $this->functionList[$funcName]['function'];
-        $this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
+        $propertyName=$this->functionList[$funcName]['function'];
+        $this->logClass->log('Using property '.$propertyName.' of class : '.$pluginName, DEBUG);
         
         return $plugin->{$propertyName}($params);        
     }
@@ -475,17 +475,17 @@ 
         //$this->logClass->log('eval cleanup : '.$functionString,DEBUG);
         
         // Match function call
-        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
-        if ($num !=1)
+        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString, $matches);
+        if ($num != 1)
         {
-            throw new \ErrorException('Function syntax error : ' . $functionString );
+            throw new \ErrorException('Function syntax error : '.$functionString);
         }
-        $this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
+        $this->logClass->log('Got function : '.$matches[1].', params : '.$matches[2], DEBUG);
         $funcName=$matches[1];
         
         // Get parameters comma separated
-        $funcParams=str_getcsv($matches[2],',','"',"\\");
-        $this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
+        $funcParams=str_getcsv($matches[2], ',', '"', "\\");
+        $this->logClass->log('Function params : '.print_r($funcParams, true), DEBUG);
         
         // return evaluation
         return $this->getFunctionEval($funcName, $funcParams);        
@@ -520,7 +520,7 @@ 
      */
     public function setLoggingClass($loggingClass)
     {
-        $this->loggingClass = $loggingClass;
+        $this->loggingClass=$loggingClass;
     }
     
     /**
@@ -528,8 +528,8 @@ 
      * @param string $message
      * @param int $level DEBUG/INFO/WARN/CRIT
      */
-    public function log($message,$level)
+    public function log($message, $level)
     {
-        $this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
+        $this->loggingClass->log('[ '.get_class($this).'] '.$message, $level);
     }
 }
\ No newline at end of file

Indentation +457 added lines, -457 removed lines

@@ -17,519 +17,519 @@
  */
 class Plugins
 {
-    /** Array of plugin objects. Keys ar plugin name
-     * @var PluginTemplate[] $pluginsList Plugins array with name as index
-     * $pluginsList[plugin name]['object']  : plugin object (NULL of not loaded)
-     * $pluginsList[plugin name]['allOID']  : bool true if plugin catches all oid
-     * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
-     * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
-     **/
-    protected $pluginsList = array();
+	/** Array of plugin objects. Keys ar plugin name
+	 * @var PluginTemplate[] $pluginsList Plugins array with name as index
+	 * $pluginsList[plugin name]['object']  : plugin object (NULL of not loaded)
+	 * $pluginsList[plugin name]['allOID']  : bool true if plugin catches all oid
+	 * $pluginsList[plugin name]['target']  : bool true if plugin can be trap processing target
+	 * $pluginsList[plugin name]['enabled'] : bool true if plugin is in enabled list 
+	 **/
+	protected $pluginsList = array();
 
-    /** Array of functions names
-     * @var array $functionList 
-     * $functionList[name]['plugin'] : Plugin name
-     * $functionList[name]['function'] : Plugin function to call (null if plugin not loaded)
-    */
-    protected $functionList=array();
+	/** Array of functions names
+	 * @var array $functionList 
+	 * $functionList[name]['plugin'] : Plugin name
+	 * $functionList[name]['function'] : Plugin function to call (null if plugin not loaded)
+	 */
+	protected $functionList=array();
     
-    /** @var string[] $enabledPlugins list of enabled plugins */
-    //public $enabledPlugins = array();
+	/** @var string[] $enabledPlugins list of enabled plugins */
+	//public $enabledPlugins = array();
 
     
-    /** @var Logging $logClass */
-    protected $logClass;
+	/** @var Logging $logClass */
+	protected $logClass;
 
-    /** @var Trap $trapClass */
-    protected $trapClass;
+	/** @var Trap $trapClass */
+	protected $trapClass;
     
-    /** @var string $pluginDir */
-    protected $pluginDir;
+	/** @var string $pluginDir */
+	protected $pluginDir;
     
-    /** Setup class
-     * @param Trap $logClass  the top trap class
-     * @param string $plugin_dir optional plugin directory
-     * @throws \Exception
-     */
-    function __construct(Trap $trapClass,string $pluginDir='')
-    {
-        if ($pluginDir == '')
-        {
-            $this->pluginDir=dirname(__DIR__).'/Plugins';
-        }
-        else 
-        {
-            $this->pluginDir=$pluginDir;
-        }
-        // Set and check Logging class
-        $this->trapClass=$trapClass;
-        if ($this->trapClass === null)
-        {
-            throw new Exception('Log class not loaded into trap class');
-        }
-        $this->logClass=$trapClass->logging;
-        if ($this->logClass === null)
-        {
-            throw new Exception('Log class not loaded into trap class');
-        }
-        // check DB class and get plugins list.
-        if ($this->trapClass->trapsDB === null)
-        {
-            throw new Exception('Database class not loaded into trap class');
-        }
-        $this->loadEnabledPlugins();
-    }
+	/** Setup class
+	 * @param Trap $logClass  the top trap class
+	 * @param string $plugin_dir optional plugin directory
+	 * @throws \Exception
+	 */
+	function __construct(Trap $trapClass,string $pluginDir='')
+	{
+		if ($pluginDir == '')
+		{
+			$this->pluginDir=dirname(__DIR__).'/Plugins';
+		}
+		else 
+		{
+			$this->pluginDir=$pluginDir;
+		}
+		// Set and check Logging class
+		$this->trapClass=$trapClass;
+		if ($this->trapClass === null)
+		{
+			throw new Exception('Log class not loaded into trap class');
+		}
+		$this->logClass=$trapClass->logging;
+		if ($this->logClass === null)
+		{
+			throw new Exception('Log class not loaded into trap class');
+		}
+		// check DB class and get plugins list.
+		if ($this->trapClass->trapsDB === null)
+		{
+			throw new Exception('Database class not loaded into trap class');
+		}
+		$this->loadEnabledPlugins();
+	}
     
     
-    /**
-     * Load enabled plugins from database config table.
-     * Fills enabledPlugins and functionList properties
-     * @throws \Exception
-     */
-    private function loadEnabledPlugins()
-    {
-        $PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
+	/**
+	 * Load enabled plugins from database config table.
+	 * Fills enabledPlugins and functionList properties
+	 * @throws \Exception
+	 */
+	private function loadEnabledPlugins()
+	{
+		$PluginList = $this->trapClass->trapsDB->getDBConfig('enabled_plugins');
                
-        if ($PluginList === null || $PluginList == '')
-        {
-            $this->logClass->log('No enabled plugins',DEBUG);
-            return;
-        }
-        else
-        {   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
-            $this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
+		if ($PluginList === null || $PluginList == '')
+		{
+			$this->logClass->log('No enabled plugins',DEBUG);
+			return;
+		}
+		else
+		{   // Saved config : <plugin name>;<Catch all OID ? 1|0>;<Trap target ? 1|0>;<func 1 name>|<func 2 name>... ,<plugin2 name>....
+			$this->logClass->log('Enabled plugins = '.$PluginList,DEBUG);
             
-            $pluginArray = explode(',', $PluginList);
-            foreach ($pluginArray as $pluginElmt)
-            {
-                $pluginElmt = explode(';',$pluginElmt);
-                if ($pluginElmt === false || count($pluginElmt) != 4)
-                {
-                    throw new \Exception('Invalid plugin configuration : '. $PluginList );
-                }
-                $pluginName=$pluginElmt[0];
+			$pluginArray = explode(',', $PluginList);
+			foreach ($pluginArray as $pluginElmt)
+			{
+				$pluginElmt = explode(';',$pluginElmt);
+				if ($pluginElmt === false || count($pluginElmt) != 4)
+				{
+					throw new \Exception('Invalid plugin configuration : '. $PluginList );
+				}
+				$pluginName=$pluginElmt[0];
                 
-                $pluginListElmt = array();
-                $pluginListElmt['object'] = null; // class not loaded
-                $pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
-                $pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
-                $pluginListElmt['enabled'] = true;
+				$pluginListElmt = array();
+				$pluginListElmt['object'] = null; // class not loaded
+				$pluginListElmt['allOID'] = ($pluginElmt[1]=='1') ? true : false;
+				$pluginListElmt['target'] = ($pluginElmt[2]=='1') ? true : false;
+				$pluginListElmt['enabled'] = true;
                 
-                $this->pluginsList[$pluginName] = $pluginListElmt;
+				$this->pluginsList[$pluginName] = $pluginListElmt;
                 
-                // deal with plugin functions
-                $pluginFunctions = explode('|',$pluginElmt[3]);
-                if ($pluginFunctions !== false)
-                {
-                    foreach ($pluginFunctions as $function)
-                    {
-                        $this->functionList[$function] = array(
-                            'plugin'    =>   $pluginName,
-                            'function'  =>  null
-                        );
-                    }
-                }
-            }
+				// deal with plugin functions
+				$pluginFunctions = explode('|',$pluginElmt[3]);
+				if ($pluginFunctions !== false)
+				{
+					foreach ($pluginFunctions as $function)
+					{
+						$this->functionList[$function] = array(
+							'plugin'    =>   $pluginName,
+							'function'  =>  null
+						);
+					}
+				}
+			}
 
-        }
+		}
         
-    }
+	}
 
-    /**
-     * Save enabled plugin array in DB config
-     * @return bool true if OK, or false (error logged by DB Class)
-     */
-    private function saveEnabledPlugins()
-    {
-        $saveString='';
-        foreach ($this->pluginsList as $name => $value)
-        {
-            if ($value['enabled'] == false)
-            {
-                continue;
-            }
-            $functionString='';
-            foreach ($this->functionList as $fName => $fvalue)
-            {
-                if ($fvalue['plugin'] != $name)
-                {
-                    continue;
-                }
-                $functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
-                $functionString .= $fName;
-            }
-            $saveString .= ($saveString == '')?'':',' ;
+	/**
+	 * Save enabled plugin array in DB config
+	 * @return bool true if OK, or false (error logged by DB Class)
+	 */
+	private function saveEnabledPlugins()
+	{
+		$saveString='';
+		foreach ($this->pluginsList as $name => $value)
+		{
+			if ($value['enabled'] == false)
+			{
+				continue;
+			}
+			$functionString='';
+			foreach ($this->functionList as $fName => $fvalue)
+			{
+				if ($fvalue['plugin'] != $name)
+				{
+					continue;
+				}
+				$functionString .= ($functionString == '') ? '' : '|'; // add separator if not empty
+				$functionString .= $fName;
+			}
+			$saveString .= ($saveString == '')?'':',' ;
             
-            $allOID = ($value['allOID'] === true) ? 1 : 0;
-            $target = ($value['target'] === true) ? 1 : 0;
-            $saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
-        }
-        $this->logClass->log('Saving : ' . $saveString,DEBUG);
-        return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
-    }
+			$allOID = ($value['allOID'] === true) ? 1 : 0;
+			$target = ($value['target'] === true) ? 1 : 0;
+			$saveString .= $name . ';' . $allOID . ';' . $target . ';' . $functionString ;
+		}
+		$this->logClass->log('Saving : ' . $saveString,DEBUG);
+		return $this->trapClass->trapsDB->setDBConfig('enabled_plugins', $saveString);
+	}
     
-    /** Get enabled plugin list by name
-     * @return array
-     */
-    public function getEnabledPlugins() : array
-    {
-        $retArray=array();
-        foreach ($this->pluginsList as $name => $value)
-        {
-            if ($value['enabled'] == true)
-            {
-                array_push($retArray,$name);
-            }
-        }
-        return $retArray;
-    }
+	/** Get enabled plugin list by name
+	 * @return array
+	 */
+	public function getEnabledPlugins() : array
+	{
+		$retArray=array();
+		foreach ($this->pluginsList as $name => $value)
+		{
+			if ($value['enabled'] == true)
+			{
+				array_push($retArray,$name);
+			}
+		}
+		return $retArray;
+	}
 
-    /** Enable plugin (enabling an enabled plugin is OK, same for disabled).
-     *  and save in DB config
-     * @param string $pluginName
-     * @param bool $enabled true to enable, false to disable
-     * @return bool true if OK, or false (error logged)
-     */
-    public function enablePlugin(string $pluginName,bool $enabled)
-    {
-        if ($enabled === false)
-        {
-            // If plugin is defined set to disable
-            if ( isset($this->pluginsList[$pluginName]))
-            {
-                $this->pluginsList[$pluginName]['enabled'] = false;
-            }            
-            return $this->saveEnabledPlugins();
-        }
-        // Check if plugin is loaded / exists
-        if ( ! isset($this->pluginsList[$pluginName]) || 
-                $this->pluginsList[$pluginName]['object'] === null)
-        {
-            try {
-                $this->registerPlugin($pluginName);
-            } catch (Exception $e) {
-                $this->logClass->log('Cannot enable plugin : ' . $e->getMessage(),WARN);
-                return false;
-            }
-        }
-        $this->pluginsList[$pluginName]['enabled'] = true;
-        // save in DB and return 
-        return $this->saveEnabledPlugins();
-    }
+	/** Enable plugin (enabling an enabled plugin is OK, same for disabled).
+	 *  and save in DB config
+	 * @param string $pluginName
+	 * @param bool $enabled true to enable, false to disable
+	 * @return bool true if OK, or false (error logged)
+	 */
+	public function enablePlugin(string $pluginName,bool $enabled)
+	{
+		if ($enabled === false)
+		{
+			// If plugin is defined set to disable
+			if ( isset($this->pluginsList[$pluginName]))
+			{
+				$this->pluginsList[$pluginName]['enabled'] = false;
+			}            
+			return $this->saveEnabledPlugins();
+		}
+		// Check if plugin is loaded / exists
+		if ( ! isset($this->pluginsList[$pluginName]) || 
+				$this->pluginsList[$pluginName]['object'] === null)
+		{
+			try {
+				$this->registerPlugin($pluginName);
+			} catch (Exception $e) {
+				$this->logClass->log('Cannot enable plugin : ' . $e->getMessage(),WARN);
+				return false;
+			}
+		}
+		$this->pluginsList[$pluginName]['enabled'] = true;
+		// save in DB and return 
+		return $this->saveEnabledPlugins();
+	}
    
-    /**
-     * Destroy plugin objects and reload them with new enabled list.
-     * TODO : Code this function (ref DAEMON_MODE)
-     */
-    public function reloadAllPlugins()
-    {
-        return;
-    }
+	/**
+	 * Destroy plugin objects and reload them with new enabled list.
+	 * TODO : Code this function (ref DAEMON_MODE)
+	 */
+	public function reloadAllPlugins()
+	{
+		return;
+	}
  
-    /** Load plugin by name. Create entry if not in $pluginsList
-     * @param string $pluginName Plugin name to load
-     * @return bool true if created, false if already loaded
-     * @throws Exception on error loading plugin
-     */
-    public function registerPlugin(string $pluginName)
-    {
-        if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
-        {
-            $pluginListElmt = array();
-            $pluginListElmt['object'] = null; // class not loaded
-            $pluginListElmt['enabled'] = false;
-            $this->pluginsList[$pluginName] = $pluginListElmt;
-        }
+	/** Load plugin by name. Create entry if not in $pluginsList
+	 * @param string $pluginName Plugin name to load
+	 * @return bool true if created, false if already loaded
+	 * @throws Exception on error loading plugin
+	 */
+	public function registerPlugin(string $pluginName)
+	{
+		if ( ! isset($this->pluginsList[$pluginName]) ) // Plugin isn't enable, create entry
+		{
+			$pluginListElmt = array();
+			$pluginListElmt['object'] = null; // class not loaded
+			$pluginListElmt['enabled'] = false;
+			$this->pluginsList[$pluginName] = $pluginListElmt;
+		}
         
-        if ($this->pluginsList[$pluginName]['object'] !== null)
-        {
-            return false;
-        }
-        try {
-            // Include plugin file
-            include_once($this->pluginDir.'/' . $pluginName . '.php');
+		if ($this->pluginsList[$pluginName]['object'] !== null)
+		{
+			return false;
+		}
+		try {
+			// Include plugin file
+			include_once($this->pluginDir.'/' . $pluginName . '.php');
             
-            // Create full class name with namespace
-            $pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
+			// Create full class name with namespace
+			$pluginClassName = __NAMESPACE__ . '\\Plugins\\' . $pluginName;
             
-            // Create class
-            $newClass = new $pluginClassName();
+			// Create class
+			$newClass = new $pluginClassName();
             
-            // Set logging
-            $newClass->setLoggingClass($this->logClass);
+			// Set logging
+			$newClass->setLoggingClass($this->logClass);
             
-            // Add in plugin array
-            $this->pluginsList[$pluginName]['object']=$newClass;
-            $this->pluginsList[$pluginName]['allOID']=$newClass->catchAllTraps;
-            $this->pluginsList[$pluginName]['target']=$newClass->processTraps;
+			// Add in plugin array
+			$this->pluginsList[$pluginName]['object']=$newClass;
+			$this->pluginsList[$pluginName]['allOID']=$newClass->catchAllTraps;
+			$this->pluginsList[$pluginName]['target']=$newClass->processTraps;
             
-            // Delete old functions
-            foreach ($this->functionList as $fname => $fvalue)
-            {
-                if ($fvalue['plugin'] == $pluginName)
-                {
-                    unset($this->functionList[$fname]);
-                }
-            }
-            // Add functions
-            foreach ($newClass->functions as $fname => $function)
-            {
-                if (isset($this->functionList[$fname]))
-                {
-                    if ($this->functionList[$fname]['plugin'] != $pluginName )
-                    {
-                        throw new Exception('Duplicate function name '.$fname . ' in ' 
-                            . $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
-                    }
+			// Delete old functions
+			foreach ($this->functionList as $fname => $fvalue)
+			{
+				if ($fvalue['plugin'] == $pluginName)
+				{
+					unset($this->functionList[$fname]);
+				}
+			}
+			// Add functions
+			foreach ($newClass->functions as $fname => $function)
+			{
+				if (isset($this->functionList[$fname]))
+				{
+					if ($this->functionList[$fname]['plugin'] != $pluginName )
+					{
+						throw new Exception('Duplicate function name '.$fname . ' in ' 
+							. $pluginName . ' and ' . $this->functionList[$fname]['plugin']);
+					}
                     
-                }
-                else
-                {
-                    $this->functionList[$fname]=array();
-                    $this->functionList[$fname]['plugin'] = $pluginName;
-                }
-                $this->functionList[$fname]['function']=$function['function'];
-            }
-            $this->logClass->log('Registered plugin '.$pluginName,DEBUG);
+				}
+				else
+				{
+					$this->functionList[$fname]=array();
+					$this->functionList[$fname]['plugin'] = $pluginName;
+				}
+				$this->functionList[$fname]['function']=$function['function'];
+			}
+			$this->logClass->log('Registered plugin '.$pluginName,DEBUG);
             
-        } catch (Exception $e) {
-            unset($this->pluginsList[$pluginName]);
-            $errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
-            $this->logClass->log($errorMessage,WARN);
-            // Disable the plugin
-            $this->enablePlugin($pluginName, false);
-            throw new \Exception($errorMessage);
-        } catch (Throwable $t) {
-            unset($this->pluginsList[$pluginName]);
-            $errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
-            $this->logClass->log($errorMessage,WARN);
-            // Disable the plugin
-            $this->enablePlugin($pluginName, false);
-            throw new \Exception($errorMessage);
-        }
-        return true;
-    }
+		} catch (Exception $e) {
+			unset($this->pluginsList[$pluginName]);
+			$errorMessage = "Error registering plugin $pluginName : ".$e->getMessage();
+			$this->logClass->log($errorMessage,WARN);
+			// Disable the plugin
+			$this->enablePlugin($pluginName, false);
+			throw new \Exception($errorMessage);
+		} catch (Throwable $t) {
+			unset($this->pluginsList[$pluginName]);
+			$errorMessage = $t->getMessage() . ' in file ' . $t->getFile() . ' line ' . $t->getLine();
+			$this->logClass->log($errorMessage,WARN);
+			// Disable the plugin
+			$this->enablePlugin($pluginName, false);
+			throw new \Exception($errorMessage);
+		}
+		return true;
+	}
     
-    /** Registers all plugins (check=false) or only those with name present in array (check=true)
-     * @param bool $checkEnabled Check if plugin is enabled before loading it
-     * @return string Errors encountered while registering plugins
-     */
-    public function registerAllPlugins(bool $checkEnabled=true)
-    {
-        $retDisplay='';
-        // First load enabled plugins
-        foreach (array_keys($this->pluginsList) as $pluginName)
-        {
-            try {
-                $this->registerPlugin($pluginName);
-            } catch (Exception $e) {
-                $retDisplay .= $e->getMessage() . ' / ';
-            }
-        }
-        if ($checkEnabled === false) // Load all php files in plugin dir
-        {
-            foreach (glob($this->pluginDir."/*.php") as $filename)
-            {             
-                $pluginName=basename($filename,'.php');
-                if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
-                {
-                    $this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
-                    $retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
-                    break;
-                }
-                try { // Already registerd plugin will simply return false
-                    $this->registerPlugin($pluginName);               
-                } catch (Exception $e) {
-                    $retDisplay .= $e->getMessage() . ' / ';
-                }
-            }
-        }
+	/** Registers all plugins (check=false) or only those with name present in array (check=true)
+	 * @param bool $checkEnabled Check if plugin is enabled before loading it
+	 * @return string Errors encountered while registering plugins
+	 */
+	public function registerAllPlugins(bool $checkEnabled=true)
+	{
+		$retDisplay='';
+		// First load enabled plugins
+		foreach (array_keys($this->pluginsList) as $pluginName)
+		{
+			try {
+				$this->registerPlugin($pluginName);
+			} catch (Exception $e) {
+				$retDisplay .= $e->getMessage() . ' / ';
+			}
+		}
+		if ($checkEnabled === false) // Load all php files in plugin dir
+		{
+			foreach (glob($this->pluginDir."/*.php") as $filename)
+			{             
+				$pluginName=basename($filename,'.php');
+				if (!preg_match('/^[a-zA-Z0-9]+$/',$pluginName))
+				{
+					$this->logClass->log("Invalid plugin name : ".$pluginName, WARN);
+					$retDisplay .= "Invalid plugin name : ".$pluginName . " / ";
+					break;
+				}
+				try { // Already registerd plugin will simply return false
+					$this->registerPlugin($pluginName);               
+				} catch (Exception $e) {
+					$retDisplay .= $e->getMessage() . ' / ';
+				}
+			}
+		}
         
-        if ($retDisplay == '')
-        {
-            return 'All plugins loaded OK';
-        }
-        else
-        {
-            return $retDisplay;
-        }
-    }
+		if ($retDisplay == '')
+		{
+			return 'All plugins loaded OK';
+		}
+		else
+		{
+			return $retDisplay;
+		}
+	}
     
-    /**
-     * Returns array of name of loaded plugins
-     * @return array
-     */
-    public function pluginList() : array
-    {
-        return array_keys($this->pluginsList);    
-    }
+	/**
+	 * Returns array of name of loaded plugins
+	 * @return array
+	 */
+	public function pluginList() : array
+	{
+		return array_keys($this->pluginsList);    
+	}
 
-    /**
-     * Get plugin details
-     * @param string $name name of plugins
-     * @return boolean|stdClass result as stdClass or false if plugin not found.
-     * @throws \Exception if registering is not possible
-     */
-    public function pluginDetails(string $name)
-    {
-        if (!array_key_exists($name, $this->pluginsList))
-        {
-            return false;
-        }
-        if ($this->pluginsList[$name]['object'] === null)
-        {
-            $this->registerPlugin($name); // can throw exception handled by caller
-        }
-        $retObj = new stdClass();
-        $retObj->name           = $name;
-        $retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
-        $retObj->processTraps   = $this->pluginsList[$name]['target'];
-        $retObj->description    = $this->pluginsList[$name]['object']->description;
-        $functions=array();
-        foreach ($this->functionList as $fName => $func)
-        {
-            if ($func['plugin'] == $name)
-            {
-                array_push($functions,$fName);
-            }
-        }
-        $retObj->funcArray=$functions;
-        return $retObj;
-    }
+	/**
+	 * Get plugin details
+	 * @param string $name name of plugins
+	 * @return boolean|stdClass result as stdClass or false if plugin not found.
+	 * @throws \Exception if registering is not possible
+	 */
+	public function pluginDetails(string $name)
+	{
+		if (!array_key_exists($name, $this->pluginsList))
+		{
+			return false;
+		}
+		if ($this->pluginsList[$name]['object'] === null)
+		{
+			$this->registerPlugin($name); // can throw exception handled by caller
+		}
+		$retObj = new stdClass();
+		$retObj->name           = $name;
+		$retObj->catchAllTraps  = $this->pluginsList[$name]['allOID'];
+		$retObj->processTraps   = $this->pluginsList[$name]['target'];
+		$retObj->description    = $this->pluginsList[$name]['object']->description;
+		$functions=array();
+		foreach ($this->functionList as $fName => $func)
+		{
+			if ($func['plugin'] == $name)
+			{
+				array_push($functions,$fName);
+			}
+		}
+		$retObj->funcArray=$functions;
+		return $retObj;
+	}
        
-    /**
-     * Get plugin name from function name
-     * @param string $funcName
-     * @param string $pluginName
-     * @return boolean returns plugin object of false;
-     */
-    public function getFunction($funcName,&$pluginName)
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            return false;
-        }
-        $pluginName = $this->functionList[$funcName]['plugin'];
-        return true;
-    }
+	/**
+	 * Get plugin name from function name
+	 * @param string $funcName
+	 * @param string $pluginName
+	 * @return boolean returns plugin object of false;
+	 */
+	public function getFunction($funcName,&$pluginName)
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			return false;
+		}
+		$pluginName = $this->functionList[$funcName]['plugin'];
+		return true;
+	}
     
-    /**
-     * Get functions params and description
-     * @param string $funcName
-     * @return boolean|stdClass false if not found or object (name,params,description)
-     * @throws \Exception if registering is not possible
-     */
-    public function getFunctionDetails($funcName)
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            return false;
-        }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
-        if ($plugin === null)
-        {
-            $this->registerPlugin($pluginName); // can throw exception handled by caller
-        }
-        $retObj = new stdClass();
-        $retObj->name           = $funcName;
-        $retObj->plugin         = $pluginName;
-        $retObj->params         = $plugin->functions[$funcName]['params'];
-        $retObj->description    = $plugin->functions[$funcName]['description'];
-        return $retObj;
-    }
+	/**
+	 * Get functions params and description
+	 * @param string $funcName
+	 * @return boolean|stdClass false if not found or object (name,params,description)
+	 * @throws \Exception if registering is not possible
+	 */
+	public function getFunctionDetails($funcName)
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			return false;
+		}
+		$pluginName = $this->functionList[$funcName]['plugin']; // plugin name
+		$plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+		if ($plugin === null)
+		{
+			$this->registerPlugin($pluginName); // can throw exception handled by caller
+		}
+		$retObj = new stdClass();
+		$retObj->name           = $funcName;
+		$retObj->plugin         = $pluginName;
+		$retObj->params         = $plugin->functions[$funcName]['params'];
+		$retObj->description    = $plugin->functions[$funcName]['description'];
+		return $retObj;
+	}
     
-    /**
-     * Evaluate function with parameters
-     * @param string $funcName
-     * @param mixed $params
-     * @throws Exception
-     * @return bool
-     */
-    public function getFunctionEval(string $funcName,$params) : bool
-    {
-        if (! isset($this->functionList[$funcName]) )
-        {
-            throw new Exception($funcName . ' not found.');
-        }
-        $pluginName = $this->functionList[$funcName]['plugin']; // plugin name
-        $plugin = $this->pluginsList[$pluginName]['object']; // plugin object
+	/**
+	 * Evaluate function with parameters
+	 * @param string $funcName
+	 * @param mixed $params
+	 * @throws Exception
+	 * @return bool
+	 */
+	public function getFunctionEval(string $funcName,$params) : bool
+	{
+		if (! isset($this->functionList[$funcName]) )
+		{
+			throw new Exception($funcName . ' not found.');
+		}
+		$pluginName = $this->functionList[$funcName]['plugin']; // plugin name
+		$plugin = $this->pluginsList[$pluginName]['object']; // plugin object
 
-        if ($plugin === null)
-        {
-            $this->registerPlugin($pluginName); // can throw exception handled by caller
-            $plugin = $this->pluginsList[$pluginName]['object'];
-        }
+		if ($plugin === null)
+		{
+			$this->registerPlugin($pluginName); // can throw exception handled by caller
+			$plugin = $this->pluginsList[$pluginName]['object'];
+		}
         
-        $propertyName = $this->functionList[$funcName]['function'];
-        $this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
+		$propertyName = $this->functionList[$funcName]['function'];
+		$this->logClass->log('Using property '. $propertyName . ' of class : '.$pluginName,DEBUG);
         
-        return $plugin->{$propertyName}($params);        
-    }
+		return $plugin->{$propertyName}($params);        
+	}
     
-    public function evaluateFunctionString(string $functionString) : bool
-    {
-        $matches=array();
-        // Cleanup spaces
-        //$functionString = $this->trapClass->ruleClass->eval_cleanup($functionString);
-        //$this->logClass->log('eval cleanup : '.$functionString,DEBUG);
+	public function evaluateFunctionString(string $functionString) : bool
+	{
+		$matches=array();
+		// Cleanup spaces
+		//$functionString = $this->trapClass->ruleClass->eval_cleanup($functionString);
+		//$this->logClass->log('eval cleanup : '.$functionString,DEBUG);
         
-        // Match function call
-        $num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
-        if ($num !=1)
-        {
-            throw new \ErrorException('Function syntax error : ' . $functionString );
-        }
-        $this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
-        $funcName=$matches[1];
+		// Match function call
+		$num=preg_match('/^__([a-zA-Z0-9]+)\((.+)\)$/', $functionString , $matches);
+		if ($num !=1)
+		{
+			throw new \ErrorException('Function syntax error : ' . $functionString );
+		}
+		$this->logClass->log('Got function : '. $matches[1] . ', params : '.$matches[2],DEBUG);
+		$funcName=$matches[1];
         
-        // Get parameters comma separated
-        $funcParams=str_getcsv($matches[2],',','"',"\\");
-        $this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
+		// Get parameters comma separated
+		$funcParams=str_getcsv($matches[2],',','"',"\\");
+		$this->logClass->log('Function params : ' . print_r($funcParams,true),DEBUG);
         
-        // return evaluation
-        return $this->getFunctionEval($funcName, $funcParams);        
+		// return evaluation
+		return $this->getFunctionEval($funcName, $funcParams);        
         
-    }
+	}
     
 }
 
 abstract class PluginTemplate
 {
     
-    /** @var Logging $loggingClass */
-    private $loggingClass;
+	/** @var Logging $loggingClass */
+	private $loggingClass;
     
-    /** @var string $name Name of plugin */
-    public $name;
+	/** @var string $name Name of plugin */
+	public $name;
     
-    /** @var string $description Description of plugin */
-    public $description='Default plugin description';
+	/** @var string $description Description of plugin */
+	public $description='Default plugin description';
     
-    /** @var array $functions Functions of this plugin for rule eval*/
-    public $functions=array();
+	/** @var array $functions Functions of this plugin for rule eval*/
+	public $functions=array();
     
-    /** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin */
-    public $catchAllTraps=false;
+	/** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin */
+	public $catchAllTraps=false;
     
-    /** @var boolean $processTraps Set to true if plugins can handle traps */
-    public $processTraps=false;
+	/** @var boolean $processTraps Set to true if plugins can handle traps */
+	public $processTraps=false;
     
-    /**
-     * @param \Trapdirector\Logging $loggingClass
-     */
-    public function setLoggingClass($loggingClass)
-    {
-        $this->loggingClass = $loggingClass;
-    }
+	/**
+	 * @param \Trapdirector\Logging $loggingClass
+	 */
+	public function setLoggingClass($loggingClass)
+	{
+		$this->loggingClass = $loggingClass;
+	}
     
-    /**
-     * 
-     * @param string $message
-     * @param int $level DEBUG/INFO/WARN/CRIT
-     */
-    public function log($message,$level)
-    {
-        $this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
-    }
+	/**
+	 * 
+	 * @param string $message
+	 * @param int $level DEBUG/INFO/WARN/CRIT
+	 */
+	public function log($message,$level)
+	{
+		$this->loggingClass->log('[ '.get_class($this).'] '. $message, $level);
+	}
 }
\ No newline at end of file

library/Trapdirector/TrapsProcess/Database.php

Indentation +347 added lines, -347 removed lines

@@ -9,383 +9,383 @@
 class Database
 {
 
-    // Databases
-    /** @var \PDO $trapDB trap database */
-    protected $trapDB=null; 
-    protected $idoDB=null; //< ido database
-    public $trapDBType; //< Type of database for traps (mysql, pgsql)
-    public $idoDBType; //< Type of database for ido (mysql, pgsql)
+	// Databases
+	/** @var \PDO $trapDB trap database */
+	protected $trapDB=null; 
+	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()
-    {
-        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;
-    }
+	/**
+	 * 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;
+	}
     
-    /**
-     * 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;
+	}
 
-    /** Set name=element in database config table
-     * @param string $name
-     * @param string $element
-     * @return boolean true on success, else false (error logged)
-     */
-    public function setDBConfig($name,$element)
-    {
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');           
-            return false;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['id']))
-        {   // Entry exists -> update
-            $sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
-        }
-        else
-        {   // Entry does no exists -> create
-            $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
-        }
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');
-            return false;
-        }
-        $this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
-        return true;
-    }
+	/** Set name=element in database config table
+	 * @param string $name
+	 * @param string $element
+	 * @return boolean true on success, else false (error logged)
+	 */
+	public function setDBConfig($name,$element)
+	{
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Error setting config element : ' . $sql,WARN,'');           
+			return false;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['id']))
+		{   // Entry exists -> update
+			$sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
+		}
+		else
+		{   // Entry does no exists -> create
+			$sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
+		}
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('Error setting config element : ' . $sql,WARN,'');
+			return false;
+		}
+		$this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
+		return true;
+	}
 
-    /**
-     *   Get data from db_config
-     *	@param $element string name of param
-     *	@return mixed : value (or null)
-     */
-    public function getDBConfig($element)
-    {
-        $db_conn=$this->db_connect_trap();
-        $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
-            return null;
-        }
-        $value=$ret_code->fetch();
-        if ($value != null && isset($value['value']))
-        {
-            return $value['value'];
-        }
-        return null;
-    }
+	/**
+	 *   Get data from db_config
+	 *	@param $element string name of param
+	 *	@return mixed : value (or null)
+	 */
+	public function getDBConfig($element)
+	{
+		$db_conn=$this->db_connect_trap();
+		$sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,WARN,'');
+			return null;
+		}
+		$value=$ret_code->fetch();
+		if ($value != null && isset($value['value']))
+		{
+			return $value['value'];
+		}
+		return null;
+	}
     
     
-    //*********    Schema Management *********************/
+	//*********    Schema Management *********************/
 
-    /** 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 +65 added lines, -65 removed lines

@@ -34,16 +34,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();
         
     }
@@ -55,9 +55,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();
     }
@@ -75,13 +75,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;
     }
@@ -99,13 +99,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;
     }
@@ -117,21 +117,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;
     }
@@ -141,12 +141,12 @@ 
      * @param string $element
      * @return boolean true on success, else false (error logged)
      */
-    public function setDBConfig($name,$element)
+    public function setDBConfig($name, $element)
     {
         $db_conn=$this->db_connect_trap();
         $sql='SELECT id from '.$this->dbPrefix.'db_config WHERE ( name=\''.$name.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');           
+            $this->logging->log('Error setting config element : '.$sql, WARN, '');           
             return false;
         }
         $value=$ret_code->fetch();
@@ -159,10 +159,10 @@ 
             $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
         }
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('Error setting config element : ' . $sql,WARN,'');
+            $this->logging->log('Error setting config element : '.$sql, WARN, '');
             return false;
         }
-        $this->logging->log('Setting config '.$name.' = '.$element.' in database',INFO);
+        $this->logging->log('Setting config '.$name.' = '.$element.' in database', INFO);
         return true;
     }
 
@@ -176,7 +176,7 @@ 
         $db_conn=$this->db_connect_trap();
         $sql='SELECT value from '.$this->dbPrefix.'db_config WHERE ( name=\''.$element.'\' )';
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,WARN,'');
+            $this->logging->log('No result in query : '.$sql, WARN, '');
             return null;
         }
         $value=$ret_code->fetch();
@@ -194,14 +194,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='';
@@ -211,15 +211,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];
                 }
@@ -227,20 +227,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);
     }
     
     /**
@@ -251,14 +251,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();
@@ -266,11 +266,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)
@@ -294,17 +294,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='';
@@ -313,25 +313,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='';
                 }
@@ -339,13 +339,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;
     }
@@ -357,33 +357,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;
     }

Braces +8 added lines, -9 removed lines

@@ -153,8 +153,7 @@ 
         if ($value != null && isset($value['id']))
         {   // Entry exists -> update
             $sql='UPDATE '.$this->dbPrefix.'db_config SET value = \''.$element.'\' WHERE (id = '.$value['id'].')';
-        }
-        else
+        } else
         {   // Entry does no exists -> create
             $sql='INSERT INTO '.$this->dbPrefix.'db_config (name,value) VALUES (\''.$name.'\' , \''.$element.'\' )';
         }
@@ -222,8 +221,7 @@ 
                 if (preg_match('/^ *CREATE TABLE ([^ ]+)/',$newline,$cur_table_array))
                 {
                     $cur_table='table '.$cur_table_array[1];
-                }
-                else
+                } else
                 {
                     $cur_table='secret SQL stuff :-)';
                 }
@@ -267,8 +265,7 @@ 
         if ($this->trapDBType == 'pgsql')
         {
             $prefix .= 'update_pgsql/schema_';
-        }
-        else
+        } else
         {
             $prefix .= 'update_sql/schema_';
         }
@@ -312,7 +309,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))
                 {
@@ -325,8 +325,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;

library/Trapdirector/Tables/TrapTableList.php

Spacing +35 added lines, -35 removed lines

@@ -21,8 +21,8 @@ 
 	// Filters 
 	
     protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+    protected $enforcedFilters=array();
+    protected $searchColumns=array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -38,60 +38,60 @@ 
 	public function render()
 	{
 		$data=$this->getTable();
-		$view = $this->getView();
-		$this->columnCount = count($this->getTitles());
+		$view=$this->getView();
+		$this->columnCount=count($this->getTitles());
 		$this->lastDay=null;
 		// Table start
-		$htm  = '<table class="simple common-table table-row-selectable">';
+		$htm='<table class="simple common-table table-row-selectable">';
 		
 		// Titles
-		$htm .= "<thead>\n  <tr>\n";
-		$titles = $this->getTitles();
+		$htm.="<thead>\n  <tr>\n";
+		$titles=$this->getTitles();
 		foreach ($titles as $title) 
 		{
-			$htm .= '    <th>' . $view->escape($view->translate($title)) . "</th>\n";
+			$htm.='    <th>'.$view->escape($view->translate($title))."</th>\n";
 		}
-		$htm .= "  </tr>\n</thead>\n";
+		$htm.="  </tr>\n</thead>\n";
 		
 		// Rows
-		$htm .= "<tbody>\n";
+		$htm.="<tbody>\n";
 		
 		foreach ($data as $row) 
 		{
-			$firstCol = true;
+			$firstCol=true;
 			// Put date header
-			$htm .= $this->renderDayIfNew($row->timestamp);
+			$htm.=$this->renderDayIfNew($row->timestamp);
 			
 			
 			// Render row
-			$htm .= '<tr>';
-			foreach ( $titles as $rowkey => $title) 
+			$htm.='<tr>';
+			foreach ($titles as $rowkey => $title) 
 			{
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
 				{
-					$val = ($rowkey=='timestamp') ?  strftime('%T',$row->$rowkey) : $row->$rowkey;
+					$val=($rowkey == 'timestamp') ?  strftime('%T', $row->$rowkey) : $row->$rowkey;
 				} else {
-					$val = '-';
+					$val='-';
 				}
 				if ($firstCol == true) { // Put link in first column for trap detail.
-					$htm .= '<td>' 
+					$htm.='<td>' 
 							. $view->qlink(
 									$view->escape($val),  
 									Url::fromPath(
-										$this->moduleConfig->urlPath() . '/received/trapdetail', 
+										$this->moduleConfig->urlPath().'/received/trapdetail', 
 										array('id' => $row->id)
 									)
 							)
 							. '</td>';
 				} else {
-					$htm .= '<td>' . $view->escape($val) . '</td>';
+					$htm.='<td>'.$view->escape($val).'</td>';
 				}
 				$firstCol=false;
 			}
-			$htm .= "<tr>\n";
+			$htm.="<tr>\n";
 		}
-		$htm .= "</tbody></table>\n";
+		$htm.="</tbody></table>\n";
 		//$htm .= "Filter : " . $this->filter."<br>\n";
 		return $htm;
 
@@ -101,7 +101,7 @@ 
     {
         $db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             array('COUNT(*)')
         );
@@ -112,7 +112,7 @@ 
 	
     public function getPaginator()
     {
-        $paginator = new Paginator();
+        $paginator=new Paginator();
         $paginator->setQuery($this);
 
         return $paginator;
@@ -124,7 +124,7 @@ 
 	{
 		$db=$this->db();
 		
-		$query = $this->getBaseQuery();
+		$query=$this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
        if ($this->hasLimit() || $this->hasOffset()) {
             $query->limit($this->getLimit(), $this->getOffset());
@@ -137,7 +137,7 @@ 
     {
 		$db=$this->db();
 		
-		$query = $db->select()->from(
+		$query=$db->select()->from(
             $this->moduleConfig->getTrapTableName(),
             $this->moduleConfig->getTrapListDisplayColumns()
         )->order('timestamp DESC');
@@ -150,7 +150,7 @@ 
 	protected $filter_Handler;
 	protected $filter_query='';
 	protected $filter_done='';
-	protected $filter_query_list=array('q','done');
+	protected $filter_query_list=array('q', 'done');
 	public function renderFilterHTML()
 	{
 		$htm=' <form id="filter" name="mainFilter" 
@@ -160,17 +160,17 @@ 
 		$htm.='<input type="text" name="q" title="Search is simple! Try to combine multiple words" 
 		placeholder="Search..." class="search" value="'.$this->filter_query.'">';
 		$htm.='<input type="checkbox" id="checkbox_done" name="done" value="1" class="autosubmit" ';
-		if	($this->filter_done == 1) { $htm.=' checked ';}
+		if ($this->filter_done == 1) { $htm.=' checked '; }
 		$htm.='> <label for="checkbox_done">Hide processed traps</label>';
 		$htm.='</form>';
 		return $htm;
 	}
 	
-	public function updateFilter($handler,$filter)
+	public function updateFilter($handler, $filter)
 	{
 		$this->filter_Handler=$handler->remove($this->filter_query_list)->__toString();
-		$this->filter_query=(isset($filter['q']))?$this->filter_query=$filter['q']:'';
-		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
+		$this->filter_query=(isset($filter['q'])) ? $this->filter_query=$filter['q'] : '';
+		$this->filter_done=(isset($filter['done'])) ? $this->filter_done=$filter['done'] : 0;
 	}
 	
     protected function getSearchColumns()
@@ -185,20 +185,20 @@ 
 
     public function setFilter($filter)
     {
-        $this->filter = $filter;
+        $this->filter=$filter;
         return $this;
     }
 	
 	public function getFilterEditor(Request $request)
     {
-        $filterEditor = Widget::create('filterEditor')
+        $filterEditor=Widget::create('filterEditor')
             ->setColumns(array_keys($this->getColumns()))
             ->setSearchColumns(array_keys($this->getSearchColumns()))
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
             ->ignoreParams('page')
             ->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
+        $filter=$filterEditor->getFilter();
         $this->setFilter($filter);
 
         return $filterEditor;
@@ -212,9 +212,9 @@ 
 		{
 			$sql.='(';
 			$first=1;
-			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
+			foreach ($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first == 0) $sql.=' OR ';
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}

Indentation +55 added lines, -55 removed lines

@@ -18,9 +18,9 @@ 
 	
 	// Filters 
 	
-    protected $filter;
-    protected $enforcedFilters = array();
-    protected $searchColumns = array();
+	protected $filter;
+	protected $enforcedFilters = array();
+	protected $searchColumns = array();
 	
 	protected function getTitles() {
 		// TODO : check moduleconfig is set
@@ -28,10 +28,10 @@ 
 	}
 		
 	// ******************  Render table in html  
-    public function __toString()
-    {
-        return $this->render();
-    }
+	public function __toString()
+	{
+		return $this->render();
+	}
 	
 	public function render()
 	{
@@ -95,26 +95,26 @@ 
 
 	}
 
-    public function count()
-    {
-        $db=$this->db();
+	public function count()
+	{
+		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapTableName(),
-            array('COUNT(*)')
-        );
+			$this->moduleConfig->getTrapTableName(),
+			array('COUNT(*)')
+		);
 		$this->applyFiltersToQuery($query);
 		
-        return $db->fetchOne($query);
-    }
+		return $db->fetchOne($query);
+	}
 	
-    public function getPaginator()
-    {
-        $paginator = new Paginator();
-        $paginator->setQuery($this);
+	public function getPaginator()
+	{
+		$paginator = new Paginator();
+		$paginator->setQuery($this);
 
-        return $paginator;
-    }
+		return $paginator;
+	}
 	
 	// ****************** DB connection and query
 	
@@ -124,24 +124,24 @@ 
 		
 		$query = $this->getBaseQuery();
 		$this->applyFiltersToQuery($query);
-       if ($this->hasLimit() || $this->hasOffset()) {
-            $query->limit($this->getLimit(), $this->getOffset());
-        }		
+	   if ($this->hasLimit() || $this->hasOffset()) {
+			$query->limit($this->getLimit(), $this->getOffset());
+		}		
 		
 		return $db->fetchAll($query);
 	}
 	 
-    public function getBaseQuery()
-    {
+	public function getBaseQuery()
+	{
 		$db=$this->db();
 		
 		$query = $db->select()->from(
-            $this->moduleConfig->getTrapTableName(),
-            $this->moduleConfig->getTrapListDisplayColumns()
-        )->order('timestamp DESC');
+			$this->moduleConfig->getTrapTableName(),
+			$this->moduleConfig->getTrapListDisplayColumns()
+		)->order('timestamp DESC');
 
-        return $query;
-    }	 
+		return $query;
+	}	 
 	
 	// ****************** Filters
 
@@ -171,39 +171,39 @@ 
 		$this->filter_done=(isset($filter['done']))?$this->filter_done=$filter['done']:0;
 	}
 	
-    protected function getSearchColumns()
-    {
-        return $this->getColumns();
-    }
+	protected function getSearchColumns()
+	{
+		return $this->getColumns();
+	}
 	
 	public function getColumns()
 	{
 		return $this->moduleConfig->getTrapListDisplayColumns();
 	}
 
-    public function setFilter($filter)
-    {
-        $this->filter = $filter;
-        return $this;
-    }
+	public function setFilter($filter)
+	{
+		$this->filter = $filter;
+		return $this;
+	}
 	
 	public function getFilterEditor(Request $request)
-    {
-        $filterEditor = Widget::create('filterEditor')
-            ->setColumns(array_keys($this->getColumns()))
-            ->setSearchColumns(array_keys($this->getSearchColumns()))
-            ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
-            ->ignoreParams('page')
-            ->handleRequest($request);
+	{
+		$filterEditor = Widget::create('filterEditor')
+			->setColumns(array_keys($this->getColumns()))
+			->setSearchColumns(array_keys($this->getSearchColumns()))
+			->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
+			->ignoreParams('page')
+			->handleRequest($request);
 
-        $filter = $filterEditor->getFilter();
-        $this->setFilter($filter);
+		$filter = $filterEditor->getFilter();
+		$this->setFilter($filter);
 
-        return $filterEditor;
-    }
+		return $filterEditor;
+	}
 	
-    protected function applyFiltersToQuery($query)
-    {
+	protected function applyFiltersToQuery($query)
+	{
 		
 		$sql='';
 		if ($this->filter_query != '')
@@ -224,7 +224,7 @@ 
 			$sql.="(status != 'done')";
 		}
 		if ($sql != '') $query->where($sql);	
-        return $query;
-    }	
+		return $query;
+	}	
 
 }
\ No newline at end of file

Braces +9 added lines, -3 removed lines

@@ -212,7 +212,9 @@ 
 			$first=1;
 			foreach($this->moduleConfig->getTrapListSearchColumns() as $column)
 			{
-				if ($first==0) $sql.=' OR ';
+				if ($first==0) {
+					$sql.=' OR ';
+				}
 				$first=0;
 				$sql.=" CAST(".$column." AS  char(100))  LIKE  '%".$this->filter_query."%' ";
 			}
@@ -220,10 +222,14 @@ 
 		}
 		if ($this->filter_done == 1)
 		{
-			if ($sql != '') $sql.=' AND ';
+			if ($sql != '') {
+				$sql.=' AND ';
+			}
 			$sql.="(status != 'done')";
 		}
-		if ($sql != '') $query->where($sql);	
+		if ($sql != '') {
+			$query->where($sql);
+		}
         return $query;
     }	
 

library/Trapdirector/Plugins/NetworkRule.php

Indentation +83 added lines, -83 removed lines

@@ -21,104 +21,104 @@
  */
 class NetworkRule extends PluginTemplate
 {        
-    /** @var string $description Description of plugin */
-    public $description='Network functions to use into rules
+	/** @var string $description Description of plugin */
+	public $description='Network functions to use into rules
 test test test';
     
-    /** @var array[] $functions Functions of this plugin for rule eval. 
-     * If no functions are declared, set to empty array
-     * $functions[<name>]['function'] : Name of the function to be called in this class
-     * $functions[<name>]['params'] : Description of input parameters of function.
-     * $functions[<name>]['description'] : Description. Can be multiline.
-    */
-    public $functions=array(
-        'inNetwork' => array( // The name of the function in rules
-            'function'      =>  'isInNetwork', // Name of the function 
-            'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
-            'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
+	/** @var array[] $functions Functions of this plugin for rule eval. 
+	 * If no functions are declared, set to empty array
+	 * $functions[<name>]['function'] : Name of the function to be called in this class
+	 * $functions[<name>]['params'] : Description of input parameters of function.
+	 * $functions[<name>]['description'] : Description. Can be multiline.
+	 */
+	public $functions=array(
+		'inNetwork' => array( // The name of the function in rules
+			'function'      =>  'isInNetwork', // Name of the function 
+			'params'        =>  '<IP to test>,<Network IP>,<Network mask (CIDR)>', // parameters description
+			'description'   =>  'Test if IP is in network, ex : __inNetwork(192.168.123.5,192.168.123.0,24) returns true
 Does not work with IPV6' // Description (can be multiline).
-        ),
-        'test' => array( // The name of the function in rules
-            'function'      =>  'testParam', // Name of the function
-            'params'        =>  '<boolean to return as string>', // parameters description
-            'description'   =>  'Returns value passed as argument' // Description (can be multiline).
-        )
-    );
+		),
+		'test' => array( // The name of the function in rules
+			'function'      =>  'testParam', // Name of the function
+			'params'        =>  '<boolean to return as string>', // parameters description
+			'description'   =>  'Returns value passed as argument' // Description (can be multiline).
+		)
+	);
     
-    /** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
-    public $catchAllTraps=false;
+	/** @var boolean $catchAllTraps Set to true if all traps will be sent to the plugin NOT IMPLEMENTED */
+	public $catchAllTraps=false;
     
-    /** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
-    public $processTraps=false;
+	/** @var boolean $processTraps Set to true if plugins can handle traps NOT IMPLEMENTED */
+	public $processTraps=false;
     
-    /**
-     * Constructor. Can throw exceptions on error, but no logging at this point.
-     * @throws \Exception
-     * @return \Trapdirector\Plugins\NetworkRule
-     */
-    function __construct()
-    {
-        $this->name=basename(__FILE__,'.php');
-        return $this;
-    }
+	/**
+	 * Constructor. Can throw exceptions on error, but no logging at this point.
+	 * @throws \Exception
+	 * @return \Trapdirector\Plugins\NetworkRule
+	 */
+	function __construct()
+	{
+		$this->name=basename(__FILE__,'.php');
+		return $this;
+	}
     
-    /**
-     * Function called by trapdirector if found in rules
-     * Parameters check has to be done in function.
-     * @param array $params Function parameters
-     * @throws Exception
-     * @return bool Evaluation 
-     */
-    public function isInNetwork(array $params) : bool
-    {
-        // Check param numbers and thrown exception if not correct.
-        if (count($params)!=3)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($params));
-        }
+	/**
+	 * Function called by trapdirector if found in rules
+	 * Parameters check has to be done in function.
+	 * @param array $params Function parameters
+	 * @throws Exception
+	 * @return bool Evaluation 
+	 */
+	public function isInNetwork(array $params) : bool
+	{
+		// Check param numbers and thrown exception if not correct.
+		if (count($params)!=3)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($params));
+		}
         
-        $ip = $params[0];
-        $net = $params[1];
-        $masq = $params[2];
+		$ip = $params[0];
+		$net = $params[1];
+		$masq = $params[2];
         
         
-        $this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
+		$this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
         
-        $ip2 = ip2long($ip);
-        $net2 = ip2long($net);
+		$ip2 = ip2long($ip);
+		$net2 = ip2long($net);
         
-        if ($ip2 === false )
-        {
-            $this->log('Invalid IP : #' . $ip.'#',WARN);
-            throw new Exception('Invalid IP');
-        }
-        if ($net2 === false)
-        {
-            $this->log('Invalid network',WARN);
-            throw new Exception('Invalid net');
-        }
-        if ($masq<1 || $masq > 32)
-        {
-            $this->log('Invalid masq',WARN);
-            throw new Exception('Invalid net masq');
-        }
-        // $range is in IP/CIDR format eg 127.0.0.1/24
+		if ($ip2 === false )
+		{
+			$this->log('Invalid IP : #' . $ip.'#',WARN);
+			throw new Exception('Invalid IP');
+		}
+		if ($net2 === false)
+		{
+			$this->log('Invalid network',WARN);
+			throw new Exception('Invalid net');
+		}
+		if ($masq<1 || $masq > 32)
+		{
+			$this->log('Invalid masq',WARN);
+			throw new Exception('Invalid net masq');
+		}
+		// $range is in IP/CIDR format eg 127.0.0.1/24
 
-        $masq = pow( 2, ( 32 - $masq ) ) - 1;
-        $masq = ~ $masq;
-        return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
+		$masq = pow( 2, ( 32 - $masq ) ) - 1;
+		$masq = ~ $masq;
+		return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
         
-    }
+	}
     
-    public function testParam(array $param)
-    {
-        if (count($param)!=1)
-        {
-            throw new Exception('Invalid number of parameters : ' . count($param));
-        }
-        if ($param[0] == 'true') return true;
-        return false;
-    }
+	public function testParam(array $param)
+	{
+		if (count($param)!=1)
+		{
+			throw new Exception('Invalid number of parameters : ' . count($param));
+		}
+		if ($param[0] == 'true') return true;
+		return false;
+	}
 }
 
 

Spacing +19 added lines, -19 removed lines

@@ -58,7 +58,7 @@ 
      */
     function __construct()
     {
-        $this->name=basename(__FILE__,'.php');
+        $this->name=basename(__FILE__, '.php');
         return $this;
     }
     
@@ -72,49 +72,49 @@ 
     public function isInNetwork(array $params) : bool
     {
         // Check param numbers and thrown exception if not correct.
-        if (count($params)!=3)
+        if (count($params) != 3)
         {
-            throw new Exception('Invalid number of parameters : ' . count($params));
+            throw new Exception('Invalid number of parameters : '.count($params));
         }
         
-        $ip = $params[0];
-        $net = $params[1];
-        $masq = $params[2];
+        $ip=$params[0];
+        $net=$params[1];
+        $masq=$params[2];
         
         
-        $this->log('#'. $ip . '# / #' . $net . '# / #' . $masq,DEBUG);
+        $this->log('#'.$ip.'# / #'.$net.'# / #'.$masq, DEBUG);
         
-        $ip2 = ip2long($ip);
-        $net2 = ip2long($net);
+        $ip2=ip2long($ip);
+        $net2=ip2long($net);
         
-        if ($ip2 === false )
+        if ($ip2 === false)
         {
-            $this->log('Invalid IP : #' . $ip.'#',WARN);
+            $this->log('Invalid IP : #'.$ip.'#', WARN);
             throw new Exception('Invalid IP');
         }
         if ($net2 === false)
         {
-            $this->log('Invalid network',WARN);
+            $this->log('Invalid network', WARN);
             throw new Exception('Invalid net');
         }
-        if ($masq<1 || $masq > 32)
+        if ($masq < 1 || $masq > 32)
         {
-            $this->log('Invalid masq',WARN);
+            $this->log('Invalid masq', WARN);
             throw new Exception('Invalid net masq');
         }
         // $range is in IP/CIDR format eg 127.0.0.1/24
 
-        $masq = pow( 2, ( 32 - $masq ) ) - 1;
-        $masq = ~ $masq;
-        return ( ( $ip2 & $masq ) == ( $net2 & $masq ) );
+        $masq=pow(2, (32 - $masq)) - 1;
+        $masq=~ $masq;
+        return (($ip2 & $masq) == ($net2 & $masq));
         
     }
     
     public function testParam(array $param)
     {
-        if (count($param)!=1)
+        if (count($param) != 1)
         {
-            throw new Exception('Invalid number of parameters : ' . count($param));
+            throw new Exception('Invalid number of parameters : '.count($param));
         }
         if ($param[0] == 'true') return true;
         return false;

Braces +3 added lines, -1 removed lines

@@ -116,7 +116,9 @@
         {
             throw new Exception('Invalid number of parameters : ' . count($param));
         }
-        if ($param[0] == 'true') return true;
+        if ($param[0] == 'true') {
+        	return true;
+        }
         return false;
     }
 }

library/Trapdirector/Config/MIBLoader.php

Spacing +28 added lines, -28 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param \Zend_Db_Adapter_Abstract $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;
+		$dbconn=$this->db;
 		$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;
+		$dbconn=$this->db;
 		$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;
+		$dbconn=$this->db;
 		$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;
+	    if (!preg_match('/^\./', $oid)) $oid='.'.$oid; // Add a leading '.'
+		$retArray=array('oid' => $oid, 'mib' => null, 'name'=>null, 'type'=>null);
+		$dbconn=$this->db;
 
 		$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;
+		$dbconn=$this->db;
 		$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->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);

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;
 
@@ -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 string $trap oid of trap
-	*	@return array|null : null if trap not found, or array ( <oid> => name/mib/type )
-	*/
+	 *	@param string $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;
 
@@ -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->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->fetchRow($query);
+		// Get trap id in DB
+		if ($oid===null)
+		{
+			$where="c.id = '$id'";
+		}
+		else
+		{
+			$where="c.oid = '$oid'";
+		}
+		$query=$this->db->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->fetchRow($query);
         
-        return $trap;
+		return $trap;
 	}
 	
 }

application/controllers/ReceivedController.php

Braces +16 added lines, -12 removed lines

@@ -21,7 +21,9 @@ 
 		$this->prepareTabs()->activate('traps');
 
 		$dbConn = $this->getUIDatabase()->getDb();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		$this->getTrapListTable()->setConnection($dbConn);
 		
 		// Apply pagination limits
@@ -58,7 +60,9 @@ 
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
 		$dbConn = $this->getUIDatabase()->getDbConn();
-		if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		if ($dbConn === null) {
+			throw new \ErrorException('uncatched db error');
+		}
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
@@ -78,9 +82,10 @@ 
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
-		}
-		catch (Exception $e)
+			if ( $trapDetail == null) {
+				throw new Exception('No traps was found with id = '.$trapid);
+			}
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 			return;
@@ -111,8 +116,7 @@ 
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$dbConn->fetchAll($query);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->displayExitError('Trap detail',$e->getMessage());
 		}
@@ -120,8 +124,7 @@ 
 		if ($trapDetail == null ) 
 		{
 			$this->view->data=false;
-		}
-		else
+		} else
 		{
 			$this->view->data=true;
 			// Store result in array.
@@ -148,7 +151,9 @@ 
 	    $this->prepareTabs()->activate('hosts');
 	    
 	    $dbConn = $this->getUIDatabase()->getDb();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+	    if ($dbConn === null) {
+	    	throw new \ErrorException('uncatched db error');
+	    }
 	    
 	    $this->getTrapHostListTable()->setConnection($dbConn);
 	    
@@ -209,8 +214,7 @@ 
 			$ip=$postData['IP'];
 			$oid=$postData['OID'];
 			$action=$postData['action'];
-		}
-		else
+		} else
 		{
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;

Indentation +25 added lines, -25 removed lines

@@ -40,8 +40,8 @@ 
 	}
 
 	/** 
-	*	Trap detail page
-	*/	
+	 *	Trap detail page
+	 */	
 	public function trapdetailAction() 
 	{
 		
@@ -74,7 +74,7 @@ 
 		// Do DB query for trap. 
 		try
 		{
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapTableName(),$elmts)
 				->where('id=?',$trapid);
 				$trapDetail=$dbConn->fetchRow($query);
@@ -107,7 +107,7 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
+			$query = $dbConn->select()
 				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
 				->where('trap_id=?',$trapid);
 			$trapDetail=$dbConn->fetchAll($query);
@@ -144,24 +144,24 @@ 
 	 */
 	public function hostsAction()
 	{
-	    $this->checkReadPermission();
-	    $this->prepareTabs()->activate('hosts');
+		$this->checkReadPermission();
+		$this->prepareTabs()->activate('hosts');
 	    
-	    $dbConn = $this->getUIDatabase()->getDb();
-	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
+		$dbConn = $this->getUIDatabase()->getDb();
+		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
-	    $this->getTrapHostListTable()->setConnection($dbConn);
+		$this->getTrapHostListTable()->setConnection($dbConn);
 	    
-	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+		// Apply pagination limits
+		$this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
 	    
-	    // Set Filter
-	    //$postData=$this->getRequest()->getPost();
-	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
-	    $filter['done']=$this->params->get('done');
-	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+		// Set Filter
+		//$postData=$this->getRequest()->getPost();
+		$filter=array();
+		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['done']=$this->params->get('done');
+		$this->view->filter=$filter;
+		$this->view->table->updateFilter(Url::fromRequest(),$filter);
 	}
 	
 	public function deleteAction()
@@ -181,12 +181,12 @@ 
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received')
-		    )
-		    ->add('hosts', array(
-		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
-		    )
-		    ->add('delete', array(
+			)
+			->add('hosts', array(
+				'label' => $this->translate('Hosts'),
+				'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+			)
+			->add('delete', array(
 			'label' => $this->translate('Delete'),
 			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
 		  );
@@ -222,7 +222,7 @@ 
 		}
 		if ($action =="delete")
 		{
-		    $this->_helper->json(array('status'=>'OK','count'=>$this->getUIDatabase()->deleteTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK','count'=>$this->getUIDatabase()->deleteTrap($ip,$oid)));
 			return;
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));

Spacing +33 added lines, -33 removed lines

@@ -20,20 +20,20 @@ 
 		$this->checkReadPermission();
 		$this->prepareTabs()->activate('traps');
 
-		$dbConn = $this->getUIDatabase()->getDb();
+		$dbConn=$this->getUIDatabase()->getDb();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		$this->getTrapListTable()->setConnection($dbConn);
 		
 		// Apply pagination limits
-		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(),$this->getModuleConfig()->itemListDisplay());		
+		$this->view->table=$this->applyPaginationLimits($this->getTrapListTable(), $this->getModuleConfig()->itemListDisplay());		
 		
 		// Set Filter
 		//$postData=$this->getRequest()->getPost();
 		$filter=array();
-		$filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+		$filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 		$filter['done']=$this->params->get('done');
 		$this->view->filter=$filter;
-		$this->view->table->updateFilter(Url::fromRequest(),$filter);
+		$this->view->table->updateFilter(Url::fromRequest(), $filter);
 		
 		//$this->view->filterEditor = $this->getTrapListTable()->getFilterEditor($this->getRequest());
 
@@ -47,7 +47,7 @@ 
 		
 		$this->checkReadPermission();
 		// set up tab
-		$this->getTabs()->add('get',array(
+		$this->getTabs()->add('get', array(
 			'active'	=> true,
 			'label'		=> $this->translate('Detailed status'),
 			'url'		=> Url::fromRequest()
@@ -57,12 +57,12 @@ 
 		$this->view->trapid=$trapid;
 		$queryArray=$this->getModuleConfig()->trapDetailQuery();
 		
-		$dbConn = $this->getUIDatabase()->getDbConn();
+		$dbConn=$this->getUIDatabase()->getDbConn();
 		if ($dbConn === null) throw new \ErrorException('uncatched db error');
 		
 		// URL to add a handler
 		$this->view->addHandlerUrl=Url::fromPath(
-			$this->getModuleConfig()->urlPath() . '/handler/add',
+			$this->getModuleConfig()->urlPath().'/handler/add',
 			array('fromid' => $trapid));
 		// ***************  Get main data
 		// extract columns and titles;
@@ -74,28 +74,28 @@ 
 		// Do DB query for trap. 
 		try
 		{
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapTableName(),$elmts)
-				->where('id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapTableName(), $elmts)
+				->where('id=?', $trapid);
 				$trapDetail=$dbConn->fetchRow($query);
-			if ( $trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
+			if ($trapDetail == null) throw new Exception('No traps was found with id = '.$trapid);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 			return;
 		}
 
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=strftime('%c', $trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
-			array_push($queryArray[$key],$cval);
+			array_push($queryArray[$key], $cval);
 		}
-		$this->view->rowset = $queryArray;
+		$this->view->rowset=$queryArray;
 
 		// **************   Check for additionnal data
 		
@@ -107,17 +107,17 @@ 
 		}
 		try
 		{		
-		    $query = $dbConn->select()
-				->from($this->moduleConfig->getTrapDataTableName(),$data_elmts)
-				->where('trap_id=?',$trapid);
+		    $query=$dbConn->select()
+				->from($this->moduleConfig->getTrapDataTableName(), $data_elmts)
+				->where('trap_id=?', $trapid);
 			$trapDetail=$dbConn->fetchAll($query);
 		}
 		catch (Exception $e)
 		{
-			$this->displayExitError('Trap detail',$e->getMessage());
+			$this->displayExitError('Trap detail', $e->getMessage());
 		}
 		// TODO : code this in a better & simpler way
-		if ($trapDetail == null ) 
+		if ($trapDetail == null) 
 		{
 			$this->view->data=false;
 		}
@@ -129,9 +129,9 @@ 
 			foreach ($trapDetail as $key => $val) 
 			{	
 				$trapval[$key]=array();
-				foreach (array_keys($queryArrayData) as $vkey ) 
+				foreach (array_keys($queryArrayData) as $vkey) 
 				{
-					array_push($trapval[$key],$val->$vkey);
+					array_push($trapval[$key], $val->$vkey);
 				}
 			}
 			$this->view->data_val=$trapval;
@@ -147,21 +147,21 @@ 
 	    $this->checkReadPermission();
 	    $this->prepareTabs()->activate('hosts');
 	    
-	    $dbConn = $this->getUIDatabase()->getDb();
+	    $dbConn=$this->getUIDatabase()->getDb();
 	    if ($dbConn === null) throw new \ErrorException('uncatched db error');
 	    
 	    $this->getTrapHostListTable()->setConnection($dbConn);
 	    
 	    // Apply pagination limits
-	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(),$this->getModuleConfig()->itemListDisplay());
+	    $this->view->table=$this->applyPaginationLimits($this->getTrapHostListTable(), $this->getModuleConfig()->itemListDisplay());
 	    
 	    // Set Filter
 	    //$postData=$this->getRequest()->getPost();
 	    $filter=array();
-	    $filter['q']=$this->params->get('q');//(isset($postData['q']))?$postData['q']:'';
+	    $filter['q']=$this->params->get('q'); //(isset($postData['q']))?$postData['q']:'';
 	    $filter['done']=$this->params->get('done');
 	    $this->view->filter=$filter;
-	    $this->view->table->updateFilter(Url::fromRequest(),$filter);
+	    $this->view->table->updateFilter(Url::fromRequest(), $filter);
 	}
 	
 	public function deleteAction()
@@ -180,15 +180,15 @@ 
 	{
 		return $this->getTabs()->add('traps', array(
 			'label'	=> $this->translate('Traps'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received')
+			'url'   => $this->getModuleConfig()->urlPath().'/received')
 		    )
 		    ->add('hosts', array(
 		        'label' => $this->translate('Hosts'),
-		        'url'   => $this->getModuleConfig()->urlPath() . '/received/hosts')
+		        'url'   => $this->getModuleConfig()->urlPath().'/received/hosts')
 		    )
 		    ->add('delete', array(
 			'label' => $this->translate('Delete'),
-			'url'   => $this->getModuleConfig()->urlPath() . '/received/delete')
+			'url'   => $this->getModuleConfig()->urlPath().'/received/delete')
 		  );
 	} 
 
@@ -215,14 +215,14 @@ 
 			$this->_helper->json(array('status'=>'Missing variables'));
 			return;
 		}
-		if ($action =="count")
+		if ($action == "count")
 		{
-			$this->_helper->json(array('status'=>'OK','count'=>$this->getUIDatabase()->countTrap($ip,$oid)));
+			$this->_helper->json(array('status'=>'OK', 'count'=>$this->getUIDatabase()->countTrap($ip, $oid)));
 			return;
 		}
-		if ($action =="delete")
+		if ($action == "delete")
 		{
-		    $this->_helper->json(array('status'=>'OK','count'=>$this->getUIDatabase()->deleteTrap($ip,$oid)));
+		    $this->_helper->json(array('status'=>'OK', 'count'=>$this->getUIDatabase()->deleteTrap($ip, $oid)));
 			return;
 		}		
 		$this->_helper->json(array('status'=>'unknown action'));

library/Trapdirector/TrapsActions/UIDatabase.php

Braces +18 added lines, -16 removed lines

@@ -116,8 +116,7 @@ 
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -142,8 +141,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($DBname);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true) 
             {
@@ -157,8 +155,7 @@ 
         {
             $dbAdapter=$dbconn->getDbAdapter();
             
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             if ($test === true)
             {
@@ -185,7 +182,9 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ( $this->trapDB != null ) {
+        	return $this->trapDB;
+        }
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
@@ -213,7 +212,9 @@ 
      */
     public function getDbConn()
     {
-        if ($this->getDb() == null) return null;
+        if ($this->getDb() == null) {
+        	return null;
+        }
         return $this->getDb()->getConnection();
     }
     
@@ -243,7 +244,9 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ( $this->idoDB != null ) {
+        	return $this->idoDB;
+        }
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
         $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
         
@@ -256,8 +259,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=2');
             return null;
@@ -274,7 +276,9 @@ 
      */
     public function getIdoDbConn()
     {
-        if ($this->getIdoDb() == null) return null;
+        if ($this->getIdoDb() == null) {
+        	return null;
+        }
         return $this->getIdoDb()->getConnection();
     }
     
@@ -296,8 +300,7 @@ 
         try
         {
             $dbconn = IcingaDbConnection::fromResourceName($dbresource);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
         }
@@ -311,8 +314,7 @@ 
             {
                 throw new DBException( array(4,"$dbresource does not look like an IDO database"));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
         }

Spacing +36 added lines, -36 removed lines

@@ -29,10 +29,10 @@ 
      * @param int $code
      * @param Exception $previous
      */
-    public function __construct(array $retarray, string $message = null, int $code = 0, Exception $previous = null)
+    public function __construct(array $retarray, string $message=null, int $code=0, Exception $previous=null)
     {
-        parent::__construct($message,$code,$previous);
-        $this->returnArray = $retarray;
+        parent::__construct($message, $code, $previous);
+        $this->returnArray=$retarray;
     }
     
     /**
@@ -56,7 +56,7 @@ 
  */
 class UIDatabase //extends TrapDBQuery
 {
-    use TrapDBQuery,IdoDBQuery;
+    use TrapDBQuery, IdoDBQuery;
     
     /** @var TrapsController $trapController TrapController 'parent' class */
     protected  $trapController=null;
@@ -94,19 +94,19 @@ 
      * @return bool true if OK, false if version < min version
      * @throws Exception if error and test = true
      */
-    protected function testDbVersion($dbAdapter,int $min,bool $test, string $DBname)
+    protected function testDbVersion($dbAdapter, int $min, bool $test, string $DBname)
     {
         try
         {
-            $query = $dbAdapter->select()
-            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(),'value')
+            $query=$dbAdapter->select()
+            ->from($this->trapController->getModuleConfig()->getDbConfigTableName(), 'value')
             ->where('name=\'db_version\'');
             $version=$dbAdapter->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'value') )
+            if (($version == null) || !property_exists($version, 'value'))
             {
                 if ($test === true) 
                 {
-                    $this->testResult = array(4,$DBname);
+                    $this->testResult=array(4, $DBname);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -116,7 +116,7 @@ 
             {
                 if ($test === true) 
                 {
-                    $this->testResult = array(5,$version->value,$min);
+                    $this->testResult=array(5, $version->value, $min);
                     return false;
                 }
                 $this->trapController->redirectNow('trapdirector/settings?dberror=5');
@@ -127,7 +127,7 @@ 
         {
             if ($test === true) 
             {
-                $this->testResult = array(3,$DBname,$e->getMessage());
+                $this->testResult=array(3, $DBname, $e->getMessage());
                 return false;
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=4');
@@ -143,17 +143,17 @@ 
      *  @throws DBException if test = true and error
      *	@return Selectable|null : if test=false, returns DB connexion, else array(error_num,message) or null on error.
      */
-    protected function getDbByName($DBname , $test = false , $test_version = true)
+    protected function getDbByName($DBname, $test=false, $test_version=true)
     {
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($DBname);
+            $dbconn=IcingaDbConnection::fromResourceName($DBname);
         }
         catch (Exception $e)
         {
             if ($test === true) 
             {
-                throw new DBException(array(2,$DBname));
+                throw new DBException(array(2, $DBname));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=2');
             return null;
@@ -168,7 +168,7 @@ 
         {
             if ($test === true)
             {
-                throw new DBException(array(3,$DBname,$e->getMessage()));
+                throw new DBException(array(3, $DBname, $e->getMessage()));
             }
             $this->trapController->redirectNow('trapdirector/settings?dberror=3');
             return null;
@@ -191,19 +191,19 @@ 
      */
     public function getDb()
     {
-        if ( $this->trapDB != null ) return $this->trapDB;
+        if ($this->trapDB != null) return $this->trapDB;
         
         
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
             $this->trapController->redirectNow('trapdirector/settings?dberror=1');
             return null;
         }
 
         try {
-            $this->trapDB = $this->getDbByName($dbresource,false,true);
+            $this->trapDB=$this->getDbByName($dbresource, false, true);
         } catch (DBException $e) {
             return null; // Should not happen as test = false
         }
@@ -233,12 +233,12 @@ 
     {       
         $dbresource=$this->trapController->Config()->get('config', 'database');
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-                throw new DBException(array(1,''));
+                throw new DBException(array(1, ''));
         }
         
-        $this->trapDB = $this->getDbByName($dbresource,true,true);       
+        $this->trapDB=$this->getDbByName($dbresource, true, true);       
         return;
     }
     
@@ -249,11 +249,11 @@ 
      */
     public function getIdoDb()
     {
-        if ( $this->idoDB != null ) return $this->idoDB;
+        if ($this->idoDB != null) return $this->idoDB;
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
             $this->trapController->redirectNow('trapdirector/settings?idodberror=1');
             return null;
@@ -261,7 +261,7 @@ 
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
@@ -269,7 +269,7 @@ 
             return null;
         }
 
-        $this->idoDB = $dbconn;
+        $this->idoDB=$dbconn;
         return $this->idoDB;
     }
 
@@ -292,35 +292,35 @@ 
     public function testGetIdoDb()
     {
         // TODO : get ido database directly from icingaweb2 config -> (or not if using only API)
-        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase');;
+        $dbresource=$this->trapController->Config()->get('config', 'IDOdatabase'); ;
         
-        if ( ! $dbresource )
+        if (!$dbresource)
         {
-            throw new DBException(array(1,'No database in config.ini'));
+            throw new DBException(array(1, 'No database in config.ini'));
         }
         
         try
         {
-            $dbconn = IcingaDbConnection::fromResourceName($dbresource);
+            $dbconn=IcingaDbConnection::fromResourceName($dbresource);
         }
         catch (Exception $e)
         {
-            throw new DBException( array(2,"Database $dbresource does not exists in IcingaWeb2") );
+            throw new DBException(array(2, "Database $dbresource does not exists in IcingaWeb2"));
         }
                
         try
         {
-            $query = $dbconn->select()
-            ->from('icinga_dbversion',array('version'));
+            $query=$dbconn->select()
+            ->from('icinga_dbversion', array('version'));
             $version=$dbconn->fetchRow($query);
-            if ( ($version == null) || ! property_exists($version,'version') )
+            if (($version == null) || !property_exists($version, 'version'))
             {
-                throw new DBException( array(4,"$dbresource does not look like an IDO database"));
+                throw new DBException(array(4, "$dbresource does not look like an IDO database"));
             }
         }
         catch (Exception $e)
         {
-            throw new DBException( array(3,"Error connecting to $dbresource : " . $e->getMessage()));
+            throw new DBException(array(3, "Error connecting to $dbresource : ".$e->getMessage()));
         }
         
         return;

Indentation +260 added lines, -260 removed lines

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

library/Trapdirector/TrapsActions/IdoDBQuery.php

Spacing +28 added lines, -28 removed lines

@@ -23,14 +23,14 @@ 
     public function getHostByIP($ip)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hosts'),
                 'b.host_object_id=a.object_id',
@@ -46,14 +46,14 @@ 
     public function getHostByName($name)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hosts'),
                 'b.host_object_id=a.object_id',
@@ -69,13 +69,13 @@ 
     public function getHostGroupByName($ip)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'object_id'))
+            array('name' => 'a.name1', 'id' => 'object_id'))
             ->join(
                 array('b' => 'icinga_hostgroups'),
                 'b.hostgroup_object_id=a.object_id',
@@ -91,8 +91,8 @@ 
      */
     public function getHostInfoByID($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -113,18 +113,18 @@ 
      */
     public function getHostByObjectID($id) // TODO : duplicate of getHostInfoByID above
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name' => 'a.name1','id' => 'a.object_id'))
+            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 $dbConn->fetchRow($query);
     }
     
@@ -136,17 +136,17 @@ 
     public function getServicesByHostid($id)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_services'),
-            array('name' => 's.display_name','id' => 's.service_object_id'))
+            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 $dbConn->fetchAll($query);
     }
@@ -159,8 +159,8 @@ 
      */
     public function getServicesByHostGroupid($id)
     {
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         $query=$dbConn->select()
         ->from(
@@ -177,11 +177,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
                         {
@@ -197,7 +197,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']));
                     }
                 }
                 
@@ -210,9 +210,9 @@ 
      *	@param $name string service name
      *	@return array  service id
      */
-    public function getServiceIDByName($hostname,$name)
+    public function getServiceIDByName($hostname, $name)
     {
-        $dbConn = $this->getIdoDbConn();
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         if ($name == null)
@@ -223,7 +223,7 @@ 
         $query=$dbConn->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',
@@ -241,14 +241,14 @@ 
     public function getObjectNameByid($id)
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
-        if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
-        $dbConn = $this->getIdoDbConn();
+        if (!preg_match('/^[0-9]+$/', $id)) { throw new Exception('Invalid id'); }
+        $dbConn=$this->getIdoDbConn();
         if ($dbConn === null) throw new \ErrorException('uncatched db error');
         
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
-            array('name1' => 'a.name1','name2' => 'a.name2'))
+            array('name1' => 'a.name1', 'name2' => 'a.name2'))
             ->where('a.object_id='.$id.' AND a.is_active = 1');
             
             return $dbConn->fetchRow($query);

Braces +28 added lines, -11 removed lines

@@ -24,7 +24,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
@@ -47,7 +49,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         // TODO : check for SQL injections
         $query=$dbConn->select()
@@ -70,7 +74,9 @@ 
     {
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         // TODO : check for SQL injections
         $query=$dbConn->select()
         ->from(
@@ -93,7 +99,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
@@ -115,7 +123,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('a' => 'icinga_objects'),
@@ -138,7 +148,9 @@ 
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_services'),
@@ -161,7 +173,9 @@ 
     {
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         $query=$dbConn->select()
         ->from(
             array('s' => 'icinga_hostgroup_members'),
@@ -182,8 +196,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;
@@ -213,7 +226,9 @@ 
     public function getServiceIDByName($hostname,$name)
     {
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         if ($name == null)
         {
@@ -243,7 +258,9 @@ 
         // select a.name1, b.display_name from icinga.icinga_objects AS a , icinga.icinga_hosts AS b WHERE (b.address = '192.168.56.101' OR b.address6= '123456') and b.host_object_id=a.object_id
         if (!preg_match('/^[0-9]+$/',$id)) { throw new Exception('Invalid id');  }
         $dbConn = $this->getIdoDbConn();
-        if ($dbConn === null) throw new \ErrorException('uncatched db error');
+        if ($dbConn === null) {
+        	throw new \ErrorException('uncatched db error');
+        }
         
         $query=$dbConn->select()
         ->from(

Indentation +222 added lines, -222 removed lines

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

library/Trapdirector/TrapsProcess/MibDatabase.php

Braces +7 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
             }
             $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
             return 1;
-        }
-        else
+        } else
         {
             $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
             return 0;
@@ -97,7 +96,9 @@ 
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->getTrapsDB()->trapDBType == 'pgsql') {
+        	$sql .= 'RETURNING id';
+        }
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -139,7 +140,9 @@ 
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id==false) {
+                	throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                }
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
                 break;
             default:

Indentation +154 added lines, -154 removed lines

@@ -12,183 +12,183 @@
  */
 trait MibDatabase
 {   
-    /** @var array $oidDesc MUST be overide by calling class */
-    //protected $oidDesc;
+	/** @var array $oidDesc MUST be overide by calling class */
+	//protected $oidDesc;
     
-    /** @var array $dbOidIndex MUST be overide by calling class */
-    //protected $dbOidIndex;
+	/** @var array $dbOidIndex MUST be overide by calling class */
+	//protected $dbOidIndex;
     
-    /** @return \Trapdirector\Logging */
-    abstract public function getLogging();
+	/** @return \Trapdirector\Logging */
+	abstract public function getLogging();
     
-    /** @return \Trapdirector\Database */
-    abstract public function getTrapsDB();
+	/** @return \Trapdirector\Database */
+	abstract public function getTrapsDB();
 
     
-    /**
-     * Update or add an OID to database uses $this->dbOidIndex for mem cache
-     * and $this->oidDesc doe data
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    public function update_oid()
-    {
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Quote description.
-        $this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
+	/**
+	 * Update or add an OID to database uses $this->dbOidIndex for mem cache
+	 * and $this->oidDesc doe data
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	public function update_oid()
+	{
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Quote description.
+		$this->oidDesc['description']=$db_conn->quote($this->oidDesc['description']);
         
-        if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
-        { // oid exists in db, so update
-            return $this->update_oid_update();
-        }
-        // create new OID.
-        return $this->update_oid_create();
+		if (isset($this->dbOidIndex[$this->oidDesc['oid']]))
+		{ // oid exists in db, so update
+			return $this->update_oid_update();
+		}
+		// create new OID.
+		return $this->update_oid_create();
         
-    }
+	}
     
-    /**
-     * Update object in DB with object in dbOidIndex if name/mib/type has changed.
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_update()
-    {
+	/**
+	 * Update object in DB with object in dbOidIndex if name/mib/type has changed.
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_update()
+	{
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
         
-        if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
-        { // newly created.
-            return 0;
-        }
-        $oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
-        $dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
-        if ( $this->oidDesc['name'] != $dbOid['name'] ||
-            $this->oidDesc['mib'] != $dbOid['mib'] ||
-            $this->oidDesc['type'] !=$dbOid['type']
-            )
-        { // Do update
-            $sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
-                'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
-                ', syntax = :syntax, type_enum = :type_enum, description = :description '.
-                ' WHERE id= :id';
-            $sqlQuery=$db_conn->prepare($sql);
+		if ($this->dbOidIndex[$this->oidDesc['oid']]['key'] == -1)
+		{ // newly created.
+			return 0;
+		}
+		$oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
+		$dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
+		if ( $this->oidDesc['name'] != $dbOid['name'] ||
+			$this->oidDesc['mib'] != $dbOid['mib'] ||
+			$this->oidDesc['type'] !=$dbOid['type']
+			)
+		{ // Do update
+			$sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
+				'name = :name , type = :type , mib = :mib , textual_convention = :tc , display_hint = :display_hint'.
+				', syntax = :syntax, type_enum = :type_enum, description = :description '.
+				' WHERE id= :id';
+			$sqlQuery=$db_conn->prepare($sql);
             
-            $sqlParam=array(
-                ':name' => $this->oidDesc['name'],
-                ':type' => $this->oidDesc['type'],
-                ':mib' => $this->oidDesc['mib'],
-                ':tc' =>  $this->oidDesc['textconv']??'null',
-                ':display_hint' => $this->oidDesc['dispHint']??'null' ,
-                ':syntax' => $this->oidDesc['syntax']==null??'null',
-                ':type_enum' => $this->oidDesc['type_enum']??'null',
-                ':description' => $this->oidDesc['description']??'null',
-                ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
-            );
+			$sqlParam=array(
+				':name' => $this->oidDesc['name'],
+				':type' => $this->oidDesc['type'],
+				':mib' => $this->oidDesc['mib'],
+				':tc' =>  $this->oidDesc['textconv']??'null',
+				':display_hint' => $this->oidDesc['dispHint']??'null' ,
+				':syntax' => $this->oidDesc['syntax']==null??'null',
+				':type_enum' => $this->oidDesc['type_enum']??'null',
+				':description' => $this->oidDesc['description']??'null',
+				':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
-            }
-            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 1;
-        }
-        else
-        {
-            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
-            return 0;
-        }
-    }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
+			}
+			$this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 1;
+		}
+		else
+		{
+			$this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+			return 0;
+		}
+	}
 
-    /**
-     * Create object in DB with object in dbOidIndex
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    private function update_oid_create()
-    {
-        // Insert data
+	/**
+	 * Create object in DB with object in dbOidIndex
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	private function update_oid_create()
+	{
+		// Insert data
         
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        $sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
-            '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
-            'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
-            ', :syntax, :type_enum, :description )';
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		$sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
+			'(oid, name, type , mib, textual_convention, display_hint '.
+			', syntax, type_enum , description ) ' .
+			'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
+			', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
         
-        $sqlQuery=$db_conn->prepare($sql);
+		$sqlQuery=$db_conn->prepare($sql);
         
-        $sqlParam=array(
-            ':oid' => $this->oidDesc['oid'],
-            ':name' => $this->oidDesc['name'],
-            ':type' => $this->oidDesc['type'],
-            ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  $this->oidDesc['textconv']??'null',
-            ':display_hint' => $this->oidDesc['dispHint']??'null',
-            ':syntax' => $this->oidDesc['syntax']??'null',
-            ':type_enum' => $this->oidDesc['type_enum']??'null',
-            ':description' => $this->oidDesc['description']??'null'
-        );
+		$sqlParam=array(
+			':oid' => $this->oidDesc['oid'],
+			':name' => $this->oidDesc['name'],
+			':type' => $this->oidDesc['type'],
+			':mib' => $this->oidDesc['mib'],
+			':tc' =>  $this->oidDesc['textconv']??'null',
+			':display_hint' => $this->oidDesc['dispHint']??'null',
+			':syntax' => $this->oidDesc['syntax']??'null',
+			':type_enum' => $this->oidDesc['type_enum']??'null',
+			':description' => $this->oidDesc['description']??'null'
+		);
         
-        if ($sqlQuery->execute($sqlParam) === false) {
-            $this->getLogging()->log('Error in query : ' . $sql,1,'');
-        }
+		if ($sqlQuery->execute($sqlParam) === false) {
+			$this->getLogging()->log('Error in query : ' . $sql,1,'');
+		}
         
-        switch ($this->getTrapsDB()->trapDBType)
-        {
-            case 'pgsql':
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->getLogging()->log('Error getting id - pgsql - ',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
-                    return 0;
-                }
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
-                break;
-            case 'mysql':
-                // Get last id to insert oid/values in secondary table
-                $sql='SELECT LAST_INSERT_ID();';
-                if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
-                    return 0;
-                }
+		switch ($this->getTrapsDB()->trapDBType)
+		{
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
+					$this->getLogging()->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
+					return 0;
+				}
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
+				break;
+			case 'mysql':
+				// Get last id to insert oid/values in secondary table
+				$sql='SELECT LAST_INSERT_ID();';
+				if (($ret_code=$db_conn->query($sql)) === false) {
+					$this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
+					return 0;
+				}
                 
-                $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
-                $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
-                break;
-            default:
-                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
-                return 0;
-        }
+				$inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
+				if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+				$this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
+				break;
+			default:
+				$this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
+				return 0;
+		}
         
-        // Set as newly created.
-        $this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
-        return 2;
-    }
+		// Set as newly created.
+		$this->dbOidIndex[$this->oidDesc['oid']]['key']=-1;
+		return 2;
+	}
 
-    /**
-     * get all objects for a trap.
-     * @param integer $trapId
-     * @return array : array of cached objects
-     */
-    private function cache_db_objects($trapId)
-    {
-        $dbObjects=array(); // cache of objects for trap in db
-        $db_conn=$this->getTrapsDB()->db_connect_trap();
-        // Get all objects
-        $sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->getLogging()->log('No result in query : ' . $sql,1,'');
-        }
-        $dbObjectsRaw=$ret_code->fetchAll();
+	/**
+	 * get all objects for a trap.
+	 * @param integer $trapId
+	 * @return array : array of cached objects
+	 */
+	private function cache_db_objects($trapId)
+	{
+		$dbObjects=array(); // cache of objects for trap in db
+		$db_conn=$this->getTrapsDB()->db_connect_trap();
+		// Get all objects
+		$sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+		$this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->getLogging()->log('No result in query : ' . $sql,1,'');
+		}
+		$dbObjectsRaw=$ret_code->fetchAll();
         
-        foreach ($dbObjectsRaw as $val)
-        {
-            $dbObjects[$val['object_id']]=1;
-        }
-        return $dbObjects;
-    }
+		foreach ($dbObjectsRaw as $val)
+		{
+			$dbObjects[$val['object_id']]=1;
+		}
+		return $dbObjects;
+	}
     
 
 }
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -60,9 +60,9 @@ 
         }
         $oidIndex=$this->dbOidIndex[$this->oidDesc['oid']]['key']; // Get index in dbOidAll
         $dbOid=$this->dbOidAll[$oidIndex]; // Get array of element
-        if ( $this->oidDesc['name'] != $dbOid['name'] ||
+        if ($this->oidDesc['name'] != $dbOid['name'] ||
             $this->oidDesc['mib'] != $dbOid['mib'] ||
-            $this->oidDesc['type'] !=$dbOid['type']
+            $this->oidDesc['type'] != $dbOid['type']
             )
         { // Do update
             $sql='UPDATE '.$this->getTrapsDB()->dbPrefix.'mib_cache SET '.
@@ -75,23 +75,23 @@ 
                 ':name' => $this->oidDesc['name'],
                 ':type' => $this->oidDesc['type'],
                 ':mib' => $this->oidDesc['mib'],
-                ':tc' =>  $this->oidDesc['textconv']??'null',
-                ':display_hint' => $this->oidDesc['dispHint']??'null' ,
-                ':syntax' => $this->oidDesc['syntax']==null??'null',
-                ':type_enum' => $this->oidDesc['type_enum']??'null',
-                ':description' => $this->oidDesc['description']??'null',
+                ':tc' =>  $this->oidDesc['textconv'] ?? 'null',
+                ':display_hint' => $this->oidDesc['dispHint'] ?? 'null',
+                ':syntax' => $this->oidDesc['syntax'] == null ?? 'null',
+                ':type_enum' => $this->oidDesc['type_enum'] ?? 'null',
+                ':description' => $this->oidDesc['description'] ?? 'null',
                 ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
             );
             
             if ($sqlQuery->execute($sqlParam) === false) {
-                $this->getLogging()->log('Error in query : ' . $sql,ERROR,'');
+                $this->getLogging()->log('Error in query : '.$sql, ERROR, '');
             }
-            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+            $this->getLogging()->log('Trap updated : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
             return 1;
         }
         else
         {
-            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'] . ' / OID : '.$this->oidDesc['oid'],DEBUG );
+            $this->getLogging()->log('Trap unchanged : '.$this->oidDesc['name'].' / OID : '.$this->oidDesc['oid'], DEBUG);
             return 0;
         }
     }
@@ -107,11 +107,11 @@ 
         $db_conn=$this->getTrapsDB()->db_connect_trap();
         $sql='INSERT INTO '.$this->getTrapsDB()->dbPrefix.'mib_cache '.
             '(oid, name, type , mib, textual_convention, display_hint '.
-            ', syntax, type_enum , description ) ' .
+            ', syntax, type_enum , description ) '.
             'values (:oid, :name , :type ,:mib ,:tc , :display_hint'.
             ', :syntax, :type_enum, :description )';
         
-        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+        if ($this->getTrapsDB()->trapDBType == 'pgsql') $sql.='RETURNING id';
         
         $sqlQuery=$db_conn->prepare($sql);
         
@@ -120,15 +120,15 @@ 
             ':name' => $this->oidDesc['name'],
             ':type' => $this->oidDesc['type'],
             ':mib' => $this->oidDesc['mib'],
-            ':tc' =>  $this->oidDesc['textconv']??'null',
-            ':display_hint' => $this->oidDesc['dispHint']??'null',
-            ':syntax' => $this->oidDesc['syntax']??'null',
-            ':type_enum' => $this->oidDesc['type_enum']??'null',
-            ':description' => $this->oidDesc['description']??'null'
+            ':tc' =>  $this->oidDesc['textconv'] ?? 'null',
+            ':display_hint' => $this->oidDesc['dispHint'] ?? 'null',
+            ':syntax' => $this->oidDesc['syntax'] ?? 'null',
+            ':type_enum' => $this->oidDesc['type_enum'] ?? 'null',
+            ':description' => $this->oidDesc['description'] ?? 'null'
         );
         
         if ($sqlQuery->execute($sqlParam) === false) {
-            $this->getLogging()->log('Error in query : ' . $sql,1,'');
+            $this->getLogging()->log('Error in query : '.$sql, 1, '');
         }
         
         switch ($this->getTrapsDB()->trapDBType)
@@ -136,10 +136,10 @@ 
             case 'pgsql':
                 // Get last id to insert oid/values in secondary table
                 if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->getLogging()->log('Error getting id - pgsql - ',1,'');
+                    $this->getLogging()->log('Error getting id - pgsql - ', 1, '');
                 }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->getLogging()->log('Error getting id - pgsql - empty.',ERROR);
+                if (!isset($inserted_id_ret['id'])) {
+                    $this->getLogging()->log('Error getting id - pgsql - empty.', ERROR);
                     return 0;
                 }
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id_ret['id'];
@@ -148,16 +148,16 @@ 
                 // Get last id to insert oid/values in secondary table
                 $sql='SELECT LAST_INSERT_ID();';
                 if (($ret_code=$db_conn->query($sql)) === false) {
-                    $this->getLogging()->log('Erreur getting id - mysql - ',ERROR);
+                    $this->getLogging()->log('Erreur getting id - mysql - ', ERROR);
                     return 0;
                 }
                 
                 $inserted_id=$ret_code->fetch(PDO::FETCH_ASSOC)['LAST_INSERT_ID()'];
-                if ($inserted_id==false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
+                if ($inserted_id == false) throw new Exception("Weird SQL error : last_insert_id returned false : open issue");
                 $this->dbOidIndex[$this->oidDesc['oid']]['id']=$inserted_id;
                 break;
             default:
-                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType,ERROR);
+                $this->getLogging()->log('Error SQL type Unknown : '.$this->getTrapsDB()->trapDBType, ERROR);
                 return 0;
         }
         
@@ -177,9 +177,9 @@ 
         $db_conn=$this->getTrapsDB()->db_connect_trap();
         // Get all objects
         $sql='SELECT * FROM '.$this->getTrapsDB()->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-        $this->getLogging()->log('SQL query get all traps: '.$sql,DEBUG );
+        $this->getLogging()->log('SQL query get all traps: '.$sql, DEBUG);
         if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->getLogging()->log('No result in query : ' . $sql,1,'');
+            $this->getLogging()->log('No result in query : '.$sql, 1, '');
         }
         $dbObjectsRaw=$ret_code->fetchAll();