From b95baa8ca034c1327c8263716ab5420717c7a8a9 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Tue, 24 Jan 2006 20:10:38 +0000
Subject: [PATCH] added username to interface fixed unescaped @ in
 deliveryProgramPath fixed wrong "for" label

---
 ql-web/trunk/ql-web.conf             | 4 ++--
 ql-web/trunk/ql-web.pl               | 1 +
 ql-web/trunk/template/filter_form.cs | 2 +-
 ql-web/trunk/template/main.cs        | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ql-web/trunk/ql-web.conf b/ql-web/trunk/ql-web.conf
index 80d3078..dbe1eaa 100644
--- a/ql-web/trunk/ql-web.conf
+++ b/ql-web/trunk/ql-web.conf
@@ -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";
 
diff --git a/ql-web/trunk/ql-web.pl b/ql-web/trunk/ql-web.pl
index ea22c3b..f3b8af4 100755
--- a/ql-web/trunk/ql-web.pl
+++ b/ql-web/trunk/ql-web.pl
@@ -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);
 }
 
 # ---------------------------------------------------------------------------
diff --git a/ql-web/trunk/template/filter_form.cs b/ql-web/trunk/template/filter_form.cs
index 69c1d48..b6286f3 100644
--- a/ql-web/trunk/template/filter_form.cs
+++ b/ql-web/trunk/template/filter_form.cs
@@ -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>
diff --git a/ql-web/trunk/template/main.cs b/ql-web/trunk/template/main.cs
index d0ba89a..4288db0 100644
--- a/ql-web/trunk/template/main.cs
+++ b/ql-web/trunk/template/main.cs
@@ -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 ?>