Merged revisions 2301-2305 from stable branch.

Author: tbrehm

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

@@ -400,6 +400,20 @@
 			'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',

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';

interface/web/client/templates/reseller_edit_limits.htm

@@ -45,7 +45,11 @@ <h2><tmpl_var name="list_head_txt"></h2>
       <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" />

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

@@ -78,7 +78,7 @@
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[\w\.\-]{0,255}$/',
+														'regex' => '/^[\w\.\-\*]{0,255}$/',
 														'errmsg'=> 'name_error_regex'),
 									),
 			'default'	=> '',

server/cron_daily.php

@@ -116,7 +116,8 @@ function setConfigVar( $filename, $varName, $varValue ) {
 $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 @@ function setConfigVar( $filename, $varName, $varValue ) {
 $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');

server/mods-available/remoteaction_core_module.inc.php

@@ -134,16 +134,19 @@ private function _doOsUpdate($action) {
 		/*
 		 * 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');