Commit e9d5c95a authored by Marius Cramer's avatar Marius Cramer

- backported patches:

    - make sure umlautdomains can be found in lists.
    - sorting by database name did not work in database quota list.
    - IDN: use standard from 2008 (which also works with "ß").
parent de34a9d7
......@@ -301,7 +301,7 @@ class functions {
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 @@ class functions {
}
} 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>
......
......@@ -197,6 +197,20 @@ class listform {
$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'));
......
......@@ -249,7 +249,7 @@ class page_action extends tform_actions {
$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"];
......
......@@ -3,4 +3,5 @@ $module["name"] = "login";
$module["title"] = "top_menu_login";
$module["template"] = "module.tpl.htm";
$module["startpage"] = "login/index.php";
$module["nav"] = array();
?>
......@@ -8,7 +8,7 @@
<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>
......
......@@ -353,7 +353,7 @@ class functions {
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 @@ class functions {
}
} 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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment