Merge branch 'stable-3.1'

Author: Marius Burkard

install/update.php

@@ -545,7 +545,7 @@
 
 //* Create md5 filelist
 $md5_filename = '/usr/local/ispconfig/security/data/file_checksums_'.date('Y-m-d_h-i').'.md5';
-exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename);
+exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename . ' 2>/dev/null');
 chmod($md5_filename,0700);
 
 echo "Update finished.\n";

interface/web/js/scrigo.js.php

@@ -204,6 +204,12 @@ function generatePassword(passwordFieldID, repeatPasswordFieldID){
 	var pword = password(<?php echo $min_password_length; ?>, false, 1);
 	jQuery('#'+repeatPasswordFieldID).val(pword);
 	newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select();
+	newPWField.unbind('keyup').on('keyup', function(e) {
+		if($(this).val() != pword) {
+			var pos = $(this).getCursorPosition();
+			$(this).attr('type', 'password').unbind('keyup').setCursorPosition(pos);
+		}
+	});
 }
 
 var funcDisableClick = function(e) { e.preventDefault(); return false; };

interface/web/sites/database_user_del.php

@@ -55,7 +55,7 @@ function onBeforeDelete() {
 		$old_record = $app->tform->getDataRecord($this->id);
 
 		/* we cannot use datalogDelete here, as we need to set server_id to 0 */
-		$app->db->query("DELETE FROM `web_database_user` WHERE ?? = ?", $index_field, $index_value);
+		$app->db->query("DELETE FROM `web_database_user` WHERE `database_user_id` = ?", $this->id);
 		$new_rec = array();
 		$old_record['server_id'] = 0;
 		$app->db->datalogSave('web_database_user', 'DELETE', 'database_user_id', $this->id, $old_record, $new_rec);

interface/web/themes/default/assets/javascripts/ispconfig.js

@@ -747,4 +747,35 @@ $(document).on('ready', function () {
 			e.preventDefault();
 		}
 	});
+	
+	$.fn.setCursorPosition = function(pos) {
+		var self = $(this).get(0);
+		if(self.setSelectionRange) {
+			self.setSelectionRange(pos, pos);
+		} else if(self.createTextRange) {
+			var range = self.createTextRange();
+			range.collapse(true);
+			if(pos < 0) {
+				pos = $(this).val().length + pos;
+			}
+			range.moveEnd('character', pos);
+			range.moveStart('character', pos);
+			range.select();
+		}
+	};
+	
+	$.fn.getCursorPosition = function() {
+		var iCaretPos = 0;
+		var self = $(this).get(0);
+		
+		if(typeof self.selectionStart === 'number') {
+			iCaretPos = self.selectionDirection == 'backward' ? self.selectionStart : self.selectionEnd;
+		} else if(document.selection) {
+			this.focus();
+			var oSel = document.selection.createRange();
+			oSel.moveStart('character', -self.value.length);
+			iCaretPos = oSel.text.length;
+		}
+		return iCaretPos;
+	};
 });

interface/web/themes/default/assets/javascripts/ispconfig.min.js

@@ -711,7 +711,10 @@ public function send_notification_email($template, $placeholders, $recipients) {
 			}
 			if($inHeader == true) {
 				$parts = explode(':', $lines[$l], 2);
-				if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
+				if(strtolower($parts[0]) == 'subject') {
+					$mailSubject = trim($parts[1]);
+					continue;
+				}
 				unset($parts);
 				$mailHeaders .= trim($lines[$l]) . "\n";
 			} else {