interface/lib/classes/tform_actions.inc.php

@@ -580,6 +580,10 @@ class tform_actions {
 
 		$this->dataRecord = $record;
 
+		if(isset($app->tform->formDef['record_name_field'])) {
+			$app->tform->formDef['title'] = $app->lng($app->tform->formDef['title']) . ' - ' . $this->dataRecord[$app->tform->formDef['record_name_field']];
+		}
+
 		// Userdaten umwandeln
 		$record = $app->tform->getHTML($record, $this->active_tab, 'EDIT');
 		$record['id'] = $this->id;

interface/lib/classes/tform_base.inc.php

@@ -379,7 +379,7 @@ class tform_base {
 					if($client['parent_client_id'] != 0) {
 
 						//* first we need to know the groups of this reseller
-						$tmp = $app->db->queryOneRecord("SELECT userid, groups FROM sys_user WHERE client_id = ?", $client['parent_client_id']);
+						$tmp = $app->db->queryOneRecord("SELECT userid, `groups` FROM sys_user WHERE client_id = ?", $client['parent_client_id']);
 						$reseller_groups = $tmp["groups"];
 						$reseller_userid = $tmp["userid"];
 
@@ -478,7 +478,7 @@ class tform_base {
 					if(isset($record[$key])) {
 						$val = $record[$key];
 					} else {
-						$val = '';
+						$val = $field['default'];
 					}
 
 					// If Datasource is set, get the data from there
@@ -621,11 +621,7 @@ class tform_base {
 						break;
 
 					default:
-						if(isset($record[$key])) {
-							$new_record[$key] = $app->functions->htmlentities($record[$key]);
-						} else {
-							$new_record[$key] = '';
-						}
+						$new_record[$key] = $app->functions->htmlentities($val);
 					}
 				}
 			}
@@ -1187,7 +1183,7 @@ class tform_base {
 				if (count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address'])) {
 					$errmsg = $validator['errmsg'];
 					if(isset($this->wordbook[$errmsg])) {
-						$this->errorMessage .= $this->wordbook[$errmsg].$sql_v6[ip_address]."<br />\r\n";
+						$this->errorMessage .= $this->wordbook[$errmsg].$sql_v6['ip_address']."<br />\r\n";
 					} else {
 						$this->errorMessage .= $errmsg."<br />\r\n";
 					}
@@ -1380,6 +1376,13 @@ class tform_base {
 							} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
 								$record[$key] = $app->db->getPasswordHash($record[$key]);
 								$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
+							} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQLSHA2') {
+								$record[$key] = $app->db->getPasswordHash($record[$key], 'caching_sha2_password');
+								$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
+							} elseif (isset($field['encryption']) && $field['encryption'] == 'POSTGRESHA256') {
+								$app->uses('crypt');
+								$record[$key] = $app->crypt->postgres_scram_sha_256($record[$key]);
+								$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 							} else {
 								$record[$key] = md5(stripslashes($record[$key]));
 								$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
@@ -1411,6 +1414,13 @@ class tform_base {
 							} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
 								$record[$key] = $app->db->getPasswordHash($record[$key]);
 								$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
+							} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQLSHA2') {
+								$record[$key] = $app->db->getPasswordHash($record[$key], 'caching_sha2_password');
+								$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
+							} elseif (isset($field['encryption']) && $field['encryption'] == 'POSTGRESHA256') {
+								$app->uses('crypt');
+								$record[$key] = $app->crypt->postgres_scram_sha_256($record[$key]);
+								$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 							} else {
 								$record[$key] = md5(stripslashes($record[$key]));
 								$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";

interface/lib/classes/tpl.inc.php

@@ -30,7 +30,7 @@ if (!defined('vlibTemplateClassLoaded')) {
 	include_once ISPC_CLASS_PATH.'/tpl_error.inc.php';
 	include_once ISPC_CLASS_PATH.'/tpl_ini.inc.php';
 
-	class tpl{
+	class tpl extends stdClass{
 
 		/*-----------------------------------------------------------------------------\
         |                                 ATTENTION                                    |
@@ -233,7 +233,7 @@ if (!defined('vlibTemplateClassLoaded')) {
 		public function setVar($k, $v = null, $encode = false)
 		{
 			global $app;
-			
+
 			if (is_array($k)) {
 				foreach($k as $key => $value){
 					$key = ($this->OPTIONS['CASELESS']) ? strtolower(trim($key)) : trim($key);
@@ -917,9 +917,17 @@ if (!defined('vlibTemplateClassLoaded')) {
 			$filename = basename($file);
 			$filepath = dirname($file);
 
-			if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['theme'])) {
-				if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename)) {
-					return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename;
+			$modulename = false;
+
+			if(isset($_SESSION['s']['module']['name'])) {
+				$modulename = $_SESSION['s']['module']['name'];
+			} elseif(strpos($_SERVER['PHP_SELF'], '/login/') === 0) {
+				$modulename = 'login';
+			}
+
+			if($modulename && isset($_SESSION['s']['theme'])) {
+				if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename)) {
+					return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename;
 				}
 			}
 
@@ -1079,12 +1087,12 @@ if (!defined('vlibTemplateClassLoaded')) {
 		private function _parseHook ($name)
 		{
 			global $app;
-			
+
 			if(!$name) return false;
-			
+
 			$module = isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : '';
 			$form = isset($app->tform->formDef['name']) ? $app->tform->formDef['name'] : '';
-			
+
 			$events = array();
 			if($module) {
 				$events[] = $module . ':' . ($form ? $form : '') . ':' . $name;
@@ -1093,9 +1101,9 @@ if (!defined('vlibTemplateClassLoaded')) {
 				$events[] = $name;
 				$events[] = 'on_template_content';
 			}
-			
+
 			$events = array_unique($events);
-			
+
 			for($e = 0; $e < count($events); $e++) {
 				$tmpresult = $app->plugin->raiseEvent($events[$e], array(
 					'name' => $name,
@@ -1104,10 +1112,10 @@ if (!defined('vlibTemplateClassLoaded')) {
 				), true);
 				if(!$tmpresult) $tmpresult = '';
 				else $tmpresult = $this->_getData($tmpresult, false, true);
-				
+
 				$result .= $tmpresult;
 			}
-			
+
 			return $result;
 		}
 
@@ -1225,7 +1233,7 @@ if (!defined('vlibTemplateClassLoaded')) {
 			$wholetag = $args[0];
 			$openclose = $args[1];
 			$tag = strtolower($args[2]);
-			
+
 			if ($tag == 'else') return '<?php } else { ?>';
 			if ($tag == 'tmpl_include') return $wholetag; // ignore tmpl_include tags
 
@@ -1303,10 +1311,10 @@ if (!defined('vlibTemplateClassLoaded')) {
 				if ($this->OPTIONS['ENABLE_PHPINCLUDE']) {
 					return '<?php include(\''.$file.'\'); ?>';
 				}
-			
+
 			case 'hook':
 				return $this->_parseHook(@$var);
-			
+
 			case 'include':
 				return '<?php $this->_getData($this->_fileSearch(\''.$file.'\'), 1); ?>';
 

interface/lib/classes/validate_cron.inc.php

@@ -45,15 +45,43 @@ class validate_cron {
         Validator function to check if a given cron command is in correct form (url only).
     */
 	function command_format($field_name, $field_value, $validator) {
+		global $app, $page;
+
 		if(preg_match("'^(\w+):\/\/'", $field_value, $matches)) {
+			//* Add the {DOMAIN} placeholder to the validation process
+			if(preg_match("/{DOMAIN}/", $field_value)) {
+
+				if(isset($app->remoting_lib->primary_id)) {
+					$cronjob = $app->remoting_lib->dataRecord;
+				} else {
+					$cronjob = $page->dataRecord;
+				}
+
+				if($cronjob['parent_domain_id'] > 0) {
+					$parent_domain = $app->db->queryOneRecord("SELECT `domain` FROM `web_domain` WHERE `domain_id` = ?", $cronjob['parent_domain_id']);
+					$trans = array(
+						'{DOMAIN}' => $parent_domain['domain']
+					);
+				}
+
+				$field_value = strtr($field_value, $trans);
+
+			}
 
 			$parsed = parse_url($field_value);
+
 			if($parsed === false) return $this->get_error($validator['errmsg']);
 
 			if($parsed["scheme"] != "http" && $parsed["scheme"] != "https") return $this->get_error($validator['errmsg']);
+			if(preg_match("'^([a-z0-9][a-z0-9\-]{0,62}\.)+([A-Za-z0-9\-]{2,63})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
+
+
 
-			if(preg_match("'^([a-z0-9][a-z0-9_\-]{0,62}\.)+([A-Za-z0-9\-]{2,63})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
+			if(strpos($field_value, '\\') !== false) {
+				return $this->get_error($validator['errmsg']);
+			}
 		}
+
 		if(strpos($field_value, "\n") !== false || strpos($field_value, "\r") !== false || strpos($field_value, chr(0)) !== false) {
 			return $this->get_error($validator['errmsg']);
 		}

interface/lib/classes/validate_database.inc.php

@@ -44,7 +44,8 @@ class validate_database {
 				$cur_value = trim($cur_value);
 				$valid = true;
 				if(function_exists('filter_var')) {
-					if(!filter_var($cur_value, FILTER_VALIDATE_IP)) {
+					// value must be either an IP address or hostname
+					if(!filter_var($cur_value, FILTER_VALIDATE_IP) && !filter_var($cur_value, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
 						$valid = false;
 					}
 				} else return "function filter_var missing <br />\r\n";

interface/lib/classes/validate_dns.inc.php

@@ -292,7 +292,7 @@ class validate_dns {
 		if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 		if($validator['allowempty'] == 'y' && $field_value == '') {
 			//* Do nothing
-		} elseif ($field_value == 'any') {
+		} elseif ($field_value == 'any' && $field_name != "also_notify") {
 			//* Do nothing
 		} else {
 			//* Check if its a IPv4 or IPv6 address/range

interface/lib/classes/validate_domain.inc.php

@@ -278,5 +278,115 @@ class validate_domain {
 		return true; // admin may always add wildcard domain
 	}
 
+	/**
+	 * Parses $expression to check if it is a valid shell glob pattern.
+	 * Does not support extended glob matching syntax.
+	 *
+	 * @see https://www.gnu.org/software/bash/manual/html_node/Pattern-Matching.html
+	 * @param string $expression
+	 * @param string $allowed_chars regexp of allowed characters in expression. ? and * are always allowed
+	 * @param string|null $allowed_brace_chars regexp of allowed characters in brace ([...]). Dash is always allowed. If empty, then $allowed_chars will be used
+	 * @return bool
+	 */
+	private function validate_glob($expression, $allowed_chars = '/^.$/u', $allowed_brace_chars = null) {
+		$escaping = false;
+		$in_brace = false;
+		$brace_content = [];
+		$chars = preg_split('//u', $expression, -1, PREG_SPLIT_NO_EMPTY);
+		foreach($chars as $i => $c) {
+			if($in_brace) {
+				// the first char after brace start can be a ].
+				if(($c == ']' && empty($brace_content)) || $c != ']') {
+					$brace_content[] = $c;
+				} else {
+					$in_brace = false;
+					$last_is_dash = false;
+					foreach($brace_content as $bi => $bc) {
+						// dashes are always allowed
+						if($bc == '-') {
+							// ... but we consider consecutive dashes as invalid
+							if($last_is_dash) {
+								return false;
+							}
+							// ... and need to validate it as allowed char when it is first or last
+							if(($bi == 0 || $bi == count($brace_content) - 1) && !preg_match($allowed_brace_chars ?: $allowed_chars, '-')) {
+								return false;
+							}
+							$last_is_dash = true;
+						} else {
+							$last_is_dash = false;
+							// negate chars are always allowed
+							if($bi == 0 && ($bc == '^' || $bc == '!') && count($brace_content) > 1) {
+								continue;
+							}
+							if(!preg_match($allowed_brace_chars ?: $allowed_chars, $bc)) {
+								return false;
+							}
+						}
+					}
+				}
+			} else {
+				$peek = $i == count($chars) - 1 ? '' : $chars[$i + 1];
+				if($c == '\\' && in_array($peek, ['[', ']', '*', '?'])) {
+					$escaping = true;
+					continue;
+				} elseif($c == '[' && !$escaping) {
+					$in_brace = true;
+					$brace_content = [];
+				} elseif($escaping || ($c != '?' && $c != '*')) {
+					if(!preg_match($allowed_chars, $c)) {
+						return false;
+					}
+				}
+				$escaping = false;
+			}
+		}
+		return !$in_brace && !$escaping;
+	}
+
+	/**
+	 * Validates that input is a comma separated list of domain globs.
+	 * Can be used for fnmatch() as input.
+	 */
+	function domain_glob_list($field_name, $field_value, $validator) {
+		global $app;
+		$allowempty = $validator['allowempty'] ?: 'n';
+		$exceptions = $validator['exceptions'] ?: [];
+		$allow_exception_as_substring = $validator['allow_exception_as_substring'] ?: 'y';
+		if(!$field_value) {
+			if($allowempty == 'y') {
+				return '';
+			}
+			return $this->get_error($validator['errmsg']);
+		}
+		$parts = explode(',', $field_value);
+		foreach($parts as $part) {
+			$part = trim($part);
+			// an empty part means there is a stray comma
+			if(empty($part)) {
+				return $this->get_error($validator['errmsg']);
+			}
+			// allow list placeholders that you will replace with real values at evaluation
+			if(in_array($part, $exceptions, true)) {
+				continue;
+			}
+			// optionally do not allow placeholders to be part of an expression
+			if($allow_exception_as_substring == 'n') {
+				foreach($exceptions as $exception) {
+					if(strpos($part, $exception) !== false) {
+						return $this->get_error($validator['errmsg']);
+					}
+				}
+			}
+			// A domain glob needs to:
+			// * be a valid glob with only a-z0-9._- as characters
+			// * have at least one dot in it
+			// * not have two consecutive dots
+			if(!$this->validate_glob($part, '/^[a-z0-9._-]$/ui') || strpos($part, '.') === false || strpos($part, '..') !== false) {
+				return $this->get_error($validator['errmsg']);
+			}
+		}
+		return '';
+	}
 
 }

interface/lib/classes/validate_mail_transport.inc.php

@@ -41,6 +41,40 @@ class validate_mail_transport {
 		}
 	}
 
+	/* Validator function for checking that the 'domain' is not already set as mail_domain */
+	function validate_isnot_maildomain($field_name, $field_value, $validator) {
+		global $app, $conf;
+
+		if(isset($app->remoting_lib->primary_id)) {
+			$id = $app->remoting_lib->primary_id;
+		} else {
+			$id = $app->tform->primary_id;
+		}
+
+		$sql = "SELECT domain_id, domain FROM mail_domain WHERE domain = ? AND domain_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
+
+		if($domain_check) return $this->get_error('domain_is_maildomain');
+
+	}
+
+	/* Validator function for checking that the 'domain' is not already set as mail_transport */
+	function validate_isnot_mailtransport($field_name, $field_value, $validator) {
+		global $app, $conf;
+
+		if(isset($app->remoting_lib->primary_id)) {
+			$id = $app->remoting_lib->primary_id;
+		} else {
+			$id = $app->tform->primary_id;
+		}
+
+		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND transport_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
+
+		if($domain_check) return $this->get_error('domain_is_transport');
+
+	}
+
 	/* Validator function for checking the 'domain' of a mail transport */
 	function validate_domain($field_name, $field_value, $validator) {
 		global $app, $conf;
@@ -52,8 +86,8 @@ class validate_mail_transport {
 		}
 
 		// mail_transport.domain (could also be an email address) must be unique per server
-		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND server_id = ? AND transport_id != ?";
-		$domain_check = $app->db->queryOneRecord($sql, $field_value, $app->tform_actions->dataRecord['server_id'], $id);
+		$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND transport_id != ?";
+		$domain_check = $app->db->queryOneRecord($sql, $field_value, $id);
 
 		if($domain_check) return $this->get_error('domain_error_unique');
 	}

interface/lib/lang/ar.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/bg.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/br.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Por favor, selecione um servidor válido. O ID d
 $wb['datalog_changes_close_txt'] = 'Fechar';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/ca.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/cn.lng

@@ -175,4 +175,18 @@ $wb['server_id_0_error_txt'] = '请选择一个有效的服务器。服务器ID
 $wb['datalog_changes_close_txt'] = '关闭';
 $wb['non_admin_error'] = '需要管理员级别的权限';
 $wb['copy_to_clipboard_txt'] = '复制到剪贴板';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/cz.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/de.lng

@@ -37,7 +37,7 @@ $wb['top_menu_dns'] = 'DNS';
 $wb['top_menu_tools'] = 'Einstellungen';
 $wb['top_menu_help'] = 'Support';
 $wb['top_menu_billing'] = 'Fakturierung';
-$wb['top_menu_mailuser'] = 'E-Mail Benutzer';
+$wb['top_menu_mailuser'] = 'E-Mail-Benutzer';
 $wb['top_menu_domain'] = 'Domains';
 $wb['top_menu_dashboard'] = 'Übersicht';
 $wb['latest_news_txt'] = 'Neuigkeiten';
@@ -86,46 +86,46 @@ $wb['datalog_changes_end_txt'] = 'Die Übernahme der Änderungen kann bis zu 1 M
 $wb['datalog_status_i_web_database'] = 'Neue Datenbank anlegen';
 $wb['datalog_status_u_web_database'] = 'Datenbank ändern';
 $wb['datalog_status_d_web_database'] = 'Datenbank löschen';
-$wb['datalog_status_i_web_database_user'] = 'Datenbank Benutzer für Datenbank anlegen';
-$wb['datalog_status_u_web_database_user'] = 'Datenbank Benutzer ändern';
-$wb['datalog_status_d_web_database_user'] = 'Datenbank Benutzer löschen';
+$wb['datalog_status_i_web_database_user'] = 'Datenbank-Benutzer für Datenbank anlegen';
+$wb['datalog_status_u_web_database_user'] = 'Datenbank-Benutzer ändern';
+$wb['datalog_status_d_web_database_user'] = 'Datenbank-Benutzer löschen';
 $wb['datalog_status_i_web_domain'] = 'Neue Webseite anlegen';
 $wb['datalog_status_u_web_domain'] = 'Webseiten Einstellungen ändern';
 $wb['datalog_status_d_web_domain'] = 'Webseite löschen';
-$wb['datalog_status_i_ftp_user'] = 'FTP Benutzer anlegen';
-$wb['datalog_status_u_ftp_user'] = 'FTP Benutzer ändern';
-$wb['datalog_status_d_ftp_user'] = 'FTP Benutzer löschen';
-$wb['datalog_status_i_mail_domain'] = 'Neue E-Mail Domain anlegen';
-$wb['datalog_status_u_mail_domain'] = 'E-Mail Domain ändern';
-$wb['datalog_status_d_mail_domain'] = 'E-Mail Domain löschen';
-$wb['datalog_status_i_mail_user'] = 'Neues E-Mail Konto anlegen';
-$wb['datalog_status_u_mail_user'] = 'E-Mail Konto ändern';
-$wb['datalog_status_d_mail_user'] = 'E-Mail Konto löschen';
-$wb['datalog_status_i_spamfilter_users'] = 'Spamfilter Einstellungen anlegen';
-$wb['datalog_status_u_spamfilter_users'] = 'Spamfilter Einstellungen ändern';
-$wb['datalog_status_d_spamfilter_users'] = 'Spamfilter Einstellungen löschen';
-$wb['datalog_status_i_mail_forwarding'] = 'Neue E-Mail Adresse anlegen';
-$wb['datalog_status_u_mail_forwarding'] = 'E-Mail Adresse ändern';
-$wb['datalog_status_d_mail_forwarding'] = 'E-Mail Adresse löschen';
-$wb['datalog_status_i_dns_rr'] = 'DNS Eintrag anlegen';
-$wb['datalog_status_u_dns_rr'] = 'DNS Eintrag ändern';
-$wb['datalog_status_d_dns_rr'] = 'DNS Eintrag löschen';
-$wb['datalog_status_i_dns_soa'] = 'DNS Zone anlegen';
-$wb['datalog_status_u_dns_soa'] = 'DNS Zone ändern';
-$wb['datalog_status_d_dns_soa'] = 'DNS Zone löschen';
-$wb['datalog_status_i_dns_slave'] = 'Create new secondary DNS zone';
-$wb['datalog_status_u_dns_slave'] = 'Update secondary DNS zone';
-$wb['datalog_status_d_dns_slave'] = 'Delete secondary DNS zone';
-$wb['datalog_status_i_firewall'] = 'Create new firewall rule';
-$wb['datalog_status_u_firewall'] = 'Update firewall rule';
-$wb['datalog_status_d_firewall'] = 'Delete firewall rule';
-$wb['datalog_status_u_server'] = 'Update server settings';
-$wb['datalog_status_d_server'] = 'Delete server';
+$wb['datalog_status_i_ftp_user'] = 'FTP-Benutzer anlegen';
+$wb['datalog_status_u_ftp_user'] = 'FTP-Benutzer ändern';
+$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer löschen';
+$wb['datalog_status_i_mail_domain'] = 'Neue E-Mail-Domain anlegen';
+$wb['datalog_status_u_mail_domain'] = 'E-Mail-Domain ändern';
+$wb['datalog_status_d_mail_domain'] = 'E-Mail-Domain löschen';
+$wb['datalog_status_i_mail_user'] = 'Neues E-Mail-Konto anlegen';
+$wb['datalog_status_u_mail_user'] = 'E-Mail-Konto ändern';
+$wb['datalog_status_d_mail_user'] = 'E-Mail-Konto löschen';
+$wb['datalog_status_i_spamfilter_users'] = 'Spamfilter-Einstellungen anlegen';
+$wb['datalog_status_u_spamfilter_users'] = 'Spamfilter-Einstellungen ändern';
+$wb['datalog_status_d_spamfilter_users'] = 'Spamfilter-Einstellungen löschen';
+$wb['datalog_status_i_mail_forwarding'] = 'Neue E-Mail-Adresse anlegen';
+$wb['datalog_status_u_mail_forwarding'] = 'E-Mail-Adresse ändern';
+$wb['datalog_status_d_mail_forwarding'] = 'E-Mail-Adresse löschen';
+$wb['datalog_status_i_dns_rr'] = 'DNS-Eintrag anlegen';
+$wb['datalog_status_u_dns_rr'] = 'DNS-Eintrag ändern';
+$wb['datalog_status_d_dns_rr'] = 'DNS-Eintrag löschen';
+$wb['datalog_status_i_dns_soa'] = 'Neue Primäre-DNS-Zone anlegen';
+$wb['datalog_status_u_dns_soa'] = 'Primäre-DNS-Zone aktualisieren';
+$wb['datalog_status_d_dns_soa'] = 'Primäre-DNS-Zone löschen';
+$wb['datalog_status_i_dns_slave'] = 'Neue Sekundäre-DNS-Zone anlegen';
+$wb['datalog_status_u_dns_slave'] = 'Sekundäre-DNS-Zone aktualisieren';
+$wb['datalog_status_d_dns_slave'] = 'Sekundäre-DNS-Zone löschen';
+$wb['datalog_status_i_firewall'] = 'Neue Firewall-Regel erstellen';
+$wb['datalog_status_u_firewall'] = 'Firewall-Regel ändern';
+$wb['datalog_status_d_firewall'] = 'Firewall-Regel löschen';
+$wb['datalog_status_u_server'] = 'Server-Einstellungen ändern';
+$wb['datalog_status_d_server'] = 'Server löschen';
 $wb['datalog_status_i_cron'] = 'Cronjob anlegen';
 $wb['datalog_status_u_cron'] = 'Cronjob ändern';
-$wb['datalog_status_i_server_ip'] = 'Add server IP';
-$wb['datalog_status_u_server_ip'] = 'Update server IP';
-$wb['datalog_status_d_server_ip'] = 'Delete server IP';
+$wb['datalog_status_i_server_ip'] = 'Server-IP anlegen';
+$wb['datalog_status_u_server_ip'] = 'Server-IP ändern';
+$wb['datalog_status_d_server_ip'] = 'Server-IP löschen';
 $wb['datalog_status_d_cron'] = 'Cronjob löschen';
 $wb['datalog_status_i_mail_get'] = 'E-Mailabruf anlegen';
 $wb['datalog_status_u_mail_get'] = 'E-Mailabruf ändern';
@@ -133,21 +133,21 @@ $wb['datalog_status_d_mail_get'] = 'E-Mailabruf löschen';
 $wb['datalog_status_i_mail_mailinglist'] = 'Mailingliste anlegen';
 $wb['datalog_status_u_mail_mailinglist'] = 'Mailingliste ändern';
 $wb['datalog_status_d_mail_mailinglist'] = 'Mailingliste löschen';
-$wb['datalog_status_i_shell_user'] = 'Shell Benutzer anlegen';
-$wb['datalog_status_u_shell_user'] = 'Shell Benutzer ändern';
-$wb['datalog_status_d_shell_user'] = 'Shell Benutzer löschen';
+$wb['datalog_status_i_shell_user'] = 'SSH/SFTP-Benutzer anlegen';
+$wb['datalog_status_u_shell_user'] = 'SSH/SFTP-Benutzer ändern';
+$wb['datalog_status_d_shell_user'] = 'SSH/SFTP-Benutzer löschen';
 $wb['datalog_status_i_web_folder'] = 'Verzeichnisschutz anlegen';
 $wb['datalog_status_u_web_folder'] = 'Verzeichnisschutz ändern';
 $wb['datalog_status_d_web_folder'] = 'Verzeichnisschutz löschen';
-$wb['datalog_status_i_web_folder_user'] = 'Verzeichnisschutz Benutzer anlegen';
-$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz Benutzer ändern';
-$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen';
-$wb['datalog_status_i_xmpp_domain'] = 'XMPP Domain erstellen';
-$wb['datalog_status_u_xmpp_domain'] = 'XMPP Domain ändern';
-$wb['datalog_status_d_xmpp_domain'] = 'XMPP Domain löschen';
-$wb['datalog_status_i_xmpp_user'] = 'XMPP Benutzer erstellen';
-$wb['datalog_status_u_xmpp_user'] = 'XMPP Benutzer ändern';
-$wb['datalog_status_d_xmpp_user'] = 'XMPP Benutzer löschen';
+$wb['datalog_status_i_web_folder_user'] = 'Verzeichnisschutz-Benutzer anlegen';
+$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz-Benutzer ändern';
+$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz-Benutzer löschen';
+$wb['datalog_status_i_xmpp_domain'] = 'XMPP-Domain erstellen';
+$wb['datalog_status_u_xmpp_domain'] = 'XMPP-Domain ändern';
+$wb['datalog_status_d_xmpp_domain'] = 'XMPP-Domain löschen';
+$wb['datalog_status_i_xmpp_user'] = 'XMPP-Benutzer erstellen';
+$wb['datalog_status_u_xmpp_user'] = 'XMPP-Benutzer ändern';
+$wb['datalog_status_d_xmpp_user'] = 'XMPP-Benutzer löschen';
 $wb['login_as_txt'] = 'Anmelden als';
 $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
 $wb['no_destination_perm'] = 'Sie haben keine Berechtigung für dieses Ziel.';
@@ -167,11 +167,25 @@ $wb['weak_password_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanfor
 $wb['weak_password_length_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanforderungen nicht. Es muss mindestens {chars} Zeichen lang sein.';
 $wb['security_check1_txt'] = 'Sicherheitsüberprüfung für:';
 $wb['security_check2_txt'] = 'fehlgeschlagen.';
-$wb['select_directive_snippet_txt'] = 'Direktiven Schnipsel';
-$wb['select_master_directive_snippet_txt'] = 'Master Direktiven Schnipsel';
+$wb['select_directive_snippet_txt'] = 'Direktiven-Schnipsel';
+$wb['select_master_directive_snippet_txt'] = 'Master-Direktiven-Schnipsel';
 $wb['unlimited_txt'] = 'unlimitiert';
-$wb['server_id_0_error_txt'] = 'Bitte Server auswählen. Server ID muss > als 0 sein.';
-$wb['datalog_changes_close_txt'] = 'Close';
-$wb['non_admin_error'] = 'Requires administrator level permissions';
-$wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['server_id_0_error_txt'] = 'Bitte Server auswählen. Server-ID muss > als 0 sein.';
+$wb['datalog_changes_close_txt'] = 'Schließen';
+$wb['non_admin_error'] = 'Erfordert Administratorrechte';
+$wb['copy_to_clipboard_txt'] = 'In die Zwischenablage kopieren';
+$wb['datalog_status_i_client'] = 'Neuen Kunden erstellen';
+$wb['datalog_status_u_client'] = 'Kunden aktualisieren';
+$wb['datalog_status_d_client'] = 'Kunden löschen';
+$wb['datalog_status_i_domain'] = 'Neue Domain erstellen';
+$wb['datalog_status_u_domain'] = 'Domain aktualisieren';
+$wb['datalog_status_d_domain'] = 'Domain löschen';
+$wb['datalog_status_d_web_backup'] = 'Website-Backup löschen';
+$wb['datalog_status_i_dns_template'] = 'Neue DNS-Vorlage erstellen';
+$wb['datalog_status_u_dns_template'] = 'DNS-Vorlage aktualisieren';
+$wb['datalog_status_d_dns_template'] = 'DNS-Vorlage löschen';
+$wb['datalog_status_i_sys_group'] = 'Neue Gruppe für Kunde erstellen';
+$wb['datalog_status_u_sys_ini'] = 'Aktualisiere Hauptkonfiguration';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/dk.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/el.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/en.lng

@@ -83,6 +83,12 @@ $wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Cha
 
 $wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
 $wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
 $wb['datalog_status_i_web_database'] = 'Create new database';
 $wb['datalog_status_u_web_database'] = 'Update database';
 $wb['datalog_status_d_web_database'] = 'Delete database';
@@ -175,4 +181,12 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/es.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Cerrar';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>

interface/lib/lang/fi.lng

@@ -174,4 +174,18 @@ $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be
 $wb['datalog_changes_close_txt'] = 'Close';
 $wb['non_admin_error'] = 'Requires administrator level permissions';
 $wb['copy_to_clipboard_txt'] = 'Copy to clipboard';
+$wb['datalog_status_i_client'] = 'Create new client';
+$wb['datalog_status_u_client'] = 'Update client';
+$wb['datalog_status_d_client'] = 'Delete client';
+$wb['datalog_status_i_domain'] = 'Create new domain';
+$wb['datalog_status_u_domain'] = 'Update domain';
+$wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['datalog_status_i_sys_group'] = 'Create new client group';
+$wb['datalog_status_u_sys_ini'] = 'Update main config';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>