Empty: rename fname,mname,lname,dob

[gigi.git] / src / org / cacert / gigi / dbObjects / Name.java

diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/org/cacert/gigi/dbObjects/Name.java
index e28bf2b26e2bbfb514eebc3e6e4f73d59b6c3a81..7c803b8a67244996ae3d7d924b656f04d6b83ad8 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Name.java
+++ b/src/org/cacert/gigi/dbObjects/Name.java
@@ -4,9 +4,10 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.output.template.Outputable;
+import org.cacert.gigi.util.HTMLEncoder;
 
-public class Name implements Outputable, Cloneable {
+public class Name implements Outputable {
 
     String fname;
 
@@ -27,10 +28,10 @@ public class Name implements Outputable, Cloneable {
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.println("<span class=\"accountdetail\">");
         out.print("<span class=\"fname\">");
-        out.print(fname);
+        out.print(HTMLEncoder.encodeHTML(fname));
         out.print("</span> ");
         out.print("<span class=\"lname\">");
-        out.print(lname);
+        out.print(HTMLEncoder.encodeHTML(lname));
         out.print("</span>");
         out.println("</span>");
     }
@@ -101,13 +102,4 @@ public class Name implements Outputable, Cloneable {
                 (mname != null && suffix != null && text.equals(fname + " " + mname + " " + lname + " " + suffix));
     }
 
-    @Override
-    protected Name clone() {
-        try {
-            return (Name) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new Error(e);
-        }
-    }
-
 }