fix

diff --git a/source/mir/misc/StringUtil.java b/source/mir/misc/StringUtil.java
index b5b196b..bcbc06a 100755 (executable)
--- a/source/mir/misc/StringUtil.java
+++ b/source/mir/misc/StringUtil.java
@@ -41,7 +41,7 @@ import gnu.regexp.REException;
 /**\r
  * Statische Hilfsmethoden zur Stringbehandlung\r
  *\r
- * @version $Id: StringUtil.java,v 1.33.2.3 2003/07/03 22:47:02 zapata Exp $\r
+ * @version $Id: StringUtil.java,v 1.33.2.4 2003/08/10 00:16:53 zapata Exp $\r
  * @author mir-coders group\r
  *\r
  */\r
@@ -57,7 +57,7 @@ public final class StringUtil {
       //precompile regex\r
       re_newline2br = new RE("(\r?\n){1}");\r
       re_brbr2p     = new RE("(<br>\r?\n<br>){1,}");\r
-      re_mail       = new RE("([a-zA-Z0-9_.-]+)@([a-zA-Z0-9_-]+)\\.([a-zA-Z0-9_.-]+)");\r
+      re_mail       = new RE("\\b([a-zA-Z0-9_.-]+)@([a-zA-Z0-9_-]+)\\.([a-zA-Z0-9_.-]+)\\b");\r
       re_url        = new RE("((https://)|(http://)|(ftp://)){1}([a-zA-Z0-9_-]+).([a-zA-Z0-9_.:-]+)/?([^ \t\r\n<>\\)\\]]+[^ \t\r\n.,<>\\)\\]])");\r
       re_tags       = new RE("<[^>]*>",RE.REG_ICASE);\r
       re_tables = new RE("<[ \t\r\n/]*(table|td|tr)[ \t\r\n]*>",RE.REG_ICASE);\r

diff --git a/templates/admin/abuse.filters.template b/templates/admin/abuse.filters.template
index 3455f8a..9ec9763 100755 (executable)
--- a/templates/admin/abuse.filters.template
+++ b/templates/admin/abuse.filters.template
@@ -26,20 +26,20 @@
           lang("abuse.filter.lasthit"), 
            ])>
     <list filters as f>    
-      <if f.lastHit>\r
+    <if f.lastHit>\r
         <call ListEntry([
           lang("abuse.filtertype."+f.type),
           utility.encodeHTML(f.expression),
           lang("content.operation."+f.articleAction),
           lang("comment.operation."+f.commentAction),
-          f.comments,
+          f.comments,                                                   
           f.lastHit.format(config["Mir.DefaultDateTimeFormat"], config["Mir.DefaultTimezone"])
           ], 
           "module=Abuse&id="+f.id, 
           ["&do=edit", "&do=delete"], 
           [lang("edit"), lang("delete")])
         >
-      <else>
+    <else>
         <call ListEntry([
           lang("abuse.filtertype."+f.type),
           utility.encodeHTML(f.expression),
@@ -52,11 +52,19 @@
           ["&do=edit", "&do=delete"], 
           [lang("edit"), lang("delete")])
         >
-      </if>
+    </if>
     </list>\r
     <call ListEnd()>\r
     
-  <call AddOrBack("Abuse", module_jumpback, do_jumpback)>
+    <p>
+      <a class="link-box" href="${config.actionRoot}?module=Abuse">[ &lt; ] ${lang("back")}</a>&nbsp;&nbsp;
+      <a class="link-box" href="${config.actionRoot}?module=Abuse&do=add">[+] ${lang("add")}</a> &nbsp;
+      <if config["Abuse.DisallowIPLogging"]!="1">
+        <a class="link-box" href="${config.actionRoot}?module=Abuse&do=showlog">${lang("abuse.showlog")}</a>
+      </if>
+      <br><br>
+    </p>
+
   <include "foot.template">
 </body>
 </html>