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

3
bbs/alert.php
View File

@ -41,7 +41,8 @@ if($error) {
<script>
alert("<? echo $msg; ?>");
document.location.href = "<? echo $url; ?>";
//document.location.href = "<? echo $url; ?>";
document.location.replace("<? echo $url; ?>");
</script>
<noscript>

6
bbs/login.php
View File

@ -24,7 +24,7 @@ if ($url)
else
$urlencode = urlencode($_SERVER['REQUEST_URI']);
if ($config['cf_https_url']) {
if (G4_HTTPS_DOMAIN) {
$login_url = $_GET['url'];
if ($login_url) {
if (preg_match("/^\.\.\//", $url)) {
@ -35,10 +35,10 @@ if ($config['cf_https_url']) {
$path = urlencode($purl['path']);
$urlencode = preg_replace("/".$path."/", "", $urlencode);
}
$login_url = $g4[url].$urlencode;
$login_url = $urlencode;
}
} else {
$login_url = $g4[url];
$login_url = G4_URL;
}
} else {
$login_url = $urlencode;

2
bbs/login_check.php
View File

@ -71,7 +71,7 @@ if ($url) {
}
}
} else {
$link = G4_PATH;
$link = G4_URL;
}
goto_url($link);

6
bbs/memo_form.php
View File

@ -35,11 +35,7 @@ if ($me_recv_mb_id)
$g4['title'] = '쪽지 보내기';
include_once(G4_PATH.'/head.sub.php');
if ($g4['https_url'])
$memo_action_url = "{$g4['https_url']}/{$g4['bbs']}/memo_form_update.php";
else
$memo_action_url = "{$g4['url']}/{$g4['bbs']}/memo_form_update.php";
$memo_action_url = G4_HTTPS_BBS_URL."/memo_form_update.php";
include_once($member_skin_path.'/memo_form.skin.php');
include_once(G4_PATH.'/tail.sub.php');

7
bbs/password_lost.php
View File

@ -9,12 +9,7 @@ if ($is_member) {
$g4['title'] = '회원아이디/패스워드 찾기';
include_once(G4_PATH.'/head.sub.php');
if ($g4['https_url'])
//$action_url = "{$g4['https_url']}/{$g4['bbs']}/password_lost2.php";
$action_url = G4_BBS_URL."/password_lost2.php";
else
$action_url = G4_BBS_URL."/password_lost2.php";
$action_url = G4_HTTPS_BBS_URL."/password_lost2.php";
include_once($member_skin_path.'/password_lost.skin.php');
include_once(G4_PATH.'/tail.sub.php');

5
bbs/write.php
View File

@ -349,10 +349,7 @@ if ($is_guest) {
include_once(G4_PATH.'/head.sub.php');
include_once('./board_head.php');
if ($g4['https_url'])
$action_url = "{$g4['https_url']}/{$g4['bbs']}/write_update.php";
else
$action_url = G4_BBS_URL."/write_update.php";
$action_url = G4_HTTPS_BBS_URL."/write_update.php";
include_once ($board_skin_path.'/write.skin.php');

8
bbs/write_update.php
View File

@ -605,13 +605,9 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai
@include_once ($board_skin_path.'/write_update.skin.php');
@include_once($board_skin_path.'/write_update.tail.skin.php');
if ($g4['https_url'])
$https_url = $g4['url'].'/'.$g4['bbs'];
else
$https_url = '.';
if ($file_upload_msg)
alert($file_upload_msg, $https_url.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr);
alert($file_upload_msg, G4_HTTPS_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr);
else
goto_url($https_url.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr);
goto_url(G4_HTTPS_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr);
?>