Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/mail/form/mail_user.tform.php

@@ -38,6 +38,8 @@

*/
global $app;
$app->uses('getconf');
$global_config = $app->getconf->get_global_config();

$form["title"]          = "Mailbox";
$form["description"]    = "";
@@ -230,6 +232,7 @@
   )
);

if ($global_config['mail']['mailbox_show_autoresponder_tab'] === 'y') {
$form["tabs"]['autoresponder'] = array (
   'title'    => "Autoresponder",
   'width'    => 100,
@@ -283,7 +286,10 @@
   ##################################
   )
);
}


if ($global_config['mail']['mailbox_show_mail_filter_tab'] === 'y') {
$form["tabs"]['filter_records'] = array (
   'title'    => "Mail Filter",
   'width'    => 100,
@@ -313,9 +319,10 @@
        )
   )
);
}

if($_SESSION["s"]["user"]["typ"] == 'admin') {

if ($_SESSION["s"]["user"]["typ"] == 'admin' && $global_config['mail']['mailbox_show_custom_rules_tab'] === 'y') {
$form["tabs"]['mailfilter'] = array (
   'title'    => "Custom Rules",
   'width'    => 100,
@@ -337,8 +344,6 @@
   ##################################
   )
);

}


?>