- Fixed a bug in lng() function.

- Added a function to the remote api to get all virtual machines of a client.

Author: tbrehm

interface/lib/app.inc.php

@@ -162,6 +162,7 @@ public function error($msg, $next_link = '', $stop = true, $priority = 1) {
 
 	/** Translates strings in current language */
 	public function lng($text) {
+		global $conf;
 		if($this->_language_inc != 1) {
 			$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
 			//* loading global Wordbook

interface/lib/classes/remoting.inc.php

@@ -2127,7 +2127,7 @@ protected function klientadd($formdef_file, $reseller_id, $params)
 		if(isset($params['template_master']) and $params['template_master'] > 0)
 		{
 			$template=$app->db->queryOneRecord("SELECT * FROM client_template WHERE template_id=".intval($params['template_master']));
-			$params=array_merge($params,$template);
+			if(is_array($template)) $params=array_merge($params,$template);
 		}
 
 		//* Get the SQL query
@@ -2793,6 +2793,26 @@ public function openvz_vm_get($session_id, $vm_id)
 		return $app->remoting_lib->getDataRecord($vm_id);
 	}
 
+	//* Get OpenVZ list
+	public function openvz_vm_get_by_client($session_id, $client_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'vm_openvz')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		
+		if (!empty($client_id)) {
+        	$client_id      = intval($client_id);
+			$tmp 			= $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
+    	    $sql            = "SELECT * FROM openvz_vm WHERE sys_groupid = ".intval($tmp['groupid']);
+        	$result         = $app->db->queryAllRecords($sql);
+        	return          $result;
+        }
+        return false;
+	}
+	
 	//* Add a openvz vm record
 	public function openvz_vm_add($session_id, $client_id, $params)
     {