Skip to content

Commit ccccf1d

Browse files
author
Marius Cramer
committed
- ported some patches
1 parent d19abd5 commit ccccf1d

File tree

6 files changed

+71
-13
lines changed

6 files changed

+71
-13
lines changed

‎install/tpl/system.ini.master‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
[mail]
1010
enable_custom_login=n
11+
mailbox_show_autoresponder_tab=y
12+
mailbox_show_mail_filter_tab=y
13+
mailbox_show_custom_rules_tab=y
1114
mailboxlist_webmail_link=y
1215
webmail_url=/webmail
1316
dkim_path=/var/lib/amavis/dkim

‎interface/lib/classes/plugin_listview.inc.php‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,58 @@ function onShow() {
174174
$_SESSION["s"]["form"]["return_to"] = $list_name;
175175
//die(print_r($_SESSION["s"]["list"][$list_name]));
176176

177+
// defaults
178+
$listTpl->setVar('app_title', $app->_conf['app_title']);
179+
if(isset($_SESSION['s']['user'])) {
180+
$listTpl->setVar('app_version', $app->_conf['app_version']);
181+
// get pending datalog changes
182+
$datalog = $app->db->datalogStatus();
183+
$listTpl->setVar('datalog_changes_txt', $app->lng('datalog_changes_txt'));
184+
$listTpl->setVar('datalog_changes_end_txt', $app->lng('datalog_changes_end_txt'));
185+
$listTpl->setVar('datalog_changes_count', $datalog['count']);
186+
$listTpl->setLoop('datalog_changes', $datalog['entries']);
187+
} else {
188+
$listTpl->setVar('app_version', '');
189+
}
190+
$listTpl->setVar('app_link', $app->_conf['app_link']);
191+
192+
$listTpl->setVar('app_logo', $app->_conf['logo']);
193+
194+
$listTpl->setVar('phpsessid', session_id());
195+
196+
$listTpl->setVar('theme', $_SESSION['s']['theme']);
197+
$listTpl->setVar('html_content_encoding', $app->_conf['html_content_encoding']);
198+
199+
$listTpl->setVar('delete_confirmation', $app->lng('delete_confirmation'));
200+
//print_r($_SESSION);
201+
if(isset($_SESSION['s']['module']['name'])) {
202+
$listTpl->setVar('app_module', $_SESSION['s']['module']['name']);
203+
}
204+
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
205+
$listTpl->setVar('is_admin', 1);
206+
}
207+
if(isset($_SESSION['s']['user']) && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
208+
$listTpl->setVar('is_reseller', 1);
209+
}
210+
/* Show username */
211+
if(isset($_SESSION['s']['user'])) {
212+
$listTpl->setVar('cpuser', $_SESSION['s']['user']['username']);
213+
$listTpl->setVar('logout_txt', $app->lng('logout_txt'));
214+
/* Show search field only for normal users, not mail users */
215+
if(stristr($_SESSION['s']['user']['username'], '@')){
216+
$listTpl->setVar('usertype', 'mailuser');
217+
} else {
218+
$listTpl->setVar('usertype', 'normaluser');
219+
}
220+
}
221+
222+
/* Global Search */
223+
$listTpl->setVar('globalsearch_resultslimit_of_txt', $app->lng('globalsearch_resultslimit_of_txt'));
224+
$listTpl->setVar('globalsearch_resultslimit_results_txt', $app->lng('globalsearch_resultslimit_results_txt'));
225+
$listTpl->setVar('globalsearch_noresults_text_txt', $app->lng('globalsearch_noresults_text_txt'));
226+
$listTpl->setVar('globalsearch_noresults_limit_txt', $app->lng('globalsearch_noresults_limit_txt'));
227+
$listTpl->setVar('globalsearch_searchfield_watermark_txt', $app->lng('globalsearch_searchfield_watermark_txt'));
228+
177229
return $listTpl->grab();
178230

179231
}

‎interface/lib/classes/validate_client.inc.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ function check_vat_id ($field_name, $field_value, $validator){
161161

162162
// Test if the country of the VAT-ID matches the country of the customer
163163
if($country != ''){
164+
// Greece
165+
if($country == 'GR') $country = 'EL';
164166
if(strtoupper($cc) != $country){
165167
$errmsg = $validator['errmsg'];
166168
if(isset($app->tform->wordbook[$errmsg])) {

‎interface/web/mail/templates/mail_user_autoresponder_edit.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
1414
</div>
1515
<div class="form-group">
1616
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
17-
<div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder"
18-
onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div></div>
17+
<div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} /></div>
18+
</div>
1919
<div class="form-group">
2020
<label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
21-
{tmpl_var name='autoresponder_start_date'}&nbsp;
22-
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
21+
<div class="col-sm-9">{tmpl_var name='autoresponder_start_date'}&nbsp;
22+
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a></div>
2323
</div>
2424
<div class="form-group">
2525
<label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
26-
{tmpl_var name='autoresponder_end_date'}
26+
<div class="col-sm-9">{tmpl_var name='autoresponder_end_date'}</div>
2727
</div>
2828

2929
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/mail/templates/mail_user_filter_edit.htm‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@ <h1><tmpl_var name="list_head_txt"></h1>
77

88
<div class="form-group">
99
<label for="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
10-
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div></div>
10+
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div>
11+
</div>
1112
<div class="form-group">
1213
<label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
13-
<div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
14-
<div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div><br><br>
15-
<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>
14+
<div class="col-sm-9" style="margin-bottom:10px"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
15+
<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>
16+
<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>
1617
</div>
1718
<div class="form-group">
1819
<label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
19-
<div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div><br><br>
20-
<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>
20+
<div class="col-sm-9" style="margin-bottom:10px"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
21+
<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>
2122
</div>
2223
<div class="form-group">
2324
<label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
24-
<span class="">{tmpl_var name='active'}</span>
25+
<div class="col-sm-9"><span class="">{tmpl_var name='active'}</span></div>
2526
</div>
2627

2728

‎interface/web/mail/templates/mail_user_filter_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</tbody>
5555
<tfoot>
5656
<tr>
57-
<td colspan="3"><tmpl_var name="paging"></td>
57+
<td colspan="2"><tmpl_var name="paging"></td>
5858
</tr>
5959
</tfoot>
6060
</table>

0 commit comments

Comments
 (0)