added username to interface
fixed unescaped @ in deliveryProgramPath fixed wrong "for" label
This commit is contained in:
parent
ed1e2a9eea
commit
b95baa8ca0
4 changed files with 5 additions and 3 deletions
|
@ -13,6 +13,6 @@ $LDAP_HOST = 'ldap.sao';
|
|||
# the string '_USERNAME_' will be replaced by the real username
|
||||
$LDAP_USER_DN = "cn=_USERNAME_,sc=mailAccount,ou=People,o=neofaxe,dc=systemausfall,dc=org";
|
||||
|
||||
$LDAP_SPAM_MOVE = "| /usr/local/bin/ifspam spam-_USERNAME_";
|
||||
$LDAP_SPAM_MARK = "| /usr/local/bin/ifspam spam-_USERNAME_ || /bin/true";
|
||||
$LDAP_SPAM_MOVE = "/usr/local/bin/ifspamh spam-_USERNAME_\@systemausfall.org";
|
||||
$LDAP_SPAM_MARK = "/usr/local/bin/ifspamh spam-_USERNAME_\@systemausfall.org || /bin/true";
|
||||
|
||||
|
|
|
@ -124,6 +124,7 @@ exit;
|
|||
sub set_pagedata {
|
||||
$pagedata->setValue('Data.isSpamMove', &is_spam_move()? 1 : 0);
|
||||
$pagedata->setValue('Data.isSpamMark', &is_spam_mark()? 1 : 0);
|
||||
$pagedata->setValue('Data.UserName', $mail_user);
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</li>
|
||||
<li><input type="radio" name="filter_type" id="filter_move" value="move" <?cs
|
||||
if:Data.isSpamMove ?>checked="checked"<?cs /if ?>/>
|
||||
<label for="filter_none"><?cs var:Lang.Misc.Filter_Move ?></label>
|
||||
<label for="filter_move"><?cs var:Lang.Misc.Filter_Move ?></label>
|
||||
</li>
|
||||
<li><label for="pw"><?cs var:html_escape(Lang.Misc.Password) ?>:</label>
|
||||
<input type="password" name="pw" id="pw" size="20"></li>
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
<?cs include:Config.TemplateDir + '/nav.cs' ?>
|
||||
<div id="main_content">
|
||||
<div id="info_title"><?cs var:Data.UserName ?></div>
|
||||
<?cs if:Data.Error ?><?cs call:error(Lang.ErrorMessage[Data.Error]) ?><?cs /if ?>
|
||||
<?cs if:Data.customError ?><?cs call:error(Data.customError) ?><?cs /if ?>
|
||||
<?cs if:Data.Warning ?><?cs call:warning(Lang.WarningMessage[Data.Warning]) ?><?cs /if ?>
|
||||
|
|
Loading…
Reference in a new issue