Merge branch 'develop' into 'develop'

Develop

Closes #5916

See merge request ispconfig/ispconfig3!1284

Author: Marius Burkard

server/lib/classes/cron.d/100-monitor_letsencrypt_log.inc.php

@@ -65,7 +65,7 @@ public function onRunJob() {
 		$type = 'log_letsencrypt';
 
 		/* Get the data of the log */
-		$data = $this->_tools->_getLogData($type);
+		$data = $this->_tools->_getLogData($type, 500);
 
 		/*
 		 * actually this info has no state.

server/lib/classes/cron.d/100-monitor_mail_log.inc.php

@@ -67,7 +67,7 @@ public function onRunJob() {
 		$type = 'log_mail';
 
 		/* Get the data of the log */
-		$data = $this->_tools->_getLogData($type);
+		$data = $this->_tools->_getLogData($type, 500);
 
 		/*
 		 * actually this info has no state.

server/lib/classes/monitor_tools.inc.php

@@ -488,7 +488,7 @@ public function monitorServices() {
 		return $res;
 	}
 
-	public function _getLogData($log) {
+	public function _getLogData($log, $max_lines = 100) {
 		global $conf;
 
 		$dist = '';
@@ -645,7 +645,7 @@ public function _getLogData($log) {
 			} else {
 				$log = '';
 				if (is_readable($logfile)) {
-					$fd = popen('tail -n 100 ' . escapeshellarg($logfile), 'r');
+					$fd = popen('tail -n '.intval($max_lines).' ' . escapeshellarg($logfile), 'r');
 					if ($fd) {
 						while (!feof($fd)) {
 							$log .= fgets($fd, 4096);

server/plugins-available/bind_plugin.inc.php

@@ -286,6 +286,7 @@ function soa_update($event_name, $data) {
 
 			$records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ? AND active = 'Y'", $zone['id']);
 			if(is_array($records) && !empty($records)){
+				$caa_add_rec = -1;
 				for($i=0;$i<sizeof($records);$i++){
 					if($records[$i]['ttl'] == 0) $records[$i]['ttl'] = '';
 					if($records[$i]['name'] == '') $records[$i]['name'] = '@';
@@ -301,7 +302,21 @@ function soa_update($event_name, $data) {
 						$records[$i]['data'] = implode(' ', $temp);
 						$data_new = str_replace(array('"', ' '), '', $records[$i]['data']);
 						$hex = unpack('H*', $data_new);
-						$hex[1] = '0005'.strtoupper($hex[1]);
+						if ($temp[1] == 'issuewild') {
+							$hex[1] = '0009'.strtoupper($hex[1]);
+							if ($caa_add_rec == -1) {
+								// add issue ";" if only issuewild recordsa
+								$caa_add_rec = array_push($records, $records[$i]);
+								$records[$caa_add_rec-1]['data'] = "\# 8 000569737375653B";
+							}
+						} else {
+							$hex[1] = '0005'.strtoupper($hex[1]);
+							if ($caa_add_rec > 0) {
+								// remove previously added issue ";" 
+								array_pop($records);
+							}
+							$caa_add_rec = -2;
+						}
 						$length = strlen($hex[1])/2;
 						$data_new = "\# $length $hex[1]";
 						$records[$i]['data'] = $data_new;