From 8e968c9a66add99e882ecf8a10000c6197365d8e Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 3 Jan 2007 15:00:13 +0000
Subject: [PATCH] Some small additions for validators  (we don't want SID
 messing up nice xhtml)

---
 lib/cookieless.php | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/lib/cookieless.php b/lib/cookieless.php
index dc3209393a..e7ca80b330 100644
--- a/lib/cookieless.php
+++ b/lib/cookieless.php
@@ -101,26 +101,32 @@ function sid_process_url($url) {
 */
 function sid_start_ob(){
     global $CFG;
-    //don't attach sess id for google
-    if (!empty($CFG->opentogoogle)) {
-        if (empty($_SESSION['USER'])) {
-            if (!empty($_SERVER['HTTP_USER_AGENT'])) {
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== false ) {
-                    $CFG->usesid=false;
-                    return;
-                }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'google.com') !== false ) {
-                    $CFG->usesid=false;
-                    return;
-                }
+    //don't attach sess id for bots
+
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        if (!empty($CFG->opentogoogle)) {
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== false ) {
+                @ini_set('session.use_trans_sid', '0'); // try and turn off trans_sid
+                $CFG->usesid=false;
+                return;
+            }
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'google.com') !== false ) {
+                @ini_set('session.use_trans_sid', '0'); // try and turn off trans_sid
+                $CFG->usesid=false;
+                return;
             }
         }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') !== false ) {
+            @ini_set('session.use_trans_sid', '0'); // try and turn off trans_sid
+            $CFG->usesid=false;
+            return;
+        }
     }
-    @ini_set("session.use_trans_sid", "true"); // try and turn on trans_sid
-    if (ini_get("session.use_trans_sid")!=0 ){ 
+    @ini_set('session.use_trans_sid', '1'); // try and turn on trans_sid
+    if (ini_get('session.use_trans_sid')!=0 ){ 
         // use trans sid as its available
-        ini_set("url_rewriter.tags", "a=href,area=href,script=src,link=href," 
-            . "frame=src,form=fakeentry");
+        ini_set('url_rewriter.tags', 'a=href,area=href,script=src,link=href,' 
+            . 'frame=src,form=fakeentry');
         ob_start('sid_ob_rewrite_absolute');
     }else{
         //rewrite all links ourselves
-- 
2.39.5