[Freemail] r10302 - in trunk/apps/Freemail/src/freemail: . utils

[d...@freenetproject.org]

Author: dbkr
Date: 2006-08-31 01:22:46 +0000 (Thu, 31 Aug 2006)
New Revision: 10302

Modified:
   trunk/apps/Freemail/src/freemail/Postman.java
   trunk/apps/Freemail/src/freemail/utils/EmailAddress.java
Log:
d'oh

Modified: trunk/apps/Freemail/src/freemail/Postman.java
===================================================================
--- trunk/apps/Freemail/src/freemail/Postman.java       2006-08-31 01:04:33 UTC 
(rev 10301)
+++ trunk/apps/Freemail/src/freemail/Postman.java       2006-08-31 01:22:46 UTC 
(rev 10302)
@@ -40,8 +40,10 @@
                                if (!this.validateFrom(addr)) {
                                        newmsg.removeHeader("From", froms[i]);
                                        EmailAddress e = new 
EmailAddress(froms[i]);
-                                       e.user = "**SPOOFED** "+e.user;
-                                       newmsg.addHeader("From", e.toString());
+                                       if (e.realname == null) e.realname = "";
+                                       e.realname = "**SPOOFED** "+e.realname;
+                                       e.realname = e.realname.trim();
+                                       newmsg.addHeader("From", 
e.toLongString());
                                }
                        } else {
                                newmsg.removeHeader("From", froms[i]);

Modified: trunk/apps/Freemail/src/freemail/utils/EmailAddress.java
===================================================================
--- trunk/apps/Freemail/src/freemail/utils/EmailAddress.java    2006-08-31 
01:04:33 UTC (rev 10301)
+++ trunk/apps/Freemail/src/freemail/utils/EmailAddress.java    2006-08-31 
01:22:46 UTC (rev 10302)
@@ -52,13 +52,15 @@
                }

                // trim quotes out of the real name field
-               this.user = this.user.trim();
-               if (this.user.substring(0,1).equals("\"")) {
-                   this.user = this.user.substring(1);
+               if (realname != null && realname.length() > 0) {
+                   this.realname = this.realname.trim();
+                   if (this.realname.substring(0,1).equals("\"")) {
+                       this.realname = this.realname.substring(1);
+                   }
+                   if (this.realname.substring(this.realname.length() - 
1).equals("\"")) {
+                       this.realname = this.realname.substring(0, 
this.realname.length() - 1);
+                   }
                }
-               if (this.user.substring(this.user.length() - 1).equals("\"")) {
-                   this.user = this.user.substring(0, this.user.length() - 1);
-               }
        }

        public EmailAddress() {
@@ -113,4 +115,8 @@
        public String toString() {
                return this.user+"@"+this.domain;
        }
+       
+       public String toLongString() {
+               return this.realname + " <"+this.user+"@"+this.domain+">";
+       }
 }