Merge branch 'stable-3.1'

Author: Marius Burkard

interface/lib/app.inc.php

@@ -195,14 +195,14 @@ public function log($msg, $priority = 0) {
 			/*
 			if (is_writable($this->_conf['log_file'])) {
 				if (!$fp = fopen ($this->_conf['log_file'], 'a')) {
-					$this->error('Unable to open logfile.');
+					$this->error('Unable to open logfile: ' . $this->_conf['log_file']);
 				}
 				if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) {
-					$this->error('Unable to write to logfile.');
+					$this->error('Unable to write to logfile: ' . $this->_conf['log_file']);
 				}
 				fclose($fp);
 			} else {
-				$this->error('Unable to write to logfile.');
+				$this->error('Unable to write to logfile: ' . $this->_conf['log_file']);
 			}
 			*/
 		}

interface/lib/classes/remote.d/admin.inc.php

@@ -272,6 +272,49 @@ public function config_value_delete($session_id, $group, $name)
 
 		return $app->db->query('DELETE FROM sys_config WHERE `group` = ? AND `name` = ?',$group,$name);
 	}
+	
+	// Get datalog information with tstamp >=
+	public function sys_datalog_get_by_tstamp($session_id, $tstamp)	
+	{
+		global $app;
+
+		if(!$this->checkPerm($session_id, 'server_get')) {
+	        	throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+        		return false;
+		}
+		
+		$tstamp = $app->functions->intval($tstamp);
+
+		if($tstamp > 0)	{
+			$rec = $app->db->queryAllRecords("SELECT datalog_id, server_id, dbtable, dbidx, action, tstamp, user, data, status, error FROM sys_datalog WHERE tstamp >= ? ORDER BY datalog_id DESC", $tstamp);
+			return $rec;
+		}
+	}
+	
+	// Get datalog information by datalog_id
+	public function sys_datalog_get($session_id, $datalog_id, $newer = false)	
+	{
+		global $app;
+
+		if(!$this->checkPerm($session_id, 'server_get')) {
+	        	throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+        		return false;
+		}
+		
+		$tstamp = $app->functions->intval($tstamp);
+
+		if($datalog_id > 0 && $newer === true)	{
+			$rec = $app->db->queryAllRecords("SELECT datalog_id, server_id, dbtable, dbidx, action, tstamp, user, data, status, error FROM sys_datalog WHERE datalog_id >= ? ORDER BY datalog_id DESC", $datalog_id);
+			return $rec;
+		} elseif ($datalog_id > 0) {
+			$rec = $app->db->queryAllRecords("SELECT datalog_id, server_id, dbtable, dbidx, action, tstamp, user, data, status, error FROM sys_datalog WHERE datalog_id = ? ORDER BY datalog_id DESC", $datalog_id);
+			return $rec;
+		} else {
+			throw new SoapFault('invalid_datalog_id', 'The ID passed to the function must be > 0');
+        	return false;
+		}
+	}
+
 
 }
 

interface/lib/classes/remote.d/client.inc.php

@@ -678,6 +678,27 @@ public function client_login_get($session_id,$username,$password,$remote_ip = ''
 
 		return $returnval;
 	}
+	
+	public function client_get_by_groupid($session_id, $group_id)
+	{
+		global $app;
+		if(!$this->checkPerm($session_id, 'client_get_id')) {
+			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+
+		$group_id = $app->functions->intval($group_id);
+
+		$rec = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $group_id);
+		if(isset($rec['client_id'])) {
+			$client_id = $app->functions->intval($rec['client_id']);
+			return $this->client_get($session_id, $client_id);
+		} else {
+			throw new SoapFault('no_group_found', 'There is no client for this group ID.');
+			return false;
+		}
+	}
+
 }
 
 ?>