geos_one/go-mailzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Domainadmin patch

Browse Source
This commit is contained in:
Mikko Husari
2008-12-10 17:41:16 +02:00
parent 2572b1814b
commit 773cf4217a
12 changed files with 407 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CmnFns.class.php
View File

@@ -507,7 +507,7 @@ class CmnFns {
$fields_array = array("f" => translate('From'),
"s" => translate('Subject')
);
if (Auth::isMailAdmin() || $conf['app']['allowMailid']) {
if ((Auth::isMailAdmin() || Auth::isDomainAdmin()) || $conf['app']['allowMailid']) {
$fields_array = array_merge(array("m" => "Mail ID"), $fields_array);
}
if ($full_search) $fields_array = array_merge(array("t" => translate('To')), $fields_array);
@@ -551,11 +551,11 @@ class CmnFns {
<? echo translate('Spam'); ?></option>
<option value="B" <? echo ($content_type == 'B' ? ' selected="true"':''); ?>>
<? echo translate('Banned'); ?></option>
<? if (Auth::isMailAdmin() || $conf['app']['allowViruses']) { ?>
<? if ((Auth::isMailAdmin() || Auth::isDomainAdmin()) || $conf['app']['allowViruses']) { ?>
<option value="V" <? echo ($content_type == 'V' ? ' selected="true"':''); ?>>
<? echo translate('Virus'); ?></option>
<? }
if (Auth::isMailAdmin() || $conf['app']['allowBadHeaders']) { ?>
if ((Auth::isMailAdmin() || Auth::isDomainAdmin()) || $conf['app']['allowBadHeaders']) { ?>
<option value="H" <? echo ($content_type == 'H' ? ' selected="true"':''); ?>>
<? echo translate('Bad Header'); ?></option>
<? }