[Openutils-svn] SF.net SVN: openutils:[4457] magnoliamodules/trunk/openutils-mgnlutils/src/ main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

[<fg...@us...>]

Revision: 4457
          http://openutils.svn.sourceforge.net/openutils/?rev=4457&view=rev
Author:   fgiust
Date:     2013-12-03 08:49:28 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
don't add extensions to link with parameters or ending /

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-11-15 15:24:06 UTC (rev 4456)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-12-03 08:49:28 UTC (rev 4457)
@@ -227,22 +227,10 @@
         // Check if there is already an extensions, else add default one
         if (cleanedurl.startsWith("/"))
         {
-            String configuredExtension = Components.getComponent(ServerConfiguration.class).getDefaultExtension();
+            cleanedurl = Components.getComponent(I18nContentSupport.class).toI18NURI(cleanedurl);
+            cleanedurl = contextPath + cleanedurl;
 
-            if (StringUtils.isNotBlank(configuredExtension))
-            {
-
-                String defaultExtension = "." + configuredExtension;
-                cleanedurl = Components.getComponent(I18nContentSupport.class).toI18NURI(cleanedurl);
-                cleanedurl = contextPath + cleanedurl;
-
-                if (!cleanedurl.endsWith(defaultExtension) && cleanedurl.indexOf(".") < 0)
-                {
-                    return cleanedurl + defaultExtension;
-                }
-            }
-
-            return cleanedurl;
+            return addDefaultExtension(cleanedurl);
         }
 
         // Check if uuidOrPathOrUrl is an UUID
@@ -261,6 +249,27 @@
         return cleanedurl;
     }
 
+    private static String addDefaultExtension(String url)
+    {
+        String configuredExtension = Components.getComponent(ServerConfiguration.class).getDefaultExtension();
+
+        if (StringUtils.isNotBlank(configuredExtension))
+        {
+
+            String defaultExtension = "." + configuredExtension;
+
+            if (!url.endsWith(defaultExtension)
+                && !StringUtils.contains(url, ".")
+                && !StringUtils.contains(url, "?")
+                && !StringUtils.endsWith(url, "/"))
+            {
+                return url + defaultExtension;
+            }
+        }
+
+        return url;
+    }
+
     /**
      * Create an html complete link from a string composed by link \t link text. If the link is empty the function
      * return only the text

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.