paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display keys inline, also read domain aliases for tagging option

master
andryyy 2017-02-14 21:54:09 +01:00
parent 68a9490dc3
commit 15bffcd447
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/conf/rspamd/dynmaps/tags.php
View File

@ -14,4 +14,9 @@ $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) { while ($row = array_shift($rows)) {
echo strtolower(trim($row['username'])) . PHP_EOL; echo strtolower(trim($row['username'])) . PHP_EOL;
} }
?> $stmt = $pdo->query("SELECT CONCAT(mailbox.local_part, '@', alias_domain.alias_domain) as `tag_ad` FROM `mailbox` INNER JOIN `alias_domain` ON mailbox.domain = alias_domain.target_domain WHERE mailbox.wants_tagged_subject='1';");
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) {
echo strtolower(trim($row['tag_ad'])) . PHP_EOL;
}
?>

2
data/web/admin.php
View File

@ -48,7 +48,7 @@ $tfa_data = get_tfa();
<div id="tfa_additional"> <div id="tfa_additional">
<?php if($tfa_data['additional']): <?php if($tfa_data['additional']):
foreach ($tfa_data['additional'] as $key_info): ?> foreach ($tfa_data['additional'] as $key_info): ?>
<form method="post"> <form style="display:inline;" method="post">
<input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" /> <input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" />
<div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div> <div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div>
</form> </form>

2
data/web/inc/functions.inc.php
View File

@ -1912,7 +1912,7 @@ function unset_tfa_key($postarray) {
// Needs at least one key left // Needs at least one key left
global $pdo; global $pdo;
global $lang; global $lang;
$id = intval($postarray['id']); $id = intval($postarray['unset_tfa_key']);
if ($_SESSION['mailcow_cc_role'] != "domainadmin" && if ($_SESSION['mailcow_cc_role'] != "domainadmin" &&
$_SESSION['mailcow_cc_role'] != "admin") { $_SESSION['mailcow_cc_role'] != "admin") {
$_SESSION['return'] = array( $_SESSION['return'] = array(

2
data/web/user.php
View File

@ -29,7 +29,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma
<div id="tfa_additional"> <div id="tfa_additional">
<?php if($tfa_data['additional']): <?php if($tfa_data['additional']):
foreach ($tfa_data['additional'] as $key_info): ?> foreach ($tfa_data['additional'] as $key_info): ?>
<form method="post"> <form style="display:inline;" method="post">
<input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" /> <input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" />
<div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div> <div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div>
</form> </form>