fixed API usage (includes PR#54, PR#71, PR#74)

application/clicommands/MibCommand.php

@@ -141,7 +141,8 @@ public function purgeAction()
 
 			$dbresource=$this->Config()->get('config', 'database');
 			echo "DB name : $dbresource\n";
-			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+//			$db = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$db = IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
 
 			$query = $db->delete(
 			    $Config->getMIBCacheTableName(),

application/clicommands/StatusCommand.php

@@ -31,7 +31,8 @@ public function dbAction()
 
 			$dbresource=$this->Config()->get('config', 'database');
 			printf("DB name : %s\n",$dbresource);
-			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+//			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getConnection();
+			$dataBase = IcingaDbConnection::fromResourceName($dbresource)->getDbAdapter();
 
 			$query = $dataBase->select()->from($Config->getTrapTableName(),array('COUNT(*)'));			
 			printf("Number of traps : %s\n", $dataBase->fetchOne($query) );

application/controllers/HandlerController.php

@@ -32,7 +32,8 @@ public function indexAction()
 		      $this->moduleConfig->getHandlerListTitles(),
 		      $this->moduleConfig->getHandlerListDisplayColumns(),
 		      $this->moduleConfig->getHandlerColumns(),
-		      $dbConn->getConnection(),
+		      $dbConn->getDbAdapter(),
+//		      $dbConn->getConnection(),
 		      $this->view,
 		      $this->moduleConfig->urlPath());
 
@@ -546,7 +547,7 @@ protected function handlerformAction()
 			    if ($this->apiMode == TRUE)
 			    {
 			        $object=$this->getIdoConn()->getHostGroupById($params['hostid']['val']);
-			        if (count($object) == 0 || $params['host_name']['val'] != $object->__name)
+				if (empty($object) || $params['host_name']['val'] != $object->__name)
 			        {
 			            $this->_helper->json(array('status'=>"Invalid object group id : Please re enter service"));
 			            return;
@@ -708,4 +709,4 @@ protected function prepareTabs()
 		);
 	} 
 
-}
+}

application/controllers/ReceivedController.php

@@ -2,10 +2,13 @@
 
 namespace Icinga\Module\TrapDirector\Controllers;
 
+use Icinga\Date\DateFormatter;
+
 use Icinga\Web\Url;
 
 use Exception;
 
+
 use Icinga\Module\Trapdirector\TrapsController;
 
 /** 
@@ -89,7 +92,7 @@ public function trapdetailAction()
 		// Store result in array (with Titles).
 		foreach ($queryArray as $key => $val) {
 			if ($key == 'timestamp') {
-				$cval=strftime('%c',$trapDetail->$key);
+				$cval=DateFormatter::formatDateTime($trapDetail->$key);
 			} else {
 				$cval=$trapDetail->$key;
 			}
@@ -228,4 +231,4 @@ public function deletelinesAction()
 		$this->_helper->json(array('status'=>'unknown action'));
 	}
 
-}
+}

application/controllers/SettingsController.php

@@ -121,6 +121,7 @@ private function check_db()
 
       $this->view->ido_db_error=$dberror[0];
       $this->view->ido_message='IDO Database : ' . $dberror[1];
+      $this->view->ido_message .='<br />=&gt; Default to API use. Make sure it is configured and check is returning OK!';
   }
 
   /**
@@ -250,10 +251,10 @@ public function indexAction()
 	// Test Database
     $this->check_db();
 
-	//********* Test API
+	// Test API
     $this->check_api();
 
-	//*********** Test snmptrapd alive and options
+	//Test snmptrapd alive and options
 	list ($this->view->snmptrapdError, $this->view->snmptrapdMessage) = $this->checkSnmpTrapd();
 
 	// List DB in $ressources
@@ -464,7 +465,9 @@ private function checkSnmpTrapd()
       exec("$sspath -lun | grep ':162 '",$psOutput);
       if (count($psOutput) == 0)
       {
-          return array(1,'Port UDP/162 is not open : is snmptrapd running?');
+          $extra = "";
+          if (is_file("/.dockerenv")){ $extra = '<br />=&gt; ignore if Trapdirector is running in a different Docker container'; }
+          return array(1,'Port UDP/162 is not open : is snmptrapd running?'. $extra);
       }
       $psOutput=array();
       $selinux_state = '';

application/controllers/StatusController.php

@@ -131,7 +131,7 @@ public function mibAction()
 			/** Check for mib file UPLOAD */
 			if (isset($_FILES['mibfile']))
 			{
-			    $name=filter_var($_FILES['mibfile']['name'],FILTER_SANITIZE_STRING);
+				$name=htmlspecialchars($_FILES['mibfile']['name']);
 				$DirConf=explode(':',$this->Config()->get('config', 'snmptranslate_dirs'));
 				$destDir=array_shift($DirConf);
 				if (!is_dir($destDir))
@@ -147,7 +147,7 @@ public function mibAction()
 				    else
 				    {
 				        $destination = $destDir .'/'.$name; //$this->Module()->getBaseDir() . "/mibs/$name";
-				        $sourceTmpNam=filter_var($_FILES['mibfile']['tmp_name'],FILTER_SANITIZE_STRING);
+				        $sourceTmpNam=htmlspecialchars($_FILES['mibfile']['tmp_name']);
 				        if (move_uploaded_file($sourceTmpNam,$destination)===false)
     				    {
     				        $this->view->uploadStatus="ERROR, file $destination not loaded. Check file and path name or selinux violations";

library/Trapdirector/Config/MIBLoader.php

@@ -174,7 +174,7 @@ public function translateOID($oid)
 		}
 		$retArray['description']=null;
 		/* TODO : put in DB (but maybe only in trap_class).
-		$query=$db->getConnection()->insert(
+		$query=$db->getDbAdapter()->insert(
 			$this->getModuleConfig()->getTrapRuleName(),
 			$array(
 				'oid'	=>

library/Trapdirector/Icinga2API.php

@@ -285,6 +285,28 @@ public function getServiceById($name)
 
         return $services;
     }
+
+    /** Get services object by id (host!name)
+     *	does not catch exceptions
+     *	@param $name string service __name (host!name)
+     *	@return array  service id
+     */
+    public function getNOKService()
+    {
+        $filter = 'service.state != ServiceOK && !(service.acknowledgement || service.downtime_depth || service.host.downtime_depth)';
+        $services =  $this->standardQuery(
+            'service',
+            $filter,
+            array('__name','name','last_check','host_name','state')
+            );
+
+        foreach ( array_keys($services) as $key )
+        {
+            $services[$key]->id = $services[$key]->__name;
+        }
+
+        return $services;
+    }
 
 
 }

library/Trapdirector/Tables/TrapTable.php

@@ -7,6 +7,8 @@
 use Icinga\Data\Selectable;
 use Icinga\Data\Paginatable;
 
+use Icinga\Date\DateFormatter;
+
 use Icinga\Web\Request;
 
 use Icinga\Web\Widget;
@@ -50,7 +52,7 @@ protected function renderDayIfNew($timestamp)
         if (in_array(setlocale(LC_ALL, 0), array('en_US.UTF-8', 'C'))) {
             $day = date('l, jS F Y', (int) $timestamp);
         } else {
-            $day = strftime('%A, %e. %B, %Y', (int) $timestamp);
+            $day = DateFormatter::formatDate((int) $timestamp);
         }
 
         if ($this->lastDay === $day) {
@@ -134,7 +136,7 @@ public function getOffset()
     {
         return $this->offset;
     }
-
+	#[\ReturnTypeWillChange]
 	abstract function count();
 
     public function getPaginator()
@@ -233,4 +235,4 @@ protected function applyFiltersToQuery($query)
         return $query;
     }	
 
-}
+}

library/Trapdirector/Tables/TrapTableHostList.php

@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\TrapDirector\Tables;
 
+use Icinga\Date\DateFormatter;
 
 use Icinga\Web\Request;
 use Icinga\Web\Url;
@@ -112,7 +113,7 @@ public function render()
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
 				{
-					$val = ($rowkey=='last_sent') ?  strftime('%c',$row->$rowkey) : $row->$rowkey;
+					$val = ($rowkey=='last_sent') ? DateFormatter::formatDateTime($row->$rowkey) : $row->$rowkey;
 				} else {
 					$val = '-';
 				}

library/Trapdirector/Tables/TrapTableList.php

@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\TrapDirector\Tables;
 
+use Icinga\Date\DateFormatter;
 
 use Icinga\Web\Request;
 use Icinga\Web\Url;
@@ -68,7 +69,7 @@ public function render()
 				// Check missing value
 				if (property_exists($row, $rowkey)) 
 				{
-					$val = ($rowkey=='timestamp') ?  strftime('%T',$row->$rowkey) : $row->$rowkey;
+					$val = ($rowkey=='timestamp') ?  DateFormatter::formatTime($row->$rowkey) : $row->$rowkey;
 				} else {
 					$val = '-';
 				}
@@ -227,4 +228,4 @@ protected function applyFiltersToQuery($query)
         return $query;
     }	
 
-}
+}

library/Trapdirector/TrapsActions/UIDatabase.php

@@ -29,7 +29,7 @@ class DBException extends Exception
      * @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 = "", int $code = 0, Exception $previous = null)
     {
         parent::__construct($message,$code,$previous);
         $this->returnArray = $retarray;
@@ -224,7 +224,8 @@ public function getDb()
     public function getDbConn()
     {
         if ($this->getDb() == null) return null;
-        return $this->getDb()->getConnection();
+        return $this->getDb()->getDbAdapter();
+//        return $this->getDb()->getConnection();
     }
 
     /**
@@ -330,4 +331,4 @@ public function testGetIdoDb()
         return;
     }
 
-}
+}

library/Trapdirector/TrapsProcess/MibDatabase.php

@@ -80,7 +80,8 @@ private function update_oid_update()
                 ':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']]
+                ':id' => $this->dbOidIndex[$this->oidDesc['oid']]['id']
+//                ':id' => $this->dbOidAll[$this->dbOidIndex[$this->oidDesc['oid']]['id']]
             );
 
             if ($sqlQuery->execute($sqlParam) === false) {
@@ -191,4 +192,4 @@ private function cache_db_objects($trapId)
     }
 
 
-}
+}