diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 94ffd5703fe0b4bb7e87163027c8dbcecb3fe39f..346b62b9abe3d4c84fbe94715a0d4cb0a9fdbae7 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -526,7 +526,7 @@ class installer_base {
$hosts[$from_host]['pwd'] = $conf['mysql']['master_ispconfig_password'];
$host_ips = $this->get_host_ips();
- if(is_arary($host_ips) && !empty($host_ips)) {
+ if(is_array($host_ips) && !empty($host_ips)) {
foreach($host_ips as $ip) {
$hosts[$ip]['user'] = $conf['mysql']['master_ispconfig_user'];
$hosts[$ip]['db'] = $conf['mysql']['master_database'];
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 4a463fe01508e196363ed1095a5d41654398164f..097b41fc0d13196f9b944681e17b7d02981a967a 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -39,6 +39,7 @@ class listform_actions {
private $sortKeys;
private function _sort($aOne, $aTwo) {
+ $suffixes=array('k' => 1, 'M' => 1024, 'G' => 1048576, 'T' => 1099511627776);
if(!is_array($aOne) || !is_array($aTwo)) return 0;
if(!is_array($this->sortKeys)) $this->sortKeys = array($this->sortKeys);
@@ -49,6 +50,15 @@ class listform_actions {
}
$a = $aOne[$sKey];
$b = $aTwo[$sKey];
+
+ if(preg_match('/(\d+\.?\d*) ([kMGT])B/', $a, $match)) {
+ $a = $match[1] * $suffixes[$match[2]];
+ }
+
+ if(preg_match('/(\d+\.?\d*) ([kMGT])B/', $b, $match)) {
+ $b = $match[1] * $suffixes[$match[2]];
+ }
+
if(is_string($a)) $a = strtolower($a);
if(is_string($b)) $b = strtolower($b);
if($a < $b) return $sDir == 'DESC' ? 1 : -1;
@@ -129,7 +139,7 @@ class listform_actions {
// Getting Datasets from DB
$records = $app->db->queryAllRecords($this->getQueryString($php_sort));
-
+
$csrf_token = $app->auth->csrf_token_get($app->listform->listDef['name']);
$_csrf_id = $csrf_token['csrf_id'];
$_csrf_key = $csrf_token['csrf_key'];
diff --git a/interface/web/mail/list/user_quota_stats.list.php b/interface/web/mail/list/user_quota_stats.list.php
index e8faae36340d654ab2545669c21c378858920f4c..1ba9fc670220ac01fb3c71753239434d4243585a 100644
--- a/interface/web/mail/list/user_quota_stats.list.php
+++ b/interface/web/mail/list/user_quota_stats.list.php
@@ -41,7 +41,7 @@ $liste["paging_tpl"] = "templates/paging.tpl.htm";
$liste["auth"] = "yes";
// mark columns for php sorting (no real mySQL columns)
-$liste["phpsort"] = array('used_sort', 'percentage_sort');
+$liste["phpsort"] = array('used', 'percentage');
/*****************************************************
* Suchfelder
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 263b98ef31a6054dd0965b33157d33c09992f2f3..d291367d11ce06789a5264c2823e537576ae6479 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -70,6 +70,9 @@ class page_action extends tform_actions {
function onShowEnd() {
global $app, $conf;
+ // Workaround for #5448, accessed via link on quota dashlet.
+ $app->tpl->setVar('app_module', 'mail');
+
$email = $this->dataRecord["email"];
$email_parts = explode("@", $email);
$app->tpl->setVar("email_local_part", $email_parts[0]);
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index 4b4b831aab7cc4bbc066d85d4671e249cfbf3395..99690d6a332bc30401a50585f2453d61df2d11d0 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -17,7 +17,7 @@
</tr>
<tr>
<td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td><input class="form-control" type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<td> </td>
<td> </td>
<td> </td>
@@ -50,5 +50,5 @@
</tfoot>
</table>
</div>
-
+
</div>
diff --git a/interface/web/sites/database_quota_stats.php b/interface/web/sites/database_quota_stats.php
index 4e960bce27e9323267ea673948929864efd1faf8..03431a6dedfb9dd7a298466dc5be7bf95b0c63ae 100644
--- a/interface/web/sites/database_quota_stats.php
+++ b/interface/web/sites/database_quota_stats.php
@@ -37,7 +37,7 @@ if(is_array($tmp_rec)) {
} else {
$temp['username'] = 'admin';
}
-
+
if(is_array($temp) && !empty($temp)) {
$monitor_data[$server_id.'.'.$db_name]['database_name'] = $data['database_name'];
$monitor_data[$server_id.'.'.$db_name]['client'] = isset($temp['username']) ? $temp['username'] : '';
@@ -61,7 +61,7 @@ class list_action extends listform_actions {
$rec['bgcolor'] = $this->DataRowColor;
$database_name = $rec['database_name'];
-
+
if(!empty($monitor_data[$rec['server_id'].'.'.$database_name])){
$rec['database'] = $monitor_data[$rec['server_id'].'.'.$database_name]['database_name'];
$rec['client'] = $monitor_data[$rec['server_id'].'.'.$database_name]['client'];
@@ -71,7 +71,7 @@ class list_action extends listform_actions {
$rec['used'] = $monitor_data[$rec['server_id'].'.'.$database_name]['used'];
$rec['quota'] = $monitor_data[$rec['server_id'].'.'.$database_name]['quota'];
- if($rec['quota'] == 0){
+ if($rec['quota'] <= 0){
$rec['quota'] = $app->lng('unlimited_txt');
$rec['percentage'] = '';
} else {
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 15aa44e148d0859e243f46c35327624cd93f3447..0cdd2f89b342158ee6e496aa4e9351275314efc2 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -8,7 +8,7 @@
<meta name='viewport' content='width=device-width, user-scalable=yes'>
<meta name='description' lang='en' content='' />
<meta name='keywords' lang='en' content='' />
- <meta name='robots' content='index, follow' />
+ <meta name='robots' content='noindex, nofollow' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
@@ -123,15 +123,15 @@
<script>
<!--
//$('.ttip').tipsy({live: true, gravity: 'ne', html: true});
-
+
ISPConfig.tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">';
ISPConfig.tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled">';
ISPConfig.tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
ISPConfig.tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
-
+
<tmpl_if name="use_loadindicator" value="y">ISPConfig.setOption('useLoadIndicator', true);</tmpl_if>
<tmpl_if name="use_combobox" value="y">ISPConfig.setOption('useComboBox', true);</tmpl_if>
-
+
$(document).ready(function() {
$('#globalsearch').ispconfigSearch({
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',