Merge branch 'master' into 'master'

Master

Author: Marius Cramer

install/lib/installer_base.lib.php

@@ -2143,7 +2143,7 @@ public function install_crontab() {
 
 		$root_cron_jobs = array(
 			"* * * * * ".$install_dir."/server/server.sh 2>&1 > /dev/null | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done",
-			"30 00 * * * ".$install_dir."/server/cron_daily.sh 2>&1 > /dev/null | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done"
+			"30 00 * * * ".$install_dir."/server/cron.sh 2>&1 > /dev/null | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done"
 		);
 
 		if ($conf['nginx']['installed'] == true) {

interface/web/dns/form/dns_dkim.tform.php

@@ -86,7 +86,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[\w\.\-]{0,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

server/cron.sh

@@ -9,4 +9,5 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
         fi
 fi
 
+cd /usr/local/ispconfig/server
 /usr/bin/php -q /usr/local/ispconfig/server/cron.php

server/lib/classes/cron.d/500-backup.inc.php

@@ -84,7 +84,8 @@ public function onRunJob() {
 			}
 
 			if($run_backups){
-				$sql = "SELECT * FROM web_domain WHERE server_id = ".$conf['server_id']." AND (type = 'vhost' OR type = 'vhostsubdomain')";
+				//* backup only active domains
+				$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'";
 				$records = $app->db->queryAllRecords($sql);
 				if(is_array($records)) {
 					foreach($records as $rec) {