patrickpr / trapdirector

library/Trapdirector/TrapsActions/TrapDBQuery.php

Spacing +30 added lines, -30 removed lines

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