[geeklog-cvs] geeklog-1.3/public_html index.php,1.45,1.46 pollbooth.php,1.17,1.18 users.php,1.61,1.62 usersettings.php,1.56,1.57
geeklog-cvs-admin at lists.geeklog.net
geeklog-cvs-admin at lists.geeklog.net
Thu May 8 13:23:12 EDT 2003
Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv23339/public_html
Modified Files:
index.php pollbooth.php users.php usersettings.php
Log Message:
Made sure all setcookie() calls use all 6 parameters and other changes in another attempt to solve the "www vs. non-www" and related login problems.
Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** index.php 13 Apr 2003 17:14:56 -0000 1.45
--- index.php 8 May 2003 17:23:10 -0000 1.46
***************
*** 47,65 ****
require_once('lib-common.php');
- if (isset ($HTTP_SERVER_VARS['HTTP_HOST']) &&
- !empty ($HTTP_SERVER_VARS['HTTP_HOST'])) {
- preg_match ("/\/\/([^\/]*)/", $_CONF['site_url'], $server);
- if (strcasecmp ($HTTP_SERVER_VARS['HTTP_HOST'], $server[1]) != 0) {
- // this may be a case of a www. vs. non-www. URL ...
- if (!empty ($QUERY_STRING)) {
- $query = '?' . $QUERY_STRING;
- } else {
- $query = '';
- }
- echo COM_refresh ($_CONF['site_url'] . '/index.php' . $query);
- exit;
- }
- }
-
$display = '';
--- 47,50 ----
Index: pollbooth.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/pollbooth.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** pollbooth.php 9 Apr 2003 17:44:51 -0000 1.17
--- pollbooth.php 8 May 2003 17:23:10 -0000 1.18
***************
*** 161,165 ****
empty($HTTP_COOKIE_VARS[$qid])) {
$aid = $HTTP_POST_VARS['aid'];
! setcookie($qid,$aid,time()+$_CONF['pollcookietime']);
$display .= COM_siteHeader() . pollsave();
} else {
--- 161,167 ----
empty($HTTP_COOKIE_VARS[$qid])) {
$aid = $HTTP_POST_VARS['aid'];
! setcookie ($qid, $aid, time() + $_CONF['pollcookietime'],
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
$display .= COM_siteHeader() . pollsave();
} else {
Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** users.php 6 May 2003 10:31:02 -0000 1.61
--- users.php 8 May 2003 17:23:10 -0000 1.62
***************
*** 712,717 ****
COM_accessLog("userid = {$HTTP_COOKIE_VARS[$_CONF["cookie_session"]]} {$LANG04[29]} $REMOTE_ADDR.");
}
! setcookie($_CONF['cookie_session'],'',time() - 10000,$_CONF['cookie_path']);
! setcookie($_CONF['cookie_name'],'',time() - 10000,$_CONF['cookie_path']);
$display = COM_refresh($_CONF['site_url'] . '/index.php?msg=8');
break;
--- 712,720 ----
COM_accessLog("userid = {$HTTP_COOKIE_VARS[$_CONF["cookie_session"]]} {$LANG04[29]} $REMOTE_ADDR.");
}
! setcookie ($_CONF['cookie_session'], '', time() - 10000,
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
! setcookie ($_CONF['cookie_name'], '', time() - 10000, $_CONF['cookie_path'],
! $_CONF['cookiedomain'], $_CONF['cookiesecure']);
$display = COM_refresh($_CONF['site_url'] . '/index.php?msg=8');
break;
***************
*** 867,872 ****
COM_errorLog('Trying to set permanent cookie',1);
}
! setcookie($_CONF['cookie_name'],$_USER['uid'],time() + $cooktime,$_CONF['cookie_path']);
! setcookie($_CONF['cookie_password'],md5($passwd),time() + $cooktime,$_CONF['cookie_path']);
}
} else {
--- 870,879 ----
COM_errorLog('Trying to set permanent cookie',1);
}
! setcookie ($_CONF['cookie_name'], $_USER['uid'],
! time() + $cooktime, $_CONF['cookie_path'],
! $_CONF['cookiedomain'], $_CONF['cookiesecure']);
! setcookie ($_CONF['cookie_password'], md5 ($passwd),
! time() + $cooktime, $_CONF['cookie_path'],
! $_CONF['cookiedomain'], $_CONF['cookiesecure']);
}
} else {
***************
*** 894,898 ****
// If not set it
setcookie ($_CONF['cookie_theme'], $_USER['theme'], time() + 31536000,
! $_CONF['cookie_path']);
if (($HTTP_REFERER) && (strstr ($HTTP_REFERER, '/users.php') === false)) {
--- 901,906 ----
// If not set it
setcookie ($_CONF['cookie_theme'], $_USER['theme'], time() + 31536000,
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
if (($HTTP_REFERER) && (strstr ($HTTP_REFERER, '/users.php') === false)) {
Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** usersettings.php 23 Feb 2003 20:45:09 -0000 1.56
--- usersettings.php 8 May 2003 17:23:10 -0000 1.57
***************
*** 505,511 ****
$A['cooktime'] = 'NULL';
$cooktime = 1000;
! setcookie($_CONF['cookie_name'],$_USER['uid'],time() - $cooktime,$_CONF['cookie_path']);
} else {
! setcookie($_CONF['cookie_name'],$_USER['uid'],time() + $A['cooktime'],$_CONF['cookie_path']);
}
--- 505,515 ----
$A['cooktime'] = 'NULL';
$cooktime = 1000;
! setcookie ($_CONF['cookie_name'], $_USER['uid'], time() - $cooktime,
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
} else {
! setcookie ($_CONF['cookie_name'], $_USER['uid'],
! time() + $A['cooktime'], $_CONF['cookie_path'],
! $_CONF['cookiedomain'], $_CONF['cookiesecure']);
}
***************
*** 682,688 ****
// Save theme, when doing so, put in cookie so we can set the user's theme even when they aren't logged in
DB_query("UPDATE {$_TABLES['users']} SET theme='{$A["theme"]}',language='{$A["language"]}' WHERE uid = {$_USER['uid']}");
! setcookie($_CONF['cookie_theme'],$A['theme'],time() + 31536000,$_CONF['cookie_path']);
! setcookie($_CONF['cookie_language'],$A['language'],time() + 31536000,$_CONF['cookie_path']);
!
DB_query("UPDATE {$_TABLES['userprefs']} SET noicons='{$A['noicons']}', willing='{$A["willing"]}', dfid='{$A["dfid"]}', tzid='{$A["tzid"]}' WHERE uid='{$_USER['uid']}'");
--- 686,696 ----
// Save theme, when doing so, put in cookie so we can set the user's theme even when they aren't logged in
DB_query("UPDATE {$_TABLES['users']} SET theme='{$A["theme"]}',language='{$A["language"]}' WHERE uid = {$_USER['uid']}");
! setcookie ($_CONF['cookie_theme'], $A['theme'], time() + 31536000,
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
! setcookie ($_CONF['cookie_language'], $A['language'], time() + 31536000,
! $_CONF['cookie_path'], $_CONF['cookiedomain'],
! $_CONF['cookiesecure']);
!
DB_query("UPDATE {$_TABLES['userprefs']} SET noicons='{$A['noicons']}', willing='{$A["willing"]}', dfid='{$A["dfid"]}', tzid='{$A["tzid"]}' WHERE uid='{$_USER['uid']}'");
More information about the geeklog-cvs
mailing list