Commit ccccf1d7 authored by Marius Cramer's avatar Marius Cramer
Browse files

- ported some patches

parent d19abd5c
......@@ -8,6 +8,9 @@
[mail]
enable_custom_login=n
mailbox_show_autoresponder_tab=y
mailbox_show_mail_filter_tab=y
mailbox_show_custom_rules_tab=y
mailboxlist_webmail_link=y
webmail_url=/webmail
dkim_path=/var/lib/amavis/dkim
......
......@@ -174,6 +174,58 @@ class plugin_listview extends plugin_base {
$_SESSION["s"]["form"]["return_to"] = $list_name;
//die(print_r($_SESSION["s"]["list"][$list_name]));
// defaults
$listTpl->setVar('app_title', $app->_conf['app_title']);
if(isset($_SESSION['s']['user'])) {
$listTpl->setVar('app_version', $app->_conf['app_version']);
// get pending datalog changes
$datalog = $app->db->datalogStatus();
$listTpl->setVar('datalog_changes_txt', $app->lng('datalog_changes_txt'));
$listTpl->setVar('datalog_changes_end_txt', $app->lng('datalog_changes_end_txt'));
$listTpl->setVar('datalog_changes_count', $datalog['count']);
$listTpl->setLoop('datalog_changes', $datalog['entries']);
} else {
$listTpl->setVar('app_version', '');
}
$listTpl->setVar('app_link', $app->_conf['app_link']);
$listTpl->setVar('app_logo', $app->_conf['logo']);
$listTpl->setVar('phpsessid', session_id());
$listTpl->setVar('theme', $_SESSION['s']['theme']);
$listTpl->setVar('html_content_encoding', $app->_conf['html_content_encoding']);
$listTpl->setVar('delete_confirmation', $app->lng('delete_confirmation'));
//print_r($_SESSION);
if(isset($_SESSION['s']['module']['name'])) {
$listTpl->setVar('app_module', $_SESSION['s']['module']['name']);
}
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
$listTpl->setVar('is_admin', 1);
}
if(isset($_SESSION['s']['user']) && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$listTpl->setVar('is_reseller', 1);
}
/* Show username */
if(isset($_SESSION['s']['user'])) {
$listTpl->setVar('cpuser', $_SESSION['s']['user']['username']);
$listTpl->setVar('logout_txt', $app->lng('logout_txt'));
/* Show search field only for normal users, not mail users */
if(stristr($_SESSION['s']['user']['username'], '@')){
$listTpl->setVar('usertype', 'mailuser');
} else {
$listTpl->setVar('usertype', 'normaluser');
}
}
/* Global Search */
$listTpl->setVar('globalsearch_resultslimit_of_txt', $app->lng('globalsearch_resultslimit_of_txt'));
$listTpl->setVar('globalsearch_resultslimit_results_txt', $app->lng('globalsearch_resultslimit_results_txt'));
$listTpl->setVar('globalsearch_noresults_text_txt', $app->lng('globalsearch_noresults_text_txt'));
$listTpl->setVar('globalsearch_noresults_limit_txt', $app->lng('globalsearch_noresults_limit_txt'));
$listTpl->setVar('globalsearch_searchfield_watermark_txt', $app->lng('globalsearch_searchfield_watermark_txt'));
return $listTpl->grab();
}
......
......@@ -161,6 +161,8 @@ class validate_client {
// Test if the country of the VAT-ID matches the country of the customer
if($country != ''){
// Greece
if($country == 'GR') $country = 'EL';
if(strtoupper($cc) != $country){
$errmsg = $validator['errmsg'];
if(isset($app->tform->wordbook[$errmsg])) {
......
......@@ -14,16 +14,16 @@
</div>
<div class="form-group">
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder"
onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div></div>
<div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div>
</div>
<div class="form-group">
<label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
{tmpl_var name='autoresponder_start_date'}&nbsp;
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
<div class="col-sm-9">{tmpl_var name='autoresponder_start_date'}&nbsp;
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a></div>
</div>
<div class="form-group">
<label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
{tmpl_var name='autoresponder_end_date'}
<div class="col-sm-9">{tmpl_var name='autoresponder_end_date'}</div>
</div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
......
......@@ -7,21 +7,22 @@
<div class="form-group">
<label for="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div></div>
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div>
</div>
<div class="form-group">
<label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
<div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
<div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div><br><br>
<div><label></label><div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
<div class="col-sm-9" style="margin-bottom:10px"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
<div class="col-sm-3"></div><div class="col-sm-9" style="margin-bottom:10px"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
<div class="col-sm-3"></div><div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div>
</div>
<div class="form-group">
<label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
<div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div><br><br>
<div><label></label><div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
<div class="col-sm-9" style="margin-bottom:10px"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
<div class="col-sm-3"></div><div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div>
</div>
<div class="form-group">
<label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<span class="">{tmpl_var name='active'}</span>
<div class="col-sm-9"><span class="">{tmpl_var name='active'}</span></div>
</div>
......
......@@ -54,7 +54,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="3"><tmpl_var name="paging"></td>
<td colspan="2"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment