Menu
▾
▴
[osbb-commits Mailing List] osbb/lib functions.inc.php,1.15,1.16
|
From: Sven <bra...@us...> - 2005-01-06 14:12:31
|
Update of /cvsroot/osbb/osbb/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11452/lib Modified Files: functions.inc.php Log Message: Added timezone and daylight saving time support Index: functions.inc.php =================================================================== RCS file: /cvsroot/osbb/osbb/lib/functions.inc.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** functions.inc.php 5 Jan 2005 16:20:03 -0000 1.15 --- functions.inc.php 6 Jan 2005 14:12:19 -0000 1.16 *************** *** 84,88 **** */ function getUserData($userid){ ! global $sql; $res = $sql->fetch_query("SELECT * FROM ".TABLE_USERS." AS u LEFT JOIN ".TABLE_GROUP_COMBINATION_CACHE." AS gc ON (u.usergroupcid = gc.groupcid) --- 84,88 ---- */ function getUserData($userid){ ! global $sql,$config; $res = $sql->fetch_query("SELECT * FROM ".TABLE_USERS." AS u LEFT JOIN ".TABLE_GROUP_COMBINATION_CACHE." AS gc ON (u.usergroupcid = gc.groupcid) *************** *** 98,101 **** --- 98,102 ---- if(!isset($userdata['modpermissions'])) $userdata['modpermissioncache'] = array(); else $userdata['modpermissioncache'] = unserialize($userdata['modpermissions']); + if(empty($userdata['usertimezone'])) $userdata['usertimezone'] = $config['timezone']; return $userdata; } *************** *** 108,112 **** */ function getGuestUserData(){ ! global $sql,$config,$_COOKIE; $userdata = $sql->fetch_query("SELECT * FROM ".TABLE_GROUP_COMBINATION_CACHE." WHERE groupcid = 4"); $userdata['grouppermissioncache'] = unserialize($userdata['grouppermissioncache']); --- 109,113 ---- */ function getGuestUserData(){ ! global $sql,$config,$_COOKIE,$config; $userdata = $sql->fetch_query("SELECT * FROM ".TABLE_GROUP_COMBINATION_CACHE." WHERE groupcid = 4"); $userdata['grouppermissioncache'] = unserialize($userdata['grouppermissioncache']); *************** *** 115,118 **** --- 116,120 ---- $userdata['userblocked'] = 0; $userdata['useractivated'] = 1; + $userdata['usertimezone'] = $config['timezone']; if(isset($_COOKIE['osbb_guestlastlogin'])) $userdata['userlastlogin'] = $_COOKIE['osbb_guestlastlogin']; else{ *************** *** 408,441 **** desc: prepares an array with all (sub)boards in $boardcache of the board $boardpid. */ - /*function makeBoards($boardpid=0,$depth=0){ - global $boardcache,$sql,$userdata,$template,$lang,$s; - $return = array(); - $i = 0; - if (!is_array($boardcache[$boardpid])) return ''; - while (list($sortno,$boardcache2) = each($boardcache[$boardpid])){ - while (list($boardid,$row) = each($boardcache2)){ - if (!checkBoardPermission('can_see_board',$boardid,0)) continue; - /*if (!checkBoardPermission('can_view_board',$boardid,0)) eval("\$newold = \"".$template->get("board_closed")."\";"); - elseif ($row['old'] == 1) eval("\$newold = \"".$template->get("board_old")."\";"); - else eval("\$newold = \"".$template->get("board_new")."\";");*/ - /*if($row['boardsubboards'] != '' && $depth+1 >= 2 && checkBoardPermission('can_view_board',$boardid,0)) $subboards = makeSubBoards($row['boardid']); - elseif ($row['boardsubboards'] != '' && $depth+1 >= 2 && !checkBoardPermission('can_view_board',$boardid,0)) $subboards = $lang->lang['index_subboards_closed']; - if ($row['boardtype'] == BOARD_BOARD){ - if($row['boardlastpostid'] == 0) $lastpost = $lang->lang['board_nolastpost']; - else $lastpost = makeLastThread($row['boardlastpostid'],$row['threadtopic'],$row['boardlastposterid'],$row['boardlastpostername'],$row['posttime'],$row['threadboardid'],$row['threadid']); - if(!isset($subboards)) $subboards = 0; - //eval("\$return .= \"".$template->get("index_board_".$depth)."\";"); - $return[$i] = $row; - }elseif ($row['boardtype'] == BOARD_CAT){ - //eval("\$return .= \"".$template->get("index_cat_".$depth)."\";"); - $return[$i] = $row; - } - $i++; - $subboards = ''; - if($row['boardsubboards'] != '' && $depth+1 <= 1) $return[] = makeBoards($row['boardid'],$depth+1); - }#end while 1 - }#end while 2 - return $return; - }#end function*/ function makeBoards($boardpid=0,$depth=0){ --- 410,413 ---- *************** *** 534,540 **** if(empty($userdata['userdateformat'])) $userdata['userdateformat'] = $config['dateformat']; if(empty($userdata['usertimeformat'])) $userdata['usertimeformat'] = $config['timeformat']; ! if($showdate == 1) $date = formatDate2($userdata['userdateformat'],$time); else $date = ''; ! if($showtime == 1) $time = formatTime($userdata['usertimeformat'],$time); else $time = ''; if($showtime == 1 && $showdate == 0) return $time; --- 506,515 ---- if(empty($userdata['userdateformat'])) $userdata['userdateformat'] = $config['dateformat']; if(empty($userdata['usertimeformat'])) $userdata['usertimeformat'] = $config['timeformat']; ! $timezone = 3600*intval($userdata['usertimezone']); ! $time = $time+$timezone; ! $time2 = time()+3600*(intval($userdata['usertimezone'])+date("I")); ! if($showdate == 1) $date = formatDate2($userdata['userdateformat'],$time,$time2); else $date = ''; ! if($showtime == 1) $time = formatTime($userdata['usertimeformat'],$time,$timezone); else $time = ''; if($showtime == 1 && $showdate == 0) return $time; *************** *** 544,565 **** /* name: formatDate2 ! params: var $format, int $time return: var desc: formats the date $time with $format */ ! function formatDate2($format,$time){ global $lang; ! if(date('d.M.Y',$time) == date('d.M.Y')) return $lang->lang['today']; ! elseif(date('M.Y',$time) == date('M.Y') && date('d',$time) == (date('d')-1)) return $lang->lang['yesterday']; ! else return date($format,$time); } /* name: formatTime ! params: var $format, int $time return: var desc: does the same as formatDate2 but formats a time */ ! function formatTime($format,$time){ ! return date(str_replace('B',gmdate('B',$time),$format),$time); } --- 519,540 ---- /* name: formatDate2 ! params: var $format, int $time, int $time2 return: var desc: formats the date $time with $format */ ! function formatDate2($format,$time,$time2){ global $lang; ! if(gmdate('d.M.Y',$time) == gmdate('d.M.Y',$time2)) return $lang->lang['today']; ! elseif(gmdate('M.Y',$time) == gmdate('M.Y',$time2) && gmdate('d',$time) == (gmdate('d',$time2)-1)) return $lang->lang['yesterday']; ! else return gmdate($format,$time); } /* name: formatTime ! params: var $format, int $time, int $time2 return: var desc: does the same as formatDate2 but formats a time */ ! function formatTime($format,$time,$timezone){ ! return gmdate(str_replace('B',gmdate('B',$time-$timezone),$format),$time); } *************** *** 770,773 **** --- 745,749 ---- if($title == '') $title = $config['boardname']; else $title = $config['boardname'].' '.$config['titleseperator'].' '.$title; + eval("\$timezone = \"".$lang->get4eval('timezone')."\";"); $template->assignVar('html','body',$body); $template->assignVar('html','langname',$lang->lang['langname']); *************** *** 778,781 **** --- 754,758 ---- $template->assignVar('html','userid',$userid); $template->assignVar('html','version',VERSION); + $template->assignVar('html','timezone',$timezone); $template->get('html'); $sql->close(); //close sql connection |
