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

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

Browse Source
This commit is contained in:
chicpro
2013-05-10 16:38:36 +09:00
parent 9da3fdc6cb b8405d3db7
commit 87a07ed050
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config.php
View File

@ -57,9 +57,18 @@ define('G4_SYNDI_DIR', 'syndi');
if (G4_DOMAIN) { if (G4_DOMAIN) {
define('G4_URL', G4_DOMAIN); define('G4_URL', G4_DOMAIN);
} else { } else {
define('G4_URL', $g4_path['url']); if (isset($g4_path['url'])) {
define('G4_URL', $g4_path['url']);
} else {
define('G4_URL', '');
}
}
if (isset($g4_path['path'])) {
define('G4_PATH', $g4_path['path']);
} else {
define('G4_PATH', '');
} }
define('G4_PATH', $g4_path['path']);
define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR);
define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR);

5
lib/common.lib.php
View File

@ -1987,8 +1987,9 @@ function hyphen_hp_number($hp)
function login_url($url='') function login_url($url='')
{ {
if (!$url) $url = G4_URL; if (!$url) $url = G4_URL;
$p = parse_url($url); //$p = parse_url($url);
return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI']))); //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
return $url;
} }

2
lib/outlogin.lib.php
View File

@ -34,7 +34,7 @@ function outlogin($skin_dir='basic')
$is_auth = true; $is_auth = true;
} }
$outlogin_url = login_url(); $outlogin_url = login_url($urlencode);
$outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php'; $outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php';
ob_start(); ob_start();