Ticket #2206: 2206.2.patch

fckeditor.php

@@ -25 +25 @@
  * strict error messages with PHP 5).
  */
 
-/**
- * Check if browser is compatible with FCKeditor.
- * Return true if is compatible.
- *
- * @return boolean
- */
-function FCKeditor_IsCompatibleBrowser()
-{
-        if ( isset( $_SERVER ) ) {
-                $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
-        }
-        else {
-                global $HTTP_SERVER_VARS ;
-                if ( isset( $HTTP_SERVER_VARS ) ) {
-                        $sAgent = $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ;
-                }
-                else {
-                        global $HTTP_USER_AGENT ;
-                        $sAgent = $HTTP_USER_AGENT ;
-                }
-        }
-
-        if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
-        {
-                $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
-                return ($iVersion >= 5.5) ;
-        }
-        else if ( strpos($sAgent, 'Gecko/') !== false )
-        {
-                $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
-                return ($iVersion >= 20030210) ;
-        }
-        else if ( strpos($sAgent, 'Opera/') !== false )
-        {
-                $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
-                return ($fVersion >= 9.5) ;
-        }
-        else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
-        {
-                $iVersion = $matches[1] ;
-                return ( $matches[1] >= 522 ) ;
-        }
-        else
-                return false ;
-}
-
 if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) )
         include_once( 'fckeditor_php4.php' ) ;
 else

fckeditor_php4.php

@@ -25 +25 @@
  * instances in PHP pages on server side.
  */
 
+/**
+ * Check if browser is compatible with FCKeditor.
+ * Return true if is compatible.
+ *
+ * @return boolean
+ */
+function FCKeditor_IsCompatibleBrowser()
+{
+        if ( isset( $_SERVER ) ) {
+                $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
+        }
+        else {
+                global $HTTP_SERVER_VARS ;
+                if ( isset( $HTTP_SERVER_VARS ) ) {
+                        $sAgent = $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ;
+                }
+                else {
+                        global $HTTP_USER_AGENT ;
+                        $sAgent = $HTTP_USER_AGENT ;
+                }
+        }
+
+        if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
+        {
+                $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
+                return ($iVersion >= 5.5) ;
+        }
+        else if ( strpos($sAgent, 'Gecko/') !== false )
+        {
+                $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
+                return ($iVersion >= 20030210) ;
+        }
+        else if ( strpos($sAgent, 'Opera/') !== false )
+        {
+                $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
+                return ($fVersion >= 9.5) ;
+        }
+        else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
+        {
+                $iVersion = $matches[1] ;
+                return ( $matches[1] >= 522 ) ;
+        }
+        else
+                return false ;
+}
+
 class FCKeditor
 {
         /**

fckeditor_php5.php

@@ -25 +25 @@
  * instances in PHP pages on server side.
  */
 
+/**
+ * Check if browser is compatible with FCKeditor.
+ * Return true if is compatible.
+ *
+ * @return boolean
+ */
+function FCKeditor_IsCompatibleBrowser()
+{
+        if ( isset( $_SERVER ) ) {
+                $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
+        }
+        else {
+                global $HTTP_SERVER_VARS ;
+                if ( isset( $HTTP_SERVER_VARS ) ) {
+                        $sAgent = $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ;
+                }
+                else {
+                        global $HTTP_USER_AGENT ;
+                        $sAgent = $HTTP_USER_AGENT ;
+                }
+        }
+
+        if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
+        {
+                $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
+                return ($iVersion >= 5.5) ;
+        }
+        else if ( strpos($sAgent, 'Gecko/') !== false )
+        {
+                $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
+                return ($iVersion >= 20030210) ;
+        }
+        else if ( strpos($sAgent, 'Opera/') !== false )
+        {
+                $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
+                return ($fVersion >= 9.5) ;
+        }
+        else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
+        {
+                $iVersion = $matches[1] ;
+                return ( $matches[1] >= 522 ) ;
+        }
+        else
+                return false ;
+}
+
 class FCKeditor
 {
         /**