Index: trunk/admin/reviews.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/reviews.php	(.../reviews.php)	(revision 2569)
+++ trunk/admin/reviews.php	(.../reviews.php)	(revision 2772)
@@ -104,7 +104,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
@@ -164,7 +164,7 @@
   if (!admin_login())
   {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/config/edit_customfields.php
===================================================================
diff -u -N -r2581 -r2772
--- trunk/admin/config/edit_customfields.php	(.../edit_customfields.php)	(revision 2581)
+++ trunk/admin/config/edit_customfields.php	(.../edit_customfields.php)	(revision 2772)
@@ -77,7 +77,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/save_redirect.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/save_redirect.php	(.../save_redirect.php)	(revision 2569)
+++ trunk/admin/save_redirect.php	(.../save_redirect.php)	(revision 2772)
@@ -78,7 +78,7 @@
 
 	if( !admin_login() )
 	{
-		if( !headers_sent() ) setcookie('sid',' ',time() - 3600);
+		if( !headers_sent() ) setcookie('sid',' ',time() - 3600, '', $_SERVER['HTTP_HOST']);
 		$objSession->Logout();
 		header("Location: ".$adminURL."/index.php?logout=1");
 		exit;
Index: trunk/admin/config/config_search.php
===================================================================
diff -u -N -r2578 -r2772
--- trunk/admin/config/config_search.php	(.../config_search.php)	(revision 2578)
+++ trunk/admin/config/config_search.php	(.../config_search.php)	(revision 2772)
@@ -77,7 +77,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/advanced_view.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/advanced_view.php	(.../advanced_view.php)	(revision 2569)
+++ trunk/admin/advanced_view.php	(.../advanced_view.php)	(revision 2772)
@@ -104,7 +104,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
@@ -164,7 +164,7 @@
   if (!admin_login())
   {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/kernel/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r2210 -r2772
--- trunk/kernel/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 2210)
+++ trunk/kernel/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 2772)
@@ -67,7 +67,7 @@
 				$object->SetDBField('LastChangeIP', $ip_address);
 			}
 			
-			setcookie('last_module', $object->GetDBField('Module') );
+			setcookie('last_module', $object->GetDBField('Module'), '', SERVER_NAME);
 		}
 	}
 
Index: trunk/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r2210 -r2772
--- trunk/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 2210)
+++ trunk/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 2772)
@@ -67,7 +67,7 @@
 				$object->SetDBField('LastChangeIP', $ip_address);
 			}
 			
-			setcookie('last_module', $object->GetDBField('Module') );
+			setcookie('last_module', $object->GetDBField('Module'), '', SERVER_NAME);
 		}
 	}
 
Index: trunk/admin/include/elements.php
===================================================================
diff -u -N -r1566 -r2772
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 1566)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 2772)
@@ -19,7 +19,7 @@
   if (!admin_login())
   {            
     if(!headers_sent()) {
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     }
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r2556 -r2772
--- trunk/kernel/action.php	(.../action.php)	(revision 2556)
+++ trunk/kernel/action.php	(.../action.php)	(revision 2772)
@@ -28,7 +28,7 @@
 if (!admin_login() && strlen($Action) > 0)
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL.'/index.php?env='.BuildEnv().'&expired=1');
     die();
Index: trunk/admin/users/user_select.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/users/user_select.php	(.../user_select.php)	(revision 2569)
+++ trunk/admin/users/user_select.php	(.../user_select.php)	(revision 2772)
@@ -80,7 +80,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/users/user_list.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/users/user_list.php	(.../user_list.php)	(revision 2569)
+++ trunk/admin/users/user_list.php	(.../user_list.php)	(revision 2772)
@@ -77,7 +77,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/index.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/index.php	(.../index.php)	(revision 2569)
+++ trunk/admin/index.php	(.../index.php)	(revision 2772)
@@ -102,7 +102,7 @@
 {            
     if( !headers_sent() )
     {
-		setcookie('sid"','', time()-3600, $objConfig->Get("Site_Path").'/'.$admin );
+		setcookie('sid"','', time()-3600, $objConfig->Get("Site_Path").'/'.$admin, $_SERVER['HTTP_HOST'] );
     }
     $objSession->Logout();
 	require_once($pathtoroot.$admin."/login.php");
Index: trunk/admin/config/edit_config.php
===================================================================
diff -u -N -r2644 -r2772
--- trunk/admin/config/edit_config.php	(.../edit_config.php)	(revision 2644)
+++ trunk/admin/config/edit_config.php	(.../edit_config.php)	(revision 2772)
@@ -62,7 +62,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/admin/browse.php
===================================================================
diff -u -N -r2569 -r2772
--- trunk/admin/browse.php	(.../browse.php)	(revision 2569)
+++ trunk/admin/browse.php	(.../browse.php)	(revision 2772)
@@ -107,7 +107,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
@@ -179,7 +179,7 @@
   if (!admin_login())
   {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/kernel/startup.php
===================================================================
diff -u -N -r1668 -r2772
--- trunk/kernel/startup.php	(.../startup.php)	(revision 1668)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 2772)
@@ -184,7 +184,7 @@
 	
 	if (!admin_login())
 	{
-	    if( !headers_sent() ) setcookie("sid"," ",time()-3600);
+	    if( !headers_sent() ) setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
 	    $objSession->Logout();
 	    $url_add = isset($_GET['expired']) && $_GET['expired'] ? '?expired=1' : '';
 	    header("Location: ".$adminURL.'/index.php'.$url_add);
Index: trunk/admin/config/module_email.php
===================================================================
diff -u -N -r2581 -r2772
--- trunk/admin/config/module_email.php	(.../module_email.php)	(revision 2581)
+++ trunk/admin/config/module_email.php	(.../module_email.php)	(revision 2772)
@@ -79,7 +79,7 @@
 if (!admin_login())
 {            
     if(!headers_sent())
-      setcookie("sid"," ",time()-3600);
+      setcookie("sid"," ",time()-3600, '', $_SERVER['HTTP_HOST']);
     $objSession->Logout();
     header("Location: ".$adminURL."/index.php?logout=1");
     die();
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r2770 -r2772
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 2770)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 2772)
@@ -34,7 +34,7 @@
 	                    $pw = $_POST["login_password"];
 	                    		if(strlen($pw) < 31) $pw = md5($pw);
 	                    $c .= $pw;
-	                    setcookie("login",$c,time()+2592000);
+	                    setcookie("login",$c,time()+2592000, '', $_SERVER['HTTP_HOST']);
 	                }
 	                
 	               			// set new destination template if passed
@@ -378,7 +378,7 @@
          //unset($objSession);
          //$objSession = new clsUserSession();
 //         $var_list_update["t"] = "index";  
-//         setcookie("login","",time()-3600);
+//         setcookie("login","",time()-3600, '', $_SERVER['HTTP_HOST']);
      break;
      case "m_register":
 	$_POST=inp_escape($_POST);
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -N -r1566 -r2772
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 1566)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 2772)
@@ -3,7 +3,7 @@
 	Copyright 2002, Intechnic Corporation, All rights reserved
 */
 
-setcookie("CookiesTest", "1");
+setcookie("CookiesTest", "1", 0, '', $_SERVER['HTTP_HOST']);
 
 // if branches that uses if($mod_prefix) or like that will never be executed
 // due global variable $mod_prefix is never defined
@@ -842,8 +842,8 @@
    $var_list_update["t"] = "index";  
    $var_list["t"] = "";
    $var_list["sid"]="";
-   setcookie("login","",time()-3600);
-   setcookie("sid","",time()-3600);   
+   setcookie("login","",time()-3600, '', $_SERVER['HTTP_HOST']);
+   setcookie("sid","",time()-3600, '', $_SERVER['HTTP_HOST']);   
 }
 
 $CookieTest = isset($_COOKIE["CookiesTest"]) ? $_COOKIE["CookiesTest"] : '';
@@ -872,7 +872,7 @@
     if(is_numeric($m_var_list["theme"]))       
       $objSession->SetThemeName($m_var_list["theme"]);  
     if($objConfig->Get("CookieSessions")>0 && !$SessionQueryString && !headers_sent())
-        setcookie("sid",$var_list["sid"]);
+        setcookie("sid",$var_list["sid"], 0, '', $_SERVER['HTTP_HOST']);
     //echo "New Session: ".$objSession->GetSessionKey()."<br>\n";
     if(isset($_COOKIE["login"]) && $Action != "m_logout" && $FrontEnd==1)
     {