r1323 - xwiki/trunk/src/main/java/com/xpn/xwiki

[Jeremi Joslin]

Author: jeremi
Date: 2006-09-15 21:42:21 +0200 (Fri, 15 Sep 2006)
New Revision: 1323

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
Log:
read the login type on the preference of the wiki

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-15 16:15:55 UTC (rev 1322)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-15 19:42:21 UTC (rev 1323)
@@ -1885,6 +1885,7 @@
         needsUpdate |= bclass.addBooleanField("showRightPanels", "Display the right panel column", "yesno");
         needsUpdate |= bclass.addStaticListField("pageWidth", "Preferred page width", "default|640|800|1024|1280|1600");
         needsUpdate |= bclass.addTextField("languages", "Supported languages", 30);
+        needsUpdate |= bclass.addTextField("convertmail", "convert email type", 1);
 
         if (((BooleanClass)bclass.get("showLeftPanels")).getDisplayType().equals("checkbox"))
         {
@@ -3963,10 +3964,16 @@
         return newobject;
     }
 
+    public String getConvertingUserNameType(XWikiContext context){
+        if (context.getWiki().getXWikiPreference("convertmail", context) != null)
+            return context.getWiki().getXWikiPreference("convertmail", context);
+        return context.getWiki().Param("xwiki.authentication.convertemail", "0");
+    }
+
     public String convertUsername(String username, XWikiContext context) {
         if (username==null)
           return null;
-        if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("1")&&(username.indexOf("@")!=-1)) {
+        if (getConvertingUserNameType(context).equals("1")&&(username.indexOf("@")!=-1)) {
             String id = "" + username.hashCode();
             id = id.replaceAll("-", "");
             if (username.length()>1) {
@@ -3975,7 +3982,7 @@
             }
             return id;
         }
-        else if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("2"))
+        else if (getConvertingUserNameType(context).equals("2"))
           return username.replaceAll("[\\.\\@]", "_");
         else
           return username;