Skip to content

Commit 13b41c9

Browse files
committed
Merged revisions 2301-2305 from stable branch.
1 parent ce9867c commit 13b41c9

File tree

6 files changed

+39
-15
lines changed

6 files changed

+39
-15
lines changed

interface/web/client/form/reseller.tform.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,20 @@
400400
'rows' => '',
401401
'cols' => ''
402402
),
403+
'limit_mailaliasdomain' => array (
404+
'datatype' => 'INTEGER',
405+
'formtype' => 'TEXT',
406+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
407+
'errmsg'=> 'limit_mailaliasdomain_error_notint'),
408+
),
409+
'default' => '-1',
410+
'value' => '',
411+
'separator' => '',
412+
'width' => '10',
413+
'maxlength' => '10',
414+
'rows' => '',
415+
'cols' => ''
416+
),
403417
'limit_mailforward' => array (
404418
'datatype' => 'INTEGER',
405419
'formtype' => 'TEXT',

interface/web/client/lib/lang/en_reseller.lng

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $wb["limit_maildomain_txt"] = 'Max. number of email domains';
33
$wb["limit_mailmailinglist_txt"] = 'Max. number of mailing lists';
44
$wb["limit_mailbox_txt"] = 'Max. number of mailboxes';
55
$wb["limit_mailalias_txt"] = 'Max. number of email aliases';
6+
$wb["limit_mailaliasdomain_txt"] = 'Max. number of domain aliases';
67
$wb["limit_mailforward_txt"] = 'Max. number of email forwarders';
78
$wb["limit_mailcatchall_txt"] = 'Max. number of email catchall accounts';
89
$wb["limit_mailrouting_txt"] = 'Max. number of email routes';
@@ -11,7 +12,7 @@ $wb["limit_fetchmail_txt"] = 'Max. number of fetchmail accounts';
1112
$wb["limit_mailquota_txt"] = 'Mailbox quota';
1213
$wb["limit_spamfilter_wblist_txt"] = 'Max. number of spamfilter white / blacklist filters';
1314
$wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
14-
$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policys';
15+
$wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies';
1516
$wb["default_mailserver_txt"] = 'Default Mailserver';
1617
$wb["company_name_txt"] = 'Company name';
1718
$wb["contact_name_txt"] = 'Contact name';

interface/web/client/templates/reseller_edit_limits.htm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ <h2><tmpl_var name="list_head_txt"></h2>
4545
<div class="ctrlHolder">
4646
<label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
4747
<input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
48-
</div>
48+
</div>
49+
<div class="ctrlHolder">
50+
<label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
51+
<input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
52+
</div>
4953
<div class="ctrlHolder">
5054
<label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
5155
<input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
'datatype' => 'VARCHAR',
7979
'formtype' => 'TEXT',
8080
'validators' => array ( 0 => array ( 'type' => 'REGEX',
81-
'regex' => '/^[\w\.\-]{0,255}$/',
81+
'regex' => '/^[\w\.\-\*]{0,255}$/',
8282
'errmsg'=> 'name_error_regex'),
8383
),
8484
'default' => '',

server/cron_daily.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ function setConfigVar( $filename, $varName, $varValue ) {
116116
$records = $app->db->queryAllRecords($sql);
117117

118118
foreach($records as $rec) {
119-
$yesterday = date('Ymd',time() - 86400);
119+
//$yesterday = date('Ymd',time() - 86400);
120+
$yesterday = date('Ymd',strtotime("-1 day", time()));
120121
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
121122
if(!@is_file($logfile)) {
122123
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
@@ -156,7 +157,8 @@ function setConfigVar( $filename, $varName, $varValue ) {
156157
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
157158

158159
foreach($records as $rec) {
159-
$yesterday = date('Ymd',time() - 86400);
160+
//$yesterday = date('Ymd',time() - 86400);
161+
$yesterday = date('Ymd',strtotime("-1 day", time()));
160162
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
161163
if(!@is_file($logfile)) {
162164
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');

server/mods-available/remoteaction_core_module.inc.php

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,19 @@ private function _doOsUpdate($action) {
134134
/*
135135
* Do the update
136136
*/
137-
//TODO : change this when distribution information has been integrated into server record
138-
if(file_exists('/etc/gentoo-release')) {
139-
exec("glsa-check -f --nocolor affected");
140-
}
141-
else {
142-
exec("aptitude update");
143-
exec("aptitude upgrade -y");
144-
}
145-
146-
/*
137+
exec("aptitude update");
138+
exec("aptitude upgrade -y");
139+
140+
//TODO : change this when distribution information has been integrated into server record
141+
if(file_exists('/etc/gentoo-release')) {
142+
exec("glsa-check -f --nocolor affected");
143+
}
144+
else {
145+
exec("aptitude update");
146+
exec("aptitude safe-upgrade -y");
147+
}
148+
149+
/*
147150
* All well done!
148151
*/
149152
$this->_actionDone($action['action_id'], 'ok');

0 commit comments

Comments
 (0)