Ticket #1552: 1552.patch

Users/fiona/development/EclipseWorkspace/FCKEditor.Java/src/com/fredck/FCKeditor/FCKeditor.java

@@ -25 +25 @@
 package com.fredck.FCKeditor;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 /**
  * The main class of the class lib.<br>
@@ -248 +251 @@
                         if(retrieveBrowserVersion(userAgent)>=5.5)
                                 return true;
                 }
+                else if (userAgent.indexOf("applewebkit") != -1) {
+                        // Safari (applewebkit) has "gecko" in its agent string so this test should appear before the gecko test
+            return (retrieveBrowserVersion(userAgent) >= 522);
+        } 
                 else if (userAgent.indexOf("gecko") !=-1){
                         if(retrieveBrowserVersion(userAgent)>=20030210)
                                 return true;
@@ -252 +259 @@
                         if(retrieveBrowserVersion(userAgent)>=20030210)
                                 return true;
                 }
+                else if (userAgent.indexOf("opera") != -1) {
+            return (retrieveBrowserVersion(userAgent) >= 9.5);
+        }
                 return false;
         }
 
@@ -256 +266 @@
         }
 
         private double retrieveBrowserVersion(String userAgent) {
-                if(userAgent.indexOf("msie")>-1) {
-                        String str = userAgent.substring(userAgent.indexOf("msie") + 5);
-                        return Double.parseDouble(str.substring(0, str.indexOf(";")));
-                }
-                else {
-                        String str = userAgent.substring(userAgent.indexOf("gecko") + 6);
-                        return Double.parseDouble(str.substring(0, 8));
-                }
+                try {
+                        if(userAgent.indexOf("msie")>-1) {
+                                String str = userAgent.substring(userAgent.indexOf("msie") + 5);
+                                return Double.parseDouble(str.substring(0, str.indexOf(";")));
+                        }
+                        else if (userAgent.indexOf("applewebkit") != -1) {
+                                // Safari (applewebkit) has "gecko" in its agent string so this test should appear before the gecko test
+                    Matcher safari = Pattern.compile("applewebkit/" + "(( [\\d]* )" + "(?:" + "\\." + " [\\d]* )?)", Pattern.COMMENTS).matcher(userAgent);
+                    safari.find();
+                    int majorVersion = 0;
+                    return Integer.parseInt(safari.group(2));
+                        }
+                        else if (userAgent.indexOf("gecko") != -1)  {
+                                String str = userAgent.substring(userAgent.indexOf("gecko") + 6);
+                                return Double.parseDouble(str.substring(0, 8));
+                } else if (userAgent.indexOf("opera") != -1) {
+                    String str = userAgent.substring(userAgent.indexOf("opera") + 6);
+                    return  Double.parseDouble(str.substring(0, 4));
+                }
+        } catch (NumberFormatException e) {
+                // do not do anything - want to return 0
+        }
+        
+        return 0;
+
+
+                
         }
 
         private String HTMLEncode(String txt) {