Merge branch 'master' into 'master'

fixes for the SOAP interface

correcting a typo and the backticks of columns in queries

See merge request !233

Author: Till Brehm

interface/lib/classes/remoting.inc.php

@@ -90,7 +90,7 @@ public function login($username, $password, $client_login = false)
 		}
 
 		//* Delete old remoting sessions
-		$sql = "DELETE FROM remote_session WHERE tstamp < UNIX_TIMSTAMP()";
+		$sql = "DELETE FROM remote_session WHERE tstamp < UNIX_TIMESTAMP()";
 		$app->db->query($sql);
 
 		if($client_login == true) {
@@ -231,7 +231,7 @@ protected function klientadd($formdef_file, $reseller_id, $params)
 
 		/* copied from the client_edit php */
 		exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
-		$app->db->query("UPDATE client SET created_at = UNIX_TIMSTAMP(), id_rsa = ?, ssh_rsa = ? WHERE client_id = ?", @file_get_contents('/tmp/id_rsa'), @file_get_contents('/tmp/id_rsa.pub'), $this->id);
+		$app->db->query("UPDATE client SET created_at = UNIX_TIMESTAMP(), id_rsa = ?, ssh_rsa = ? WHERE client_id = ?", @file_get_contents('/tmp/id_rsa'), @file_get_contents('/tmp/id_rsa.pub'), $this->id);
 		exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
 
 
@@ -475,7 +475,7 @@ protected function getSession($session_id)
 			return false;
 		}
 
-		$sql = "SELECT * FROM remote_session WHERE remote_session = ? AND tstamp >= UNIX_TIMSTAMP()";
+		$sql = "SELECT * FROM remote_session WHERE remote_session = ? AND tstamp >= UNIX_TIMESTAMP()";
 		$session = $app->db->queryOneRecord($sql, $session_id);
 		if($session['remote_userid'] > 0) {
 			return $session;

interface/lib/classes/remoting_lib.inc.php

@@ -243,9 +243,9 @@ function getDataRecord($primary_id) {
 				if($key == '#OFFSET#') $sql_offset = $app->functions->intval($val);
 				elseif($key == '#LIMIT#') $sql_limit = $app->functions->intval($val);
 				elseif(stristr($val, '%')) {
-					$sql_where .= "? like ? AND ";
+					$sql_where .= "?? like ? AND ";
 				} else {
-					$sql_where .= "? = ? AND ";
+					$sql_where .= "?? = ? AND ";
 				}
 				$params[] = $key;
 				$params[] = $val;