Javascript detection no longer requires SquirrelSpell.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3639 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/plugin.php b/functions/plugin.php
index 159fb154982e44b059350419189541fcb7fcad83..9b52a649aa274e735cf2a27dd2241126436273d6 100644 (file)
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -69,6 +69,25 @@ function do_hook_function($name,$parm=NULL) {
 }
 
 
+
+/**
+ * This function checks whether the user's USER_AGENT is known to
+ * be broken. If so, returns true and the plugin is invisible to the
+ * offending browser.
+ */
+function soupNazi(){
+
+    global $HTTP_USER_AGENT;
+
+    $soup_menu = array('Mozilla/3','Mozilla/2','Mozilla/1', 'Opera 4',
+                       'Opera/4', 'OmniWeb', 'Lynx');
+    foreach($soup_menu as $browser) {
+        if(stristr($HTTP_USER_AGENT, $browser)) {
+            return 1;
+        }
+    }
+    return 0;
+}
 /*************************************/
 /*** MAIN PLUGIN LOADING CODE HERE ***/
 /*************************************/
@@ -80,19 +99,4 @@ if (isset($plugins) && is_array($plugins)) {
     }
 }
 
-    /**
-     * This function checks whether the user's USER_AGENT is known to
-     * be broken. If so, returns true and the plugin is invisible to the
-     * offending browser.
-     */
-    function soupNazi(){
-
-        global $HTTP_USER_AGENT, $SQSPELL_SOUP_NAZI;
-        
-        require_once(SM_PATH . 'plugins/squirrelspell/sqspell_config.php');
-
-        $soup_menu = explode( ',', $SQSPELL_SOUP_NAZI );
-        return( in_array( trim( $HTTP_USER_AGENT ), $soup_menu ) );
-    }
-
 ?>

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 262427626b9f478c2fe24fbbf8ec0c50fc5d602d..976397dfb0eef5c134d43fcf05515d63d283e099 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -119,7 +119,7 @@ require_once(SM_PATH . 'include/load_prefs.php');
 
     // Iterate sound files for options
 
-    $d = dir('../plugins/newmail/sounds');
+    $d = dir(SM_PATH . 'plugins/newmail/sounds');
     while($entry=$d->read()) {
         $fname = $d->path . "/" . $entry;
         if ($entry != '..' && $entry != '.') {

diff --git a/plugins/squirrelspell/sqspell_config.php b/plugins/squirrelspell/sqspell_config.php
index 7ef16dac153dbb7ad94741ac403aae7a70f2b8ae..2938a407a3110d9e3e5dccd96badf7f254a89eee 100644 (file)
--- a/plugins/squirrelspell/sqspell_config.php
+++ b/plugins/squirrelspell/sqspell_config.php
@@ -10,7 +10,7 @@
  * $Id$
  */
 
-require_once('../functions/prefs.php');
+require_once(SM_PATH . 'functions/prefs.php');
 
 /* Just for poor wretched souls with E_ALL. :) */
 global $username, $data_dir;
@@ -28,7 +28,7 @@ $SQSPELL_WORDS_FILE =
    getHashedFile($username, $data_dir, "$username.words");
 
 $SQSPELL_EREG = 'ereg';
-$SQSPELL_SOUP_NAZI = 'Mozilla/3, Mozilla/2, Opera 4, Opera/4, '
-   . 'Macintosh, OmniWeb';
+#$SQSPELL_SOUP_NAZI = 'Mozilla/3, Mozilla/2, Opera 4, Opera/4, '
+#   . 'Macintosh, OmniWeb';
 
 ?>

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 837cbf8e1e81f5d8ec82ef1d667224266b225a1f..8f42804083bddbff6e06186d15028601e3f580c6 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -34,8 +34,8 @@ define('SM_PATH','../../');
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'include/load_prefs.php');
-require_once($SQSPELL_DIR . 'sqspell_config.php');
-require_once($SQSPELL_DIR . 'sqspell_functions.php');
+require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_config.php');
+require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_functions.php');
     
 /**
  * $MOD is the name of the module to invoke.
@@ -49,6 +49,6 @@ if (!isset($MOD) || !$MOD){
 }
 
 /* Include the module. */
-require_once($SQSPELL_DIR . "modules/$MOD.mod");
+require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
 
 ?>