Domainadmin patch
This commit is contained in:
@@ -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%"> </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'))
|
||||
. '&order=recip.email&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'))
|
||||
. '&order=msgs.content&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'))
|
||||
. '&order=mail_id&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); ?>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user