Added support for Yahoo and MSN Search

diff --git a/lib/setup.php b/lib/setup.php
index bfb55dcd30f5f6521385476ef6a2a220cbb315b0..5f127b8862b15a1d1fc38e89d36de8d3dd261a21 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -476,16 +476,19 @@ $CFG->os = PHP_OS;
     moodle_setlocale();
 
     if (!empty($CFG->opentogoogle)) {
-        if (empty($_SESSION['USER'])) {
+        if (empty($_SESSION['USER'])) {  // Ignore anyone logged in
             if (!empty($_SERVER['HTTP_USER_AGENT'])) {
                 if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== false ) {
                     $USER = guest_user();
-                }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'google.com') !== false ) {
+                } else if (strpos($_SERVER['HTTP_USER_AGENT'], 'google.com') !== false ) {
+                    $USER = guest_user();
+                } else if (strpos($_SERVER['HTTP_USER_AGENT'], 'Yahoo! Slurp') !== false ) {
+                    $USER = guest_user();
+                } else if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSNBOT') !== false ) {
                     $USER = guest_user();
                 }
             }
-            if (empty($_SESSION['USER']) and !empty($_SERVER['HTTP_REFERER'])) {
+            if (empty($USER) && !empty($_SERVER['HTTP_REFERER'])) {
                 if (strpos($_SERVER['HTTP_REFERER'], 'google') !== false ) {
                     $USER = guest_user();
                 } else if (strpos($_SERVER['HTTP_REFERER'], 'altavista') !== false ) {