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

31
templates/common.template.php
View File

@@ -78,7 +78,30 @@ function showQuickLinks() {
?>
</p>
<br>
<? if (Auth::isMailAdmin()) {
<?
if (Auth::isDomainAdmin()) {
if ($conf['app']['domainSummary']) {
echo "Domain Quarantine Summary" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
$link->doLink('domainSummary.php', translate('Domain Quarantine Summary'));
echo '</p>';
}
echo "Domain Quarantine" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
$link->doLink('domainAdmin.php?ctype=A&searchOnly='.$conf['app']['searchOnly'], translate('Domain Quarantine'));
echo '</p>';
echo "Domain Pending Requests" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
$link->doLink('domainPendingAdmin.php?ctype=A', translate('Domain Pending Requests'));
echo '</p>';
echo '<br>';
}
if (Auth::isMailAdmin()) {
if ($conf['app']['siteSummary']) {
echo "Site Quarantine Summary" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
@@ -99,7 +122,7 @@ function showQuickLinks() {
echo '</p>';
echo '<br>';
}
if ((! Auth::isMailAdmin()) && ($conf['app']['showEmailAdmin'])) {
if ((! Auth::isMailAdmin() && ! Auth::isDomainAdmin()) && ($conf['app']['showEmailAdmin'])) {
echo "Email Administrator" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
@@ -194,10 +217,10 @@ function printActionButtons( $printDeleteAll = true ) {
<?
echo "<td align=\"left\"><input type=\"submit\" class=\"button\" name=\"action\" value=\"";
if ($_SESSION['sessionNav'] == "My Pending Requests") {
echo ( Auth::isMailAdmin() ? translate('Release') : translate('Cancel Request') );
echo ( Auth::isMailAdmin()|| Auth::isDomainAdmin() ? translate('Release') : translate('Cancel Request') );
} else {
echo ( Auth::isMailAdmin() ? translate('Release') : translate('Release/Request release') );
echo ( Auth::isMailAdmin() || Auth::isDomainAdmin() ? translate('Release') : translate('Release/Request release') );
}
echo "\"></td>";
?>

36
templates/quarantine.template.php
View File

@@ -60,7 +60,7 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
<input type="hidden" name="query_string" value="<? echo $query_string; ?>">
<? // Draw 'Release', 'Delete' and 'Delete All' buttons
printActionButtons((! CmnFns::didSearch() && ! ("Site Quarantine" == $_SESSION['sessionNav'])) );
printActionButtons((! CmnFns::didSearch() && ! ("Site Quarantine" == $_SESSION['sessionNav']) && !("Domain Quarantine" == $_SESSION['sessionNav'])) );
// Draw 'Select All, Clear All' and multi pages links
printSelectAndPager($pager_html);
@@ -93,8 +93,11 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
<!-- Print table's headers -->
<tr class="rowHeaders">
<td width="3%">&nbsp;</td>
<? if ( (count($_SESSION['sessionMail']) > 1) || ((Auth::isMailAdmin()) &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav']))) { ?>
<? if ( (count($_SESSION['sessionMail']) > 1) || ((Auth::isMailAdmin() || Auth::isDomainAdmin()) &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])
||
("Domain Quarantine" == $_SESSION['sessionNav'] || "Domain Pending Requests" == $_SESSION['sessionNav'])
)) { ?>
<td width="15%" <? echo "recip.email"==$order?' class="reservedCell"':''; ?>>
<? $link->doLink($_SERVER['PHP_SELF'] . '?' . CmnFns::querystring_exclude_vars( array('order','vert'))
. '&amp;order=recip.email&amp;vert=' . $new_vert, translate('To'), '', '', $mouseover_text) ?>
@@ -120,8 +123,9 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
<? $link->doLink($_SERVER['PHP_SELF'] . '?' . CmnFns::querystring_exclude_vars( array('order','vert'))
. '&amp;order=msgs.content&amp;vert=' . $new_vert, translate('Content Type'), '', '', $mouseover_text) ?>
</td>
<? if ( (Auth::isMailAdmin()) &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])) { ?>
<? if ( Auth::isMailAdmin() &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])
) { ?>
<td width="10%" <? echo "mail_id"==$order?' class="reservedCell"':''; ?>>
<? $link->doLink($_SERVER['PHP_SELF'] . '?' . CmnFns::querystring_exclude_vars( array('order','vert'))
. '&amp;order=mail_id&amp;vert=' . $new_vert, translate('Mail ID'), '', '', $mouseover_text) ?>
@@ -135,8 +139,10 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
// Make sure that there is a clickable subject
$subject = $rs['subject'] ? htmlspecialchars($rs['subject']) : '(none)';
$from = $rs['from_addr'] ? htmlspecialchars($rs['from_addr']) : '(none)';
if ( (count($_SESSION['sessionMail']) > 1) || (Auth::isMailAdmin() &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav']))) {
if ( (count($_SESSION['sessionMail']) > 1) || ((Auth::isMailAdmin() || Auth::isDomainAdmin()) &&
(
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])
|| ("Domain Quarantine" == $_SESSION['sessionNav'] || "Domain Pending Requests" == $_SESSION['sessionNav'])))) {
$to = $rs['email'] ? htmlspecialchars($rs['email']) : '(none)';
}
$class = ( $rs['content'] == 'V' ? 'cellVirus' : 'cellColor') . ($i%2);
@@ -144,8 +150,12 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
echo ' <td><input type="checkbox" onclick="ColorRow(this,\'lightyellow\')"
name="mail_id_array[]" value="' . $rs['mail_id'] . '_' . $rs['email'] . '"></td>';
if ( (count($_SESSION['sessionMail']) > 1) || (Auth::isMailAdmin() &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav']))) {
if ( (count($_SESSION['sessionMail']) > 1) || ((Auth::isMailAdmin() || Auth::isDomainAdmin()) &&
(
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav']))
|| ("Domain Quarantine" == $_SESSION['sessionNav'] || "Domain Pending Requests" == $_SESSION['sessionNav'])
)
) {
echo ' <td>' . $to . '</td>';
}
echo ' <td>' . $from . '</td>';
@@ -179,8 +189,9 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
echo ( $rs['content'] == 'V' ? '<td class="typeVirus">' : '<td>') . $type . '</td>';
if ( Auth::isMailAdmin() &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])) {
if ( Auth::isMailAdmin() &&
("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav'])
) {
echo ' <td>' . $rs['mail_id'] . '</td>';
}
@@ -195,7 +206,8 @@ function showMessagesTable($content_type, $res, $page, $order, $vert, $numRows =
<? // Draw 'Select All, Clear All' and multi pages links
printSelectAndPager($pager_html);
// Draw 'Release', 'Delete' and 'Delete All' buttons
printActionButtons((! CmnFns::didSearch() && ! ("Site Quarantine" == $_SESSION['sessionNav'])) );
// printActionButtons((! CmnFns::didSearch() && ! ("Site Quarantine" == $_SESSION['sessionNav'])) );
printActionButtons((! CmnFns::didSearch() && ! ("Site Quarantine" == $_SESSION['sessionNav']) && !("Domain Quarantine" == $_SESSION['sessionNav'])) );
unset($res); ?>