Wbl patch

This commit is contained in:
Mikko Husari
2008-12-10 20:19:59 +02:00
parent 773cf4217a
commit 7f07671b68
9 changed files with 611 additions and 44 deletions

View File

@@ -68,6 +68,11 @@ function showQuickLinks() {
" <p><b>&#8250;</b>\t";
$link->doLink('messagesIndex.php?ctype=A', translate('My Quarantine'));
echo '</p>';
echo "My rules" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
$link->doLink('rulesIndex.php', translate('My rules'));
echo '</p>';
if (! Auth::isMailAdmin()) {
echo "My Pending Requests" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
@@ -120,6 +125,11 @@ function showQuickLinks() {
" <p><b>&#8250;</b>\t";
$link->doLink('messagesPendingAdmin.php?ctype=A', translate('Site Pending Requests'));
echo '</p>';
echo "Site Rules" == $_SESSION['sessionNav'] ?
' <p class="selectedLink"><b>&raquo;</b>':
" <p><b>&#8250;</b>\t";
$link->doLink('rulesAdmin.php', translate('Site Rules'));
echo '</p>';
echo '<br>';
}
if ((! Auth::isMailAdmin() && ! Auth::isDomainAdmin()) && ($conf['app']['showEmailAdmin'])) {
@@ -205,33 +215,74 @@ function endDataDisplayCol() {
<?
}
/**
* Print Delete button for Control List Index
*/
function printControlButtons() {
echo '<table width="100%" border="0" cellspacing="1" cellpadding="0">';
echo '<tr>';
echo '<td align="right">';
echo '<input type="submit" class="button" name="action" value="'.translate('Delete').'">';
echo '</td>';
echo '</tr>';
echo '</table>';
}
/**
* Print 'Release', 'Delete' and 'Delete All' buttons
* @param string $content_type: 'S' (default), 'B', ...
* @param bool $printDeleteAll: if true (default) print 'Delete All' button
*/
function printActionButtons( $printDeleteAll = true ) {
function printActionButtons( $printDeleteAll = true, $wbselect = true ) {
?>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr>
<?
echo "<td align=\"left\"><input type=\"submit\" class=\"button\" name=\"action\" value=\"";
echo "<td align=\"left\">";
if (Auth::isMailAdmin()) {
if ($wbselect) {
echo '<select name="w_action" class="button">';
echo '<option value="">Extra options</option>';
echo '<option value="'.translate('Whitelist by strict addressing').'">'.translate('Whitelist by strict addressing').'</option>';
echo '<option value="'.translate('Whitelist by sender domain').'">'.translate('Whitelist by sender domain').'</option>';
echo '<option value="'.translate('Whitelist by recipient domain').'">'.translate('Whitelist by recipient domain').'</option>';
echo '<option value="'.translate('Whitelist by both domains').'">'.translate('Whitelist by both domains').'</option>';
echo '</select>';
}
} else {
echo '<input type="submit" class="button" name="action" value="'.translate('Whitelist').'" />';
}
echo "<input type=\"submit\" class=\"button\" name=\"action\" value=\"";
if ($_SESSION['sessionNav'] == "My Pending Requests") {
echo ( Auth::isMailAdmin()|| Auth::isDomainAdmin() ? translate('Release') : translate('Cancel Request') );
echo ( Auth::isMailAdmin() ? translate('Release') : translate('Cancel Request') );
} else {
echo ( Auth::isMailAdmin() ? translate('Release') : translate('Release/Request release') );
}
echo "\" />";
echo '</td>';
echo '<td align="right">';
if (Auth::isMailAdmin()) {
if ($wbselect) {
echo '<select name="b_action" class="button">';
echo '<option value="">Extra options</option>';
echo '<option value="'.translate('Blacklist by strict addressing').'">'.translate('Blacklist by strict addressing').'</option>';
echo '<option value="'.translate('Blacklist by sender domain').'">'.translate('Blacklist by sender domain').'</option>';
echo '<option value="'.translate('Blacklist by recipient domain').'">'.translate('Blacklist by recipient domain').'</option>';
echo '<option value="'.translate('Blacklist by both domains').'">'.translate('Blacklist by both domains').'</option>';
echo '</select>';
}
} else {
echo ( Auth::isMailAdmin() || Auth::isDomainAdmin() ? translate('Release') : translate('Release/Request release') );
}
echo "\"></td>";
?>
<td align="right"><input type="submit" class="button" name="action" value="<? echo translate('Delete'); ?>">
<? if ( $printDeleteAll )
echo "<input type=\"submit\" class=\"button\" name=\"action\" value=\"".translate('Delete All')."\">";
?>
</td>
</tr>
</table>
<?
echo '<input type="submit" class="button" name="action" value="'.translate('Delete').'" />';
if ( $printDeleteAll )
echo "<input type=\"submit\" class=\"button\" name=\"action\" value=\"".translate('Delete All')."\" />";
echo '</td>';
echo '</tr>';
echo '</table>';
}
/**