Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Author: Florian Schaal

interface/lib/classes/functions.inc.php

@@ -301,7 +301,7 @@ private function _idn_encode_decode($domain, $encode = true) {
 
 		if($encode == true) {
 			if(function_exists('idn_to_ascii')) {
-				$domain = idn_to_ascii($domain);
+				$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
 			} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
 				/* use idna class:
                  * @author  Matthias Sommerfeld <mso@phlylabs.de>
@@ -318,7 +318,7 @@ private function _idn_encode_decode($domain, $encode = true) {
 			}
 		} else {
 			if(function_exists('idn_to_utf8')) {
-				$domain = idn_to_utf8($domain);
+				$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
 			} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
 				/* use idna class:
                  * @author  Matthias Sommerfeld <mso@phlylabs.de>

interface/lib/classes/listform.inc.php

@@ -197,6 +197,20 @@ public function getSearchSQL($sql_where = '')
 				$table = $i['table'];
 
 				$searchval = $_SESSION['search'][$list_name][$search_prefix.$field];
+				// IDN
+				if($searchval != ''){
+					foreach($i['filters'] as $searchval_filter) {
+						if($searchval_filter['event'] == 'SHOW') {
+							switch ($searchval_filter['type']) {
+							case 'IDNTOUTF8':
+								$searchval = $app->functions->idn_encode($searchval);
+								//echo $searchval;
+								break;
+							}
+						}
+					}
+				}
+		
 				// format user date format to MySQL date format 0000-00-00
 				if($i['datatype'] == 'DATE' && $this->lng('conf_format_dateshort') != 'Y-m-d'){
 					$dateformat = preg_replace("@[^Ymd]@", "", $this->lng('conf_format_dateshort'));

interface/web/client/client_edit.php

@@ -249,7 +249,7 @@ function onAfterInsert() {
 		$modules = $conf['interface_modules_enabled'];
 		if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] > 0) $modules .= ',client';
 		$startmodule = (stristr($modules, 'dashboard'))?'dashboard':'client';
-		$usertheme = $this->dataRecord["usertheme"];
+		$usertheme = (isset($this->dataRecord["usertheme"]) && $this->dataRecord["usertheme"] != ''? $this->dataRecord["usertheme"] : 'default');
 		$type = 'user';
 		$active = 1;
 		$language = $this->dataRecord["language"];

interface/web/login/lib/module.conf.php

@@ -3,4 +3,5 @@
 $module["title"]   = "top_menu_login";
 $module["template"]  = "module.tpl.htm";
 $module["startpage"]  = "login/index.php";
+$module["nav"] = array();
 ?>

interface/web/sites/templates/database_quota_stats_list.htm

@@ -8,7 +8,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
 				<thead class="dark form-group-sm">
 				<tr>
-					<th data-column="database"><tmpl_var name="database_txt"></th>
+					<th data-column="database_name"><tmpl_var name="database_txt"></th>
 					<th data-column="server_name"><tmpl_var name="server_name_txt"></th>
 					<th data-column="client"><tmpl_var name="client_txt"></th>
 					<th data-column="used"><tmpl_var name="used_txt"></th>

server/lib/classes/functions.inc.php

@@ -353,7 +353,7 @@ private function _idn_encode_decode($domain, $encode = true) {
 
 		if($encode == true) {
 			if(function_exists('idn_to_ascii')) {
-				$domain = idn_to_ascii($domain);
+				$domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
 			} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
 				/* use idna class:
                  * @author  Matthias Sommerfeld <mso@phlylabs.de>
@@ -370,7 +370,7 @@ private function _idn_encode_decode($domain, $encode = true) {
 			}
 		} else {
 			if(function_exists('idn_to_utf8')) {
-				$domain = idn_to_utf8($domain);
+				$domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
 			} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
 				/* use idna class:
                  * @author  Matthias Sommerfeld <mso@phlylabs.de>