From 441afe553839d3522f9eb6a94279d63f75744b16 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Feb 2014 04:02:07 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/lib/installer_base.lib.php | 2 +-
server/cron.sh | 1 +
server/lib/classes/cron.d/500-backup.inc.php | 3 ++-
interface/web/dns/form/dns_dkim.tform.php | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 065df30..83895d9 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2143,7 +2143,7 @@
$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) {
diff --git a/interface/web/dns/form/dns_dkim.tform.php b/interface/web/dns/form/dns_dkim.tform.php
index 89ee8a0..2da9b42 100644
--- a/interface/web/dns/form/dns_dkim.tform.php
+++ b/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' => '',
diff --git a/server/cron.sh b/server/cron.sh
index 281bb13..4aff859 100644
--- a/server/cron.sh
+++ b/server/cron.sh
@@ -9,4 +9,5 @@
fi
fi
+cd /usr/local/ispconfig/server
/usr/bin/php -q /usr/local/ispconfig/server/cron.php
diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php
index 2e7e030..f932744 100644
--- a/server/lib/classes/cron.d/500-backup.inc.php
+++ b/server/lib/classes/cron.d/500-backup.inc.php
@@ -84,7 +84,8 @@
}
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) {
--
Gitblit v1.9.1