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

This commit is contained in:
whitedot
2013-02-01 11:17:12 +09:00
12 changed files with 41 additions and 58 deletions

View File

@ -28,7 +28,7 @@ function outlogin($skin_dir='basic')
$is_auth = true;
}
if ($g4['https_url']) {
if ($config['cf_https_url']) {
$outlogin_url = $_GET['url'];
if ($outlogin_url) {
if (preg_match("/^\.\.\//", $outlogin_url)) {
@ -51,11 +51,7 @@ function outlogin($skin_dir='basic')
$outlogin_url = $urlencode;
}
// 보안서버주소를 적용할 마땅한 방법이 나올때까지 이 코드로 사용한다.
if ($g4['https_url'])
$outlogin_action_url = G4_BBS_URL.'/login_check.php';
else
$outlogin_action_url = G4_BBS_URL.'/login_check.php';
$outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php';
ob_start();
if ($is_member)