Resolved merge conflict

Author: ms217

.gitignore

@@ -50,4 +50,7 @@ Temporary Items
 
 # Visual Studio code coverage results
 *.coverage
-*.coveragexml
+*.coveragexml
+
+# Visual Studio IDE cache/options directory
+.vs/

CONTRIBUTING.md

@@ -0,0 +1,6 @@
+ALTER TABLE `spamfilter_policy` 
+CHANGE `warnvirusrecip` `warnvirusrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N', 
+CHANGE `warnbannedrecip` `warnbannedrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N', 
+CHANGE `warnbadhrecip` `warnbadhrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N';
+ALTER TABLE `sys_ini` CHANGE `default_logo` `default_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;
+ALTER TABLE `sys_ini` CHANGE `custom_logo` `custom_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;

install/sql/incremental/upd_0099.sql

@@ -1533,9 +1533,9 @@ CREATE TABLE `spamfilter_policy` (
   `addr_extension_spam` varchar(64) default NULL,
   `addr_extension_banned` varchar(64) default NULL,
   `addr_extension_bad_header` varchar(64) default NULL,
-  `warnvirusrecip` enum('N','Y') default 'N',
-  `warnbannedrecip` enum('N','Y') default 'N',
-  `warnbadhrecip` enum('N','Y') default 'N',
+  `warnvirusrecip` VARCHAR(1) NULL default 'N',
+  `warnbannedrecip` VARCHAR(1) NULL default 'N',
+  `warnbadhrecip` VARCHAR(1) NULL default 'N',
   `newvirus_admin` varchar(64) default NULL,
   `virus_admin` varchar(64) default NULL,
   `banned_admin` varchar(64) default NULL,
@@ -1742,8 +1742,8 @@ CREATE TABLE `sys_group` (
 CREATE TABLE `sys_ini` (
   `sysini_id` int(11) unsigned NOT NULL auto_increment,
   `config` longtext,
-  `default_logo` text NOT NULL,
-  `custom_logo` text NOT NULL,
+  `default_logo` text NULL,
+  `custom_logo` text NULL,
   PRIMARY KEY  (`sysini_id`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 

install/sql/ispconfig3.sql

@@ -75,3 +75,4 @@ session_timeout=0
 session_allow_endless=0
 min_password_length=8
 min_password_strength=3
+show_delete_on_forms=n

install/tpl/system.ini.master

@@ -268,7 +268,7 @@ function create(array $data)
                 "expire" => $expire,
                 "minimum" => $minimum,
                 "ttl" => $ttl,
-                "active" => 'Y',
+                "active" => 'N', // Activated later when all DNS records are added.
                 "xfer" => $xfer,
                 "also_notify" => $also_notify,
                 "update_acl" => $update_acl,
@@ -301,6 +301,9 @@ function create(array $data)
                 }
             }
 
+            // Activate the DNS zone.
+            $app->db->datalogUpdate('dns_soa', array('active' => 'Y'), 'id', $dns_soa_id);
+
             return 'ok';
 
         } else {

interface/lib/classes/dns_wizard.inc.php

@@ -823,7 +823,7 @@ public function send($recipients) {
 				$recipname = trim(str_replace('"', '', $recipname));
 
 				if($rec_string != '') $rec_string .= ', ';
-				if($recipname && !is_numeric($recipname)) $rec_string .= $recipname . '<' . $recip . '>';
+				if($recipname && !is_numeric($recipname)) $rec_string .= '"' . $recipname . '"<' . $recip . '>';
 				else $rec_string .= $recip;
 			}
 			$to = $this->_encodeHeader($rec_string, $this->mail_charset);

interface/lib/classes/ispcmail.inc.php

@@ -478,7 +478,7 @@ function getHTML($record, $tab, $action = 'NEW') {
 					if(isset($record[$key])) {
 						$val = $record[$key];
 					} else {
-						$val = '';
+						$val = $field['default'];
 					}
 
 					// If Datasource is set, get the data from there
@@ -621,11 +621,7 @@ function getHTML($record, $tab, $action = 'NEW') {
 						break;
 
 					default:
-						if(isset($record[$key])) {
-							$new_record[$key] = $app->functions->htmlentities($record[$key]);
-						} else {
-							$new_record[$key] = '';
-						}
+						$new_record[$key] = $app->functions->htmlentities($val);
 					}
 				}
 			}

interface/lib/classes/tform_base.inc.php

@@ -292,7 +292,7 @@ function validate_ip($field_name, $field_value, $validator) {
 		if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 		if($validator['allowempty'] == 'y' && $field_value == '') {
 			//* Do nothing
-		} elseif ($field_value == 'any') {
+		} elseif ($field_value == 'any' && $field_name != "also_notify") {
 			//* Do nothing
 		} else {
 			//* Check if its a IPv4 or IPv6 address/range

interface/lib/classes/validate_dns.inc.php

@@ -180,4 +180,8 @@ $wb['datalog_status_d_client'] = 'Delete client';
 $wb['datalog_status_i_domain'] = 'Create new domain';
 $wb['datalog_status_u_domain'] = 'Update domain';
 $wb['datalog_status_d_domain'] = 'Delete domain';
+$wb['datalog_status_d_web_backup'] = 'Delete website backup';
+$wb['datalog_status_i_dns_template'] = 'Create DNS template';
+$wb['datalog_status_u_dns_template'] = 'Update DNS template';
+$wb['datalog_status_d_dns_template'] = 'Delete DNS template';
 ?>