firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
chicpro
2013-02-01 14:18:01 +09:00
parent c48b3f4ddc cf43f77951
commit 011bc2915a
14 changed files with 31 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.lib.php
View File

@ -112,7 +112,7 @@ function set_cookie($cookie_name, $value, $expire)
{
global $g4;
setcookie(md5($cookie_name), base64_encode($value), $g4['server_time'] + $expire, '/', $g4['cookie_domain']);
setcookie(md5($cookie_name), base64_encode($value), $g4['server_time'] + $expire, '/', G4_COOKIE_DOMAIN);
}

6
lib/outlogin.lib.php
View File

@ -28,7 +28,7 @@ function outlogin($skin_dir='basic')
$is_auth = true;
}
if ($config['cf_https_url']) {
if (G4_HTTPS_DOMAIN) {
$outlogin_url = $_GET['url'];
if ($outlogin_url) {
if (preg_match("/^\.\.\//", $outlogin_url)) {
@ -40,11 +40,11 @@ function outlogin($skin_dir='basic')
$path = urlencode($purl['path']);
$urlencode = preg_replace("/".$path."/", "", $urlencode);
}
$outlogin_url = $g4['url'].$urlencode;
$outlogin_url = G4_URL.$urlencode;
}
}
else {
$outlogin_url = $g4['url'];
$outlogin_url = G4_URL;
}
}
else {