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-20 11:10:15 +09:00
parent 3ca6b9c377 d64f754c5f
commit e779a85688
18 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common.lib.php
View File

@ -114,7 +114,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);
}
@ -402,7 +402,7 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
$list['comment_href'] = $list['href'];
$list['icon_new'] = '';
if ($list['wr_datetime'] >= date("Y-m-d H:i:s", $g4['server_time'] - ($board['bo_new'] * 3600)))
if ($list['wr_datetime'] >= date("Y-m-d H:i:s", G4_SERVER_TIME - ($board['bo_new'] * 3600)))
$list['icon_new'] = '<img src="'.$skin_url.'/img/icon_new.gif" alt="새글">';
$list['icon_hot'] = '';

6
lib/mailer.lib.php
View File

@ -114,7 +114,7 @@ function verify_email($address, &$error)
// 220 메세지들은 건너뜀
// 3초가 지나도 응답이 없으면 포기
socket_set_blocking($fp, false);
$stoptime = $g4['server_time'] + $WAIT_SECOND;
$stoptime = G4_SERVER_TIME + $WAIT_SECOND;
$gotresponse = false;
while (true) {
@ -123,11 +123,11 @@ function verify_email($address, &$error)
if (substr($line, 0, 3) == '220') {
// 타이머를 초기화
$stoptime = $g4['server_time'] + $WAIT_SECOND;
$stoptime = G4_SERVER_TIME + $WAIT_SECOND;
$gotresponse = true;
} else if ($line == '' && $gotresponse)
break;
else if ($g4['server_time'] > $stoptime)
else if (G4_SERVER_TIME > $stoptime)
break;
}