patrickpr / trapdirector

tests/db_test.php

Indentation +29 added lines, -29 removed lines

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

library/Trapdirector/TrapsProcess/Mib.php

Indentation +460 added lines, -460 removed lines

@@ -10,519 +10,519 @@
 class Mib
 {
     
-    protected $logging; //< logging class
-    protected $trapsDB; //< Database class
+	protected $logging; //< logging class
+	protected $trapsDB; //< Database class
     
-    public $snmptranslate;
-    public $snmptranslate_dirs;
+	public $snmptranslate;
+	public $snmptranslate_dirs;
     
-    private $dbOidAll; //< All oid in database;
-    private $dbOidIndex; //< Index of oid in dbOidAll
-    private $objectsAll; //< output lines of snmptranslate list
-    private $trapObjectsIndex; //< array of traps objects (as OID)
+	private $dbOidAll; //< All oid in database;
+	private $dbOidIndex; //< Index of oid in dbOidAll
+	private $objectsAll; //< output lines of snmptranslate list
+	private $trapObjectsIndex; //< array of traps objects (as OID)
     
-    /**
-     * Setup Mib Class
-     * @param Logging $logClass : where to log
-     * @param Database $dbClass : Database
-     */
-    function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
-    {
-        $this->logging=$logClass;
-        $this->trapsDB=$dbClass;
-        $this->snmptranslate=$snmptrans;
-        $this->snmptranslate_dirs=$snmptransdir;
+	/**
+	 * Setup Mib Class
+	 * @param Logging $logClass : where to log
+	 * @param Database $dbClass : Database
+	 */
+	function __construct($logClass,$dbClass,$snmptrans,$snmptransdir)
+	{
+		$this->logging=$logClass;
+		$this->trapsDB=$dbClass;
+		$this->snmptranslate=$snmptrans;
+		$this->snmptranslate_dirs=$snmptransdir;
 
-    }
+	}
     
     
-    /**
-     * Update or add an OID to database uses $this->dbOidIndex for mem cache
-     * @param string $oid
-     * @param string $mib
-     * @param string $name
-     * @param string $type
-     * @param string $textConv
-     * @param string $dispHint
-     * @param string $syntax
-     * @param string $type_enum
-     * @param string $description
-     * @return number : 0=unchanged, 1 = changed, 2=created
-     */
-    public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
-    {
-        $db_conn=$this->trapsDB->db_connect_trap();
-        $description=$db_conn->quote($description);
-        if (isset($this->dbOidIndex[$oid]))
-        {
-            if ($this->dbOidIndex[$oid]['key'] == -1)
-            { // newly created.
-                return 0;
-            }
-            if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
-                $mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
-                $type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
-                //$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
-                //$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
-                //$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
-                //$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
-                //$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
-                )
-            { // Do update
-                $sql='UPDATE '.$this->trapsDB->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);
+	/**
+	 * Update or add an OID to database uses $this->dbOidIndex for mem cache
+	 * @param string $oid
+	 * @param string $mib
+	 * @param string $name
+	 * @param string $type
+	 * @param string $textConv
+	 * @param string $dispHint
+	 * @param string $syntax
+	 * @param string $type_enum
+	 * @param string $description
+	 * @return number : 0=unchanged, 1 = changed, 2=created
+	 */
+	public function update_oid($oid,$mib,$name,$type,$textConv,$dispHint,$syntax,$type_enum,$description=NULL)
+	{
+		$db_conn=$this->trapsDB->db_connect_trap();
+		$description=$db_conn->quote($description);
+		if (isset($this->dbOidIndex[$oid]))
+		{
+			if ($this->dbOidIndex[$oid]['key'] == -1)
+			{ // newly created.
+				return 0;
+			}
+			if ( $name != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['name'] ||
+				$mib != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['mib'] ||
+				$type != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type'] //||
+				//$textConv != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['textual_convention'] //||
+				//$dispHint != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['display_hint'] ||
+				//$syntax != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['syntax'] ||
+				//$type_enum != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['type_enum'] ||
+				//$description != $this->dbOidAll[$this->dbOidIndex[$oid]['key']]['description']
+				)
+			{ // Do update
+				$sql='UPDATE '.$this->trapsDB->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' => $name,
-                    ':type' => $type,
-                    ':mib' => $mib,
-                    ':tc' =>  ($textConv==null)?'null':$textConv ,
-                    ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-                    ':syntax' => ($syntax==null)?'null':$syntax,
-                    ':type_enum' => ($type_enum==null)?'null':$type_enum,
-                    ':description' => ($description==null)?'null':$description,
-                    ':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
-                );
+				$sqlParam=array(
+					':name' => $name,
+					':type' => $type,
+					':mib' => $mib,
+					':tc' =>  ($textConv==null)?'null':$textConv ,
+					':display_hint' => ($dispHint==null)?'null':$dispHint ,
+					':syntax' => ($syntax==null)?'null':$syntax,
+					':type_enum' => ($type_enum==null)?'null':$type_enum,
+					':description' => ($description==null)?'null':$description,
+					':id' => $this->dbOidAll[$this->dbOidIndex[$oid]['id']]
+				);
                 
-                if ($sqlQuery->execute($sqlParam) === false) {
-                    $this->logging->log('Error in query : ' . $sql,ERROR,'');
-                }
-                $this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
-                return 1;
-            }
-            else
-            {
-                $this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
-                return 0;
-            }
-        }
-        // create new OID.
+				if ($sqlQuery->execute($sqlParam) === false) {
+					$this->logging->log('Error in query : ' . $sql,ERROR,'');
+				}
+				$this->logging->log('Trap updated : '.$name . ' / OID : '.$oid,DEBUG );
+				return 1;
+			}
+			else
+			{
+				$this->logging->log('Trap unchanged : '.$name . ' / OID : '.$oid,DEBUG );
+				return 0;
+			}
+		}
+		// create new OID.
         
-        // Insert data
+		// Insert data
         
-        $sql='INSERT INTO '.$this->trapsDB->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 )';
+		$sql='INSERT INTO '.$this->trapsDB->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->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
+		if ($this->trapsDB->trapDBType == 'pgsql') $sql .= 'RETURNING id';
         
-        $sqlQuery=$db_conn->prepare($sql);
+		$sqlQuery=$db_conn->prepare($sql);
         
-        $sqlParam=array(
-            ':oid' => $oid,
-            ':name' => $name,
-            ':type' => $type,
-            ':mib' => $mib,
-            ':tc' =>  ($textConv==null)?'null':$textConv ,
-            ':display_hint' => ($dispHint==null)?'null':$dispHint ,
-            ':syntax' => ($syntax==null)?'null':$syntax,
-            ':type_enum' => ($type_enum==null)?'null':$type_enum,
-            ':description' => ($description==null)?'null':$description
-        );
+		$sqlParam=array(
+			':oid' => $oid,
+			':name' => $name,
+			':type' => $type,
+			':mib' => $mib,
+			':tc' =>  ($textConv==null)?'null':$textConv ,
+			':display_hint' => ($dispHint==null)?'null':$dispHint ,
+			':syntax' => ($syntax==null)?'null':$syntax,
+			':type_enum' => ($type_enum==null)?'null':$type_enum,
+			':description' => ($description==null)?'null':$description
+		);
         
-        if ($sqlQuery->execute($sqlParam) === false) {
-            $this->logging->log('Error in query : ' . $sql,1,'');
-        }
+		if ($sqlQuery->execute($sqlParam) === false) {
+			$this->logging->log('Error in query : ' . $sql,1,'');
+		}
         
-        switch ($this->trapsDB->trapDBType)
-        {
-            case 'pgsql':
-                // Get last id to insert oid/values in secondary table
-                if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
-                    $this->logging->log('Error getting id - pgsql - ',1,'');
-                }
-                if (! isset($inserted_id_ret['id'])) {
-                    $this->logging->log('Error getting id - pgsql - empty.',1,'');
-                }
-                $this->dbOidIndex[$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->logging->log('Erreur getting id - mysql - ',1,'');
-                }
+		switch ($this->trapsDB->trapDBType)
+		{
+			case 'pgsql':
+				// Get last id to insert oid/values in secondary table
+				if (($inserted_id_ret=$sqlQuery->fetch(PDO::FETCH_ASSOC)) === false) {
+					$this->logging->log('Error getting id - pgsql - ',1,'');
+				}
+				if (! isset($inserted_id_ret['id'])) {
+					$this->logging->log('Error getting id - pgsql - empty.',1,'');
+				}
+				$this->dbOidIndex[$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->logging->log('Erreur getting id - mysql - ',1,'');
+				}
                 
-                $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[$oid]['id']=$inserted_id;
-                break;
-            default:
-                $this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
-        }
+				$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[$oid]['id']=$inserted_id;
+				break;
+			default:
+				$this->logging->log('Error SQL type Unknown : '.$this->trapsDB->trapDBType,1,'');
+		}
         
-        // Set as newly created.
-        $this->dbOidIndex[$oid]['key']=-1;
-        return 2;
-    }
+		// Set as newly created.
+		$this->dbOidIndex[$oid]['key']=-1;
+		return 2;
+	}
     
-    /**
-     * create or update (with check_existing = true) objects of trap
-     * @param string $trapOID : trap oid
-     * @param string $trapmib : mib of trap
-     * @param array $objects : array of objects name (without MIB)
-     * @param bool $check_existing : check instead of create
-     */
-    public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
-    {
-        $dbObjects=null; // cache of objects for trap in db
-        $db_conn=$this->trapsDB->db_connect_trap();
+	/**
+	 * create or update (with check_existing = true) objects of trap
+	 * @param string $trapOID : trap oid
+	 * @param string $trapmib : mib of trap
+	 * @param array $objects : array of objects name (without MIB)
+	 * @param bool $check_existing : check instead of create
+	 */
+	public function trap_objects($trapOID,$trapmib,$objects,$check_existing)
+	{
+		$dbObjects=null; // cache of objects for trap in db
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        // Get id of trapmib.
+		// Get id of trapmib.
         
-        $trapId = $this->dbOidIndex[$trapOID]['id'];
-        if ($check_existing === true)
-        {
-            // Get all objects
-            $sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
-            $this->logging->log('SQL query get all traps: '.$sql,DEBUG );
-            if (($ret_code=$db_conn->query($sql)) === false) {
-                $this->logging->log('No result in query : ' . $sql,1,'');
-            }
-            $dbObjectsRaw=$ret_code->fetchAll();
+		$trapId = $this->dbOidIndex[$trapOID]['id'];
+		if ($check_existing === true)
+		{
+			// Get all objects
+			$sql='SELECT * FROM '.$this->trapsDB->dbPrefix.'mib_cache_trap_object where trap_id='.$trapId.';';
+			$this->logging->log('SQL query get all traps: '.$sql,DEBUG );
+			if (($ret_code=$db_conn->query($sql)) === false) {
+				$this->logging->log('No result in query : ' . $sql,1,'');
+			}
+			$dbObjectsRaw=$ret_code->fetchAll();
             
-            foreach ($dbObjectsRaw as $val)
-            {
-                $dbObjects[$val['object_id']]=1;
-            }
-        }
-        foreach ($objects as $object)
-        {
-            $match=$snmptrans=array();
-            $retVal=0;
-            $objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
-            $tmpdesc='';$indesc=false;
+			foreach ($dbObjectsRaw as $val)
+			{
+				$dbObjects[$val['object_id']]=1;
+			}
+		}
+		foreach ($objects as $object)
+		{
+			$match=$snmptrans=array();
+			$retVal=0;
+			$objOid=$objTc=$objDispHint=$objSyntax=$objDesc=$objEnum=NULL;
+			$tmpdesc='';$indesc=false;
             
-            $objMib=$trapmib;
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                // Maybe not trap mib, search with IR
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
-                if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
-                { // Not found -> continue with warning
-                    $this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
-                    continue;
-                }
-                $objMib=$match[1];
+			$objMib=$trapmib;
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -On -Td '.$objMib.'::'.$object . ' 2>/dev/null',$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				// Maybe not trap mib, search with IR
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -IR '.$object . ' 2>/dev/null',$snmptrans,$retVal);
+				if ($retVal != 0 || !preg_match('/(.*)::(.*)/',$snmptrans[0],$match))
+				{ // Not found -> continue with warning
+					$this->logging->log('Error finding trap object : '.$trapmib.'::'.$object,2,'');
+					continue;
+				}
+				$objMib=$match[1];
                 
-                // Do the snmptranslate again.
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
-                if ($retVal!=0) {
-                    $this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
-                }
+				// Do the snmptranslate again.
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -On -Td '.$objMib.'::'.$object,$snmptrans,$retVal);
+				if ($retVal!=0) {
+					$this->logging->log('Error finding trap object : '.$objMib.'::'.$object,2,'');
+				}
                 
-            }
-            foreach ($snmptrans as $line)
-            {
-                if ($indesc===true)
-                {
-                    $line=preg_replace('/[\t ]+/',' ',$line);
-                    if (preg_match('/(.*)"$/', $line,$match))
-                    {
-                        $objDesc = $tmpdesc . $match[1];
-                        $indesc=false;
-                    }
-                    $tmpdesc.=$line;
-                    continue;
-                }
-                if (preg_match('/^\.[0-9\.]+$/', $line))
-                {
-                    $objOid=$line;
-                    continue;
-                }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
-                {
-                    $objSyntax=$match[1];
-                    $objEnum=$match[2];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
-                {
-                    $objSyntax=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
-                {
-                    $objDispHint=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
-                {
-                    $objDesc=$match[1];
-                    continue;
-                }
-                if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
-                {
-                    $tmpdesc=$match[1];
-                    $indesc=true;
-                    continue;
-                }
-                if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
-                {
-                    $objTc=$match[1];
-                    continue;
-                }
-            }
-            $this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
-            //echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
-            // Update
-            $this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
+			}
+			foreach ($snmptrans as $line)
+			{
+				if ($indesc===true)
+				{
+					$line=preg_replace('/[\t ]+/',' ',$line);
+					if (preg_match('/(.*)"$/', $line,$match))
+					{
+						$objDesc = $tmpdesc . $match[1];
+						$indesc=false;
+					}
+					$tmpdesc.=$line;
+					continue;
+				}
+				if (preg_match('/^\.[0-9\.]+$/', $line))
+				{
+					$objOid=$line;
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+([^{]*) \{(.*)\}/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					$objEnum=$match[2];
+					continue;
+				}
+				if (preg_match('/^[\t ]+SYNTAX[\t ]+(.*)/',$line,$match))
+				{
+					$objSyntax=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DISPLAY-HINT[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDispHint=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)"/',$line,$match))
+				{
+					$objDesc=$match[1];
+					continue;
+				}
+				if (preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$line,$match))
+				{
+					$tmpdesc=$match[1];
+					$indesc=true;
+					continue;
+				}
+				if (preg_match('/^[\t ]+-- TEXTUAL CONVENTION[\t ]+(.*)/',$line,$match))
+				{
+					$objTc=$match[1];
+					continue;
+				}
+			}
+			$this->logging->log("Adding trap $object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc",DEBUG );
+			//echo "$object : $objOid / $objSyntax / $objEnum / $objDispHint / $objTc / $objDesc\n";
+			// Update
+			$this->update_oid($objOid, $objMib, $object, '3', $objTc, $objDispHint, $objSyntax, $objEnum,$objDesc);
             
-            if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
-            {   // if link exists, continue
-                $dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
-                continue;
-            }
-            if ($check_existing === true)
-            {
-                // TODO : check link trap - objects exists, mark them.
-            }
-            // Associate in object table
-            $sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
-                'values (:trap_id, :object_id)';
-            $sqlQuery=$db_conn->prepare($sql);
-            $sqlParam=array(
-                ':trap_id' => $trapId,
-                ':object_id' => $this->dbOidIndex[$objOid]['id'],
-            );
+			if (isset($dbObjects[$this->dbOidIndex[$objOid]['id']]))
+			{   // if link exists, continue
+				$dbObjects[$this->dbOidIndex[$objOid]['id']]=2;
+				continue;
+			}
+			if ($check_existing === true)
+			{
+				// TODO : check link trap - objects exists, mark them.
+			}
+			// Associate in object table
+			$sql='INSERT INTO '.$this->trapsDB->dbPrefix.'mib_cache_trap_object (trap_id,object_id) '.
+				'values (:trap_id, :object_id)';
+			$sqlQuery=$db_conn->prepare($sql);
+			$sqlParam=array(
+				':trap_id' => $trapId,
+				':object_id' => $this->dbOidIndex[$objOid]['id'],
+			);
             
-            if ($sqlQuery->execute($sqlParam) === false) {
-                $this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
-            }
-        }
-        if ($check_existing === true)
-        {
-            // TODO : remove link trap - objects that wasn't marked.
-        }
+			if ($sqlQuery->execute($sqlParam) === false) {
+				$this->logging->log('Error adding trap object : ' . $sql . ' / ' . $trapId . '/'. $this->dbOidIndex[$objOid]['id'] ,1,'');
+			}
+		}
+		if ($check_existing === true)
+		{
+			// TODO : remove link trap - objects that wasn't marked.
+		}
         
-    }
+	}
     
-    /**
-     * Cache mib in database
-     * @param boolean $display_progress : Display progress on standard output
-     * @param boolean $check_change : Force check of trap params & objects
-     * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
-     * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
-     */
-    public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
-    {
-        // Timing
-        $timeTaken = microtime(true);
-        $retVal=0;
-        // Get all mib objects from all mibs
-        $snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
-        $this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
-        unset($this->objectsAll);
-        exec($snmpCommand,$this->objectsAll,$retVal);
-        if ($retVal!=0)
-        {
-            $this->logging->log('error executing snmptranslate',ERROR,'');
-        }
+	/**
+	 * Cache mib in database
+	 * @param boolean $display_progress : Display progress on standard output
+	 * @param boolean $check_change : Force check of trap params & objects
+	 * @param boolean $onlyTraps : only cache traps and objects (true) or all (false)
+	 * @param string $startOID : only cache under startOID (NOT IMPLEMENTED)
+	 */
+	public function update_mib_database($display_progress=false,$check_change=false,$onlyTraps=true,$startOID='.1')
+	{
+		// Timing
+		$timeTaken = microtime(true);
+		$retVal=0;
+		// Get all mib objects from all mibs
+		$snmpCommand=$this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.' -On -Tto 2>/dev/null';
+		$this->logging->log('Getting all traps : '.$snmpCommand,DEBUG );
+		unset($this->objectsAll);
+		exec($snmpCommand,$this->objectsAll,$retVal);
+		if ($retVal!=0)
+		{
+			$this->logging->log('error executing snmptranslate',ERROR,'');
+		}
         
-        // Get all mibs from databse to have a memory index
+		// Get all mibs from databse to have a memory index
         
-        $db_conn=$this->trapsDB->db_connect_trap();
+		$db_conn=$this->trapsDB->db_connect_trap();
         
-        $sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
-        $this->logging->log('SQL query : '.$sql,DEBUG );
-        if (($ret_code=$db_conn->query($sql)) === false) {
-            $this->logging->log('No result in query : ' . $sql,ERROR,'');
-        }
-        $this->dbOidAll=$ret_code->fetchAll();
-        $this->dbOidIndex=array();
-        // Create the index for db;
-        foreach($this->dbOidAll as $key=>$val)
-        {
-            $this->dbOidIndex[$val['oid']]['key']=$key;
-            $this->dbOidIndex[$val['oid']]['id']=$val['id'];
-        }
+		$sql='SELECT * from '.$this->trapsDB->dbPrefix.'mib_cache;';
+		$this->logging->log('SQL query : '.$sql,DEBUG );
+		if (($ret_code=$db_conn->query($sql)) === false) {
+			$this->logging->log('No result in query : ' . $sql,ERROR,'');
+		}
+		$this->dbOidAll=$ret_code->fetchAll();
+		$this->dbOidIndex=array();
+		// Create the index for db;
+		foreach($this->dbOidAll as $key=>$val)
+		{
+			$this->dbOidIndex[$val['oid']]['key']=$key;
+			$this->dbOidIndex[$val['oid']]['id']=$val['id'];
+		}
         
-        // Count elements to show progress
-        $numElements=count($this->objectsAll);
-        $this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
+		// Count elements to show progress
+		$numElements=count($this->objectsAll);
+		$this->logging->log('Total snmp objects returned by snmptranslate : '.$numElements,INFO );
         
-        $step=$basestep=$numElements/10; // output display of % done
-        $num_step=0;
-        $timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
+		$step=$basestep=$numElements/10; // output display of % done
+		$num_step=0;
+		$timeFiveSec = microtime(true); // Used for display a '.' every <n> seconds
         
-        // Create index for trap objects
-        $this->trapObjectsIndex=array();
+		// Create index for trap objects
+		$this->trapObjectsIndex=array();
         
-        // detailed timing (time_* vars)
-        $time_parse1=$time_check1=$time_check2=$time_check3=$time_update=$time_objects=0;
-        $time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
-        $time_num_traps=0;
+		// detailed timing (time_* vars)
+		$time_parse1=$time_check1=$time_check2=$time_check3=$time_update=$time_objects=0;
+		$time_parse1N=$time_check1N=$time_check2N=$time_check3N=$time_updateN=$time_objectsN=0;
+		$time_num_traps=0;
         
-        for ($curElement=0;$curElement < $numElements;$curElement++)
-        {
-            $time_1= microtime(true);
-            if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
-            { // echo a . every 2 sec
-                echo '.';
-                $timeFiveSec = microtime(true);
-            }
-            if ($curElement>$step)
-            { // display progress
-                $num_step++;
-                $step+=$basestep;
-                if ($display_progress)
-                {
-                    echo "\n" . ($num_step*10). '% : ';
-                }
-            }
-            // Get oid or pass if not found
-            if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
-            {
-                $time_parse1 += microtime(true) - $time_1;
-                $time_parse1N ++;
-                continue;
-            }
-            $oid=$this->objectsAll[$curElement];
+		for ($curElement=0;$curElement < $numElements;$curElement++)
+		{
+			$time_1= microtime(true);
+			if ((microtime(true)-$timeFiveSec) > 2 && $display_progress)
+			{ // echo a . every 2 sec
+				echo '.';
+				$timeFiveSec = microtime(true);
+			}
+			if ($curElement>$step)
+			{ // display progress
+				$num_step++;
+				$step+=$basestep;
+				if ($display_progress)
+				{
+					echo "\n" . ($num_step*10). '% : ';
+				}
+			}
+			// Get oid or pass if not found
+			if (!preg_match('/^\.[0-9\.]+$/',$this->objectsAll[$curElement]))
+			{
+				$time_parse1 += microtime(true) - $time_1;
+				$time_parse1N ++;
+				continue;
+			}
+			$oid=$this->objectsAll[$curElement];
             
-            // get next line
-            $curElement++;
-            $match=$snmptrans=array();
-            if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
-                $this->objectsAll[$curElement],$match))
-            {
-                $time_check1 += microtime(true) - $time_1;
-                $time_check1N++;
-                continue;
-            }
+			// get next line
+			$curElement++;
+			$match=$snmptrans=array();
+			if (!preg_match('/ +([^\(]+)\(.+\) type=([0-9]+)( tc=([0-9]+))?( hint=(.+))?/',
+				$this->objectsAll[$curElement],$match))
+			{
+				$time_check1 += microtime(true) - $time_1;
+				$time_check1N++;
+				continue;
+			}
             
-            $name=$match[1]; // Name
-            $type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
+			$name=$match[1]; // Name
+			$type=$match[2]; // type (21=trap, 0: may be trap, else : not trap
             
-            if ($type==0) // object type=0 : check if v1 trap
-            {
-                // Check if next is suboid -> in that case is cannot be a trap
-                if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
-                {
-                    $time_check2 += microtime(true) - $time_1;
-                    $time_check2N++;
-                    continue;
-                }
-                unset($snmptrans);
-                exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                    ' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
-                if ($retVal!=0)
-                {
-                    $time_check2 += microtime(true) - $time_1;
-                    $time_check2N++;
-                    continue;
-                }
-                //echo "\n v1 trap found : $oid \n";
-                // Force as trap.
-                $type=21;
-            }
-            if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
-            {
-                $time_check3 += microtime(true) - $time_1;
-                $time_check3N++;
-                continue;
-            }
+			if ($type==0) // object type=0 : check if v1 trap
+			{
+				// Check if next is suboid -> in that case is cannot be a trap
+				if (preg_match("/^$oid/",$this->objectsAll[$curElement+1]))
+				{
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
+					continue;
+				}
+				unset($snmptrans);
+				exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+					' -Td '.$oid . ' | grep OBJECTS ',$snmptrans,$retVal);
+				if ($retVal!=0)
+				{
+					$time_check2 += microtime(true) - $time_1;
+					$time_check2N++;
+					continue;
+				}
+				//echo "\n v1 trap found : $oid \n";
+				// Force as trap.
+				$type=21;
+			}
+			if ($onlyTraps===true && $type!=21) // if only traps and not a trap, continue
+			{
+				$time_check3 += microtime(true) - $time_1;
+				$time_check3N++;
+				continue;
+			}
             
-            $time_num_traps++;
+			$time_num_traps++;
             
-            $this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
-            if ($display_progress) echo '#'; // echo a # when trap found
+			$this->logging->log('Found trap : '.$match[1] . ' / OID : '.$oid,INFO );
+			if ($display_progress) echo '#'; // echo a # when trap found
             
-            // get trap objects & source MIB
-            unset($snmptrans);
-            exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
-                ' -Td '.$oid,$snmptrans,$retVal);
-            if ($retVal!=0)
-            {
-                $this->logging->log('error executing snmptranslate',ERROR,'');
-            }
+			// get trap objects & source MIB
+			unset($snmptrans);
+			exec($this->snmptranslate . ' -m ALL -M +'.$this->snmptranslate_dirs.
+				' -Td '.$oid,$snmptrans,$retVal);
+			if ($retVal!=0)
+			{
+				$this->logging->log('error executing snmptranslate',ERROR,'');
+			}
             
-            if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
-            {
-                $this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
-            }
-            $trapMib=$match[1];
+			if (!preg_match('/^(.*)::/',$snmptrans[0],$match))
+			{
+				$this->logging->log('Error getting mib from trap '.$oid.' : ' . $snmptrans[0],1,'');
+			}
+			$trapMib=$match[1];
             
-            $numLine=1;$trapDesc='';
-            while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
-            if (isset($snmptrans[$numLine]))
-            {
-                $snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
+			$numLine=1;$trapDesc='';
+			while (isset($snmptrans[$numLine]) && !preg_match('/^[\t ]+DESCRIPTION[\t ]+"(.*)/',$snmptrans[$numLine],$match)) $numLine++;
+			if (isset($snmptrans[$numLine]))
+			{
+				$snmptrans[$numLine] = preg_replace('/^[\t ]+DESCRIPTION[\t ]+"/','',$snmptrans[$numLine]);
                 
-                while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
-                {
-                    $trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
-                    $numLine++;
-                }
-                if (isset($snmptrans[$numLine])) {
-                    $trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
-                    $trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
-                }
+				while (isset($snmptrans[$numLine]) && !preg_match('/"/',$snmptrans[$numLine]))
+				{
+					$trapDesc.=preg_replace('/[\t ]+/',' ',$snmptrans[$numLine]);
+					$numLine++;
+				}
+				if (isset($snmptrans[$numLine])) {
+					$trapDesc.=preg_replace('/".*/','',$snmptrans[$numLine]);
+					$trapDesc=preg_replace('/[\t ]+/',' ',$trapDesc);
+				}
                 
-            }
-            $update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
-            $time_update += microtime(true) - $time_1; $time_1= microtime(true);
+			}
+			$update=$this->update_oid($oid,$trapMib,$name,$type,NULL,NULL,NULL,NULL,$trapDesc);
+			$time_update += microtime(true) - $time_1; $time_1= microtime(true);
             
-            if (($update==0) && ($check_change===false))
-            { // Trapd didn't change & force check disabled
-                $time_objects += microtime(true) - $time_1;
-                if ($display_progress) echo "C";
-                continue;
-            }
+			if (($update==0) && ($check_change===false))
+			{ // Trapd didn't change & force check disabled
+				$time_objects += microtime(true) - $time_1;
+				if ($display_progress) echo "C";
+				continue;
+			}
             
-            $synt=null;
-            foreach ($snmptrans as $line)
-            {
-                if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
-                {
-                    $synt=$match[1];
-                }
-            }
-            if ($synt == null)
-            {
-                //echo "No objects for $trapOID\n";
-                $time_objects += microtime(true) - $time_1;
-                continue;
-            }
-            //echo "$synt \n";
-            $trapObjects=array();
-            while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
-            {
-                array_push($trapObjects,$match[1]);
-                $synt=preg_replace('/'.$match[0].'/','',$synt);
-            }
+			$synt=null;
+			foreach ($snmptrans as $line)
+			{
+				if (preg_match('/OBJECTS.*\{([^\}]+)\}/',$line,$match))
+				{
+					$synt=$match[1];
+				}
+			}
+			if ($synt == null)
+			{
+				//echo "No objects for $trapOID\n";
+				$time_objects += microtime(true) - $time_1;
+				continue;
+			}
+			//echo "$synt \n";
+			$trapObjects=array();
+			while (preg_match('/ *([^ ,]+) *,* */',$synt,$match))
+			{
+				array_push($trapObjects,$match[1]);
+				$synt=preg_replace('/'.$match[0].'/','',$synt);
+			}
             
-            $this->trap_objects($oid, $trapMib, $trapObjects, false);
+			$this->trap_objects($oid, $trapMib, $trapObjects, false);
             
-            $time_objects += microtime(true) - $time_1;
-            $time_objectsN++;
-        }
+			$time_objects += microtime(true) - $time_1;
+			$time_objectsN++;
+		}
         
-        if ($display_progress)
-        {
-            echo "\nNumber of processed traps : $time_num_traps \n";
-            echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
-            echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
-            echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
-            echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
-        }
+		if ($display_progress)
+		{
+			echo "\nNumber of processed traps : $time_num_traps \n";
+			echo "\nParsing : " . number_format($time_parse1+$time_check1,1) ." sec / " . ($time_parse1N+ $time_check1N)  . " occurences\n";
+			echo "Detecting traps : " . number_format($time_check2+$time_check3,1) . " sec / " . ($time_check2N+$time_check3N) ." occurences\n";
+			echo "Trap processing ($time_updateN): ".number_format($time_update,1)." sec , ";
+			echo "Objects processing ($time_objectsN) : ".number_format($time_objects,1)." sec \n";
+		}
         
-        // Timing ends
-        $timeTaken=microtime(true) - $timeTaken;
-        if ($display_progress)
-        {
-            echo "Global time : ".round($timeTaken)." seconds\n";
-        }
+		// Timing ends
+		$timeTaken=microtime(true) - $timeTaken;
+		if ($display_progress)
+		{
+			echo "Global time : ".round($timeTaken)." seconds\n";
+		}
         
-    }
+	}
     
     
 }
\ No newline at end of file

library/Trapdirector/TrapsProcess/Database.php

Indentation +295 added lines, -295 removed lines

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