Merge remote-tracking branch 'origin/develop' into 5374-mail-last-accessed-frontend

Author: helmo

.gitignore

@@ -1,7 +1,11 @@
 .idea
 /nbproject/private/
 .phplint-cache
+
+# Vim and patch specific excludes
 *.swp
+*.orig
+*.rej
 
 # macOS-specific things to exclude
 
@@ -50,4 +54,7 @@ Temporary Items
 
 # Visual Studio code coverage results
 *.coverage
-*.coveragexml
+*.coveragexml
+
+# Visual Studio IDE cache/options directory
+.vs/

CONTRIBUTING.md

@@ -3,6 +3,8 @@ ISPConfig is a open source project and community contributions are very welcome.
 
 This document is under development and will be continuously improved.
 
+Please do not refactor existing code and do not change the signature or the behaviour of central functions or libraries. Such changes may only be made by the core development team. We have had many bad experiences with such changes affecting the stability of ISPConfig, so we no longer accept submissions containing such changes. Merge requests containing such changes will be closed and not merged.
+
 # Issues
 * Before opening a new issue, use the search function to check if there isn't a bug report / feature request already.
 * If you are reporting a bug, please share your OS and PHP (CLI) version.

install/sql/incremental/upd_0099.sql

@@ -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/ispconfig3.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/tpl/system.ini.master

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

interface/lib/classes/dns_wizard.inc.php

@@ -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/ispcmail.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/tform_base.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/tpl.inc.php

@@ -233,7 +233,7 @@ public function newTemplate($tmplfile)
 		public function setVar($k, $v = null, $encode = false)
 		{
 			global $app;
-			
+
 			if (is_array($k)) {
 				foreach($k as $key => $value){
 					$key = ($this->OPTIONS['CASELESS']) ? strtolower(trim($key)) : trim($key);
@@ -917,9 +917,17 @@ private function _fileSearch($file)
 			$filename = basename($file);
 			$filepath = dirname($file);
 
-			if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['theme'])) {
-				if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename)) {
-					return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename;
+			$modulename = false;
+
+			if(isset($_SESSION['s']['module']['name'])) {
+				$modulename = $_SESSION['s']['module']['name'];
+			} elseif(strpos($_SERVER['PHP_SELF'], '/login/') === 0) {
+				$modulename = 'login';
+			}
+
+			if($modulename && isset($_SESSION['s']['theme'])) {
+				if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename)) {
+					return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$modulename.'/'.$filename;
 				}
 			}
 
@@ -1079,12 +1087,12 @@ private function _parseIf($varname, $value = null, $op = null, $namespace = null
 		private function _parseHook ($name)
 		{
 			global $app;
-			
+
 			if(!$name) return false;
-			
+
 			$module = isset($_SESSION['s']['module']['name']) ? $_SESSION['s']['module']['name'] : '';
 			$form = isset($app->tform->formDef['name']) ? $app->tform->formDef['name'] : '';
-			
+
 			$events = array();
 			if($module) {
 				$events[] = $module . ':' . ($form ? $form : '') . ':' . $name;
@@ -1093,9 +1101,9 @@ private function _parseHook ($name)
 				$events[] = $name;
 				$events[] = 'on_template_content';
 			}
-			
+
 			$events = array_unique($events);
-			
+
 			for($e = 0; $e < count($events); $e++) {
 				$tmpresult = $app->plugin->raiseEvent($events[$e], array(
 					'name' => $name,
@@ -1104,10 +1112,10 @@ private function _parseHook ($name)
 				), true);
 				if(!$tmpresult) $tmpresult = '';
 				else $tmpresult = $this->_getData($tmpresult, false, true);
-				
+
 				$result .= $tmpresult;
 			}
-			
+
 			return $result;
 		}
 
@@ -1225,7 +1233,7 @@ private function _parseTag ($args)
 			$wholetag = $args[0];
 			$openclose = $args[1];
 			$tag = strtolower($args[2]);
-			
+
 			if ($tag == 'else') return '<?php } else { ?>';
 			if ($tag == 'tmpl_include') return $wholetag; // ignore tmpl_include tags
 
@@ -1303,10 +1311,10 @@ private function _parseTag ($args)
 				if ($this->OPTIONS['ENABLE_PHPINCLUDE']) {
 					return '<?php include(\''.$file.'\'); ?>';
 				}
-			
+
 			case 'hook':
 				return $this->_parseHook(@$var);
-			
+
 			case 'include':
 				return '<?php $this->_getData($this->_fileSearch(\''.$file.'\'), 1); ?>';
 

interface/lib/lang/ar.lng

@@ -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';
 ?>