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

Author: Till Brehm

LICENSE

@@ -0,0 +1,25 @@
+Copyright (c) 2007-2016, Till Brehm, ISPConfig UG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -0,0 +1,10 @@
+# ISPConfig - Hosting Control Panel
+
+- Manage multiple servers from one control panel
+- Web server management (Apache2 and nginx)
+- Mail server management (with virtual mail users)
+- DNS server management (BIND and MyDNS)
+- Virtualization (OpenVZ)
+- Administrator, reseller and client login
+- Configuration mirroring and clusters
+- Open Source software (BSD license)

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/lib/classes/remote.d/client.inc.php

@@ -406,7 +406,7 @@ public function client_delete_everything($session_id, $client_id)
 			$app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id);
 
 			//* Delete all records (sub-clients, mail, web, etc....)  of this client.
-			$tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic';
+			$tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic,domain';
 			$tables_array = explode(',', $tables);
 			$client_group_id = $app->functions->intval($client_group['groupid']);
 

interface/web/client/client_del.php

@@ -77,7 +77,7 @@ function onDelete() {
 			$client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ?", $client_id);
 
 			// Get all records (sub-clients, mail, web, etc....)  of this client.
-			$tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain';
+			$tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic,domain';
 			$tables_array = explode(',', $tables);
 			$client_group_id = $app->functions->intval($client_group['groupid']);
 

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/sites/form/web_vhost_domain.tform.php

@@ -447,7 +447,7 @@
 				'datatype' => 'VARCHAR',
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'REGEX',
-						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{1,255}))$/',
+						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{0,255}))$/',
 						'errmsg'=> 'ssl_state_error_regex'),
 				),
 				'default' => '',
@@ -459,7 +459,7 @@
 				'datatype' => 'VARCHAR',
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'REGEX',
-						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{1,255}))$/',
+						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{0,255}))$/',
 						'errmsg'=> 'ssl_locality_error_regex'),
 				),
 				'default' => '',
@@ -471,7 +471,7 @@
 				'datatype' => 'VARCHAR',
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'REGEX',
-						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{1,255}))$/',
+						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{0,255}))$/',
 						'errmsg'=> 'ssl_organisation_error_regex'),
 				),
 				'default' => '',
@@ -483,7 +483,7 @@
 				'datatype' => 'VARCHAR',
 				'formtype' => 'TEXT',
 				'validators' => array (  0 => array ( 'type' => 'REGEX',
-						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{1,255}))$/',
+						'regex' => '/^(([\.]{0})|([-a-zA-Z0-9._,&äöüÄÖÜ ]{0,255}))$/',
 						'errmsg'=> 'ssl_organistaion_unit_error_regex'),
 				),
 				'default' => '',

interface/web/sites/web_vhost_domain_edit.php

@@ -1415,10 +1415,6 @@ function onBeforeUpdate () {
 
 		//* Check that all fields for the SSL cert creation are filled
 		if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'create') {
-			if($this->dataRecord['ssl_state'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_state_empty').'<br />';
-			if($this->dataRecord['ssl_locality'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_locality_empty').'<br />';
-			if($this->dataRecord['ssl_organisation'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_empty').'<br />';
-			if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
 			if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
 		}
 

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;
+	};
 });