appdb/include filter.php config.php.sample

[WineHQ]

ChangeSet ID:	26326
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2006/07/07 11:39:27

Modified files:
    include        : filter.php config.php.sample

Log message:
    Jonathan Ernst 
    Add an option to prevent filtering of cookies in the case where multiple web apps are hosted
    on the same virtualhost

Patch: http://cvs.winehq.org/patch.py?id=26326

Old revision  New revision  Changes     Path
 1.5           1.6           +4 -11      appdb/include/filter.php
 1.11          1.12          +1 -0       appdb/include/config.php.sample

Index: appdb/include/filter.php
diff -u -p appdb/include/filter.php:1.5 appdb/include/filter.php:1.6
--- appdb/include/filter.php:1.5	7 Jul 2006 16:39:27 -0000
+++ appdb/include/filter.php	7 Jul 2006 16:39:27 -0000
@@ -44,16 +44,8 @@ function filter_gpc()
                     util_show_error_page_and_exit("Fatal error: ".$aKeys[$i]." should be an array.");
             break;
             default:
-                if($aKeys[$i]!="whq_appdb" && // don't filter the appdb session cookie
-
-                   // or any bugzilla cookies
-                   $aKeys[$i]!="BUGLIST" &&
-                   $aKeys[$i]!="DEFAULTFORMAT" &&
-                   $aKeys[$i]!="Bugzilla_login" &&
-                   $aKeys[$i]!="LASTORDER" &&
-                   $aKeys[$i]!="Bugzilla_logincookie" &&
-                   $aKeys[$i]!="DEFAULTFORMAT" &&
-                   $aKeys[$i]!="MAX_FILE_SIZE")
+                // don't filter the AppDB session cookie and MAX_FILE_SIZE
+                if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE")
                 { 
                     util_show_error_page_and_exit("Fatal error: type of variable ".$aKeys[$i]." is not recognized.");
                 }
@@ -66,6 +58,7 @@ function filter_gpc()
     $_REQUEST = array();
     $_POST = array();
     $_GET = array();
-    $_COOKIES = array();
+    if(APPDB_DONT_CLEAR_COOKIES_VAR != "1")
+        $_COOKIES = array();
 }
 ?>
Index: appdb/include/config.php.sample
diff -u -p appdb/include/config.php.sample:1.11 appdb/include/config.php.sample:1.12
--- appdb/include/config.php.sample:1.11	7 Jul 2006 16:39:27 -0000
+++ appdb/include/config.php.sample	7 Jul 2006 16:39:27 -0000
@@ -8,6 +8,7 @@
  * global params
  */
 define("APPDB_DEBUG","0"); //turns debugging on/off
+define("APPDB_DONT_CLEAR_COOKIES_VAR","0"); // set to 1 if you have more than one Web application on the same virtual host
 define("APPDB_THUMBNAIL_WIDTH","128"); // width of the screenshot's thumbnails
 define("APPDB_THUMBNAIL_HEIGHT","128"); // height of the screenshot's thumbnails
 define("APPDB_SCREENSHOT_MAXWIDTH","1024"); // width of the screenshot's thumbnails