[MMBASE SCM] r40920 - mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes

[michiel]

Author: michiel
Date: 2010-02-09 10:29:07 +0100 (Tue, 09 Feb 2010)
New Revision: 40920

Modified:
   
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
Log:
support for font

Modified: 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
   2010-02-09 09:28:42 UTC (rev 40919)
+++ 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
   2010-02-09 09:29:07 UTC (rev 40920)
@@ -54,6 +54,7 @@
         public String background = "white";
         public String fillColor = "black";
         public int swirl = 30;
+        public String font = null;
 
         public CaptchaImage(String text) {
             this.text = text;
@@ -108,11 +109,16 @@
         }
         commands.add("gravity(west)");
         commands.add("s(80x22!)");
+        if (image.font != null) {
+            commands.add("font(" + image.font + ")");
+        }
         commands.add("fill(" + image.fillColor + ")");
         commands.add("pointsize(20)");
         commands.add("text(0,0,\'" + image.text + "')");
         commands.add("f(png)");
-        commands.add("swirl(" + image.swirl + ")");
+        if (image.swirl != 0) {
+            commands.add("swirl(" + image.swirl + ")");
+        }
         ImageConversionRequest req =
             Factory.getImageConversionRequest(input, "gif", receiver, 
commands);
 
@@ -179,6 +185,7 @@
         private int length = 5;
         private int swirl = 30;
         private String background = "white";
+        private String font = null;
 
 
         public void setLength(int l) {
@@ -192,6 +199,10 @@
             background = bg;
         }
 
+        public void setFont(String f) {
+            font = f;
+        }
+
         @Override
         public String input(Request request, Node node, Field field, boolean 
search)  {
             if (search) {
@@ -202,6 +213,7 @@
                 CaptchaImage image = new 
CaptchaDataType.CaptchaImage(createString(length));
                 image.swirl = swirl;
                 image.background = background;
+                image.font = font;
                 StringBuilder show =  new StringBuilder();
                 try {
                     CaptchaDataType.createCaptchaImage(null, image);

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs