Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: Marius Burkard

install/lib/installer_base.lib.php

@@ -526,7 +526,7 @@ public function grant_master_database_rights($verbose = false) {
 			$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'];

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 @@ private function _sort($aOne, $aTwo) {
 			}
 			$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 @@ public function onLoad()
 
 		// 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'];

interface/web/mail/list/user_quota_stats.list.php

@@ -41,7 +41,7 @@
 $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

interface/web/mail/mail_user_edit.php

@@ -70,6 +70,9 @@ function onShowNew() {
 	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]);

interface/web/mail/templates/user_quota_stats_list.htm

@@ -17,7 +17,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     </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>&nbsp;</td>
                         <td>&nbsp;</td>
                         <td>&nbsp;</td>
@@ -50,5 +50,5 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 </tfoot>
             </table>
 </div>
-        
+
     </div>

interface/web/sites/database_quota_stats.php

@@ -37,7 +37,7 @@
 			} 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 @@ function prepareDataRow($rec) {
 		$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 @@ function prepareDataRow($rec) {
 			$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 {

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 @@ <h4 class="modal-title">{tmpl_var name="datalog_changes_txt"}</h4>
   <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',