diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index e35447f3c84b4a59efc016778be0ce148b87d84e..b53717a61c368890c2bcbb15d72a60883edc2b02 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -400,6 +400,20 @@ $form["tabs"]['limits'] = array (
'rows' => '',
'cols' => ''
),
+ 'limit_mailaliasdomain' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_mailaliasdomain_error_notint'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'limit_mailforward' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index 3707ef8929cc53c0e4db6ec30cdb82c5d0ac60ce..44de4f9795122f85f2f203efb637b70d025893b5 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -3,6 +3,7 @@ $wb["limit_maildomain_txt"] = 'Max. number of email domains';
$wb["limit_mailmailinglist_txt"] = 'Max. number of mailing lists';
$wb["limit_mailbox_txt"] = 'Max. number of mailboxes';
$wb["limit_mailalias_txt"] = 'Max. number of email aliases';
+$wb["limit_mailaliasdomain_txt"] = 'Max. number of domain aliases';
$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
@@ -11,7 +12,7 @@ $wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
$wb["limit_mailquota_txt"] = 'Mailbox quota';
$wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters';
$wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
-$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys';
+$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies';
$wb["default_mailserver_txt"] = 'Default Mailserver';
$wb["company_name_txt"] = 'Company name';
$wb["contact_name_txt"] = 'Contact name';
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index 7ac35191725c07fa94fca3eafc144f9b66a78bf9..394985129dc2c60c90f5014bc4fbd3003f69cead 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -45,7 +45,11 @@
<div class="ctrlHolder">
<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
<input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+ <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+ </div>
<div class="ctrlHolder">
<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
<input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
diff --git a/interface/web/dns/form/dns_mx.tform.php b/interface/web/dns/form/dns_mx.tform.php
index d36f6f7fbd803d17a05d1d63f7d26b4e82d7485a..9afc26c8fa9da0937e1c5559205b681b08f5d49f 100644
--- a/interface/web/dns/form/dns_mx.tform.php
+++ b/interface/web/dns/form/dns_mx.tform.php
@@ -78,7 +78,7 @@ $form["tabs"]['dns'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-]{0,255}$/',
+ 'regex' => '/^[\w\.\-\*]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
diff --git a/server/cron_daily.php b/server/cron_daily.php
index b7362153fe960bdba1b84568c64731ddc4971c6f..8ea43956e6ebf53552d9a3294a90079061033c99 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -116,7 +116,8 @@ $sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
- $yesterday = date('Ymd',time() - 86400);
+ //$yesterday = date('Ymd',time() - 86400);
+ $yesterday = date('Ymd',strtotime("-1 day", time()));
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
@@ -156,7 +157,8 @@ $records = $app->db->queryAllRecords($sql);
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
foreach($records as $rec) {
- $yesterday = date('Ymd',time() - 86400);
+ //$yesterday = date('Ymd',time() - 86400);
+ $yesterday = date('Ymd',strtotime("-1 day", time()));
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index f24fadde5ee12db3faa5590ef58868e7c3307b42..ebdd404cd74d2d8771ad8b273485818338fa4115 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -134,16 +134,19 @@ class remoteaction_core_module {
/*
* Do the update
*/
- //TODO : change this when distribution information has been integrated into server record
- if(file_exists('/etc/gentoo-release')) {
- exec("glsa-check -f --nocolor affected");
- }
- else {
- exec("aptitude update");
- exec("aptitude upgrade -y");
- }
-
- /*
+ exec("aptitude update");
+ exec("aptitude upgrade -y");
+
+ //TODO : change this when distribution information has been integrated into server record
+ if(file_exists('/etc/gentoo-release')) {
+ exec("glsa-check -f --nocolor affected");
+ }
+ else {
+ exec("aptitude update");
+ exec("aptitude safe-upgrade -y");
+ }
+
+ /*
* All well done!
*/
$this->_actionDone($action['action_id'], 'ok');