diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-20 19:19:07 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-20 19:19:07 +0000 |
| commit | 0e9f0ac4ecc636336603cc6932ce21a550c7087e (patch) | |
| tree | fbcfca6602b37f80a51fba1d459f94b3d93ca08f /phpBB/includes/page_header.php | |
| parent | 4887cf1e49daa80a0736d753589c9995d7ddbd4b (diff) | |
| download | forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.gz forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.bz2 forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.tar.xz forums-0e9f0ac4ecc636336603cc6932ce21a550c7087e.zip | |
Mostly changes to turn userdata into user->data, lang into user->lang + bitstring 2nd format + inheritance for permission admin and various other updates/fixes/changes ... note that user->lang & user->theme isn't final
git-svn-id: file:///svn/phpbb/trunk@2958 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/page_header.php')
| -rw-r--r-- | phpBB/includes/page_header.php | 219 |
1 files changed, 106 insertions, 113 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 7bbd33a2a4..49e673e7ff 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -36,22 +36,19 @@ if ( $board_config['gzip_compress'] ) } // Generate logged in/logged out status -if ( $userdata['user_id'] ) +if ( $user->data['user_id'] ) { $u_login_logout = 'login.'.$phpEx. $SID . '&logout=true'; - $l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]'; + $l_login_logout = $user->lang['Logout'] . ' [ ' . $user->data['username'] . ' ]'; } else { $u_login_logout = 'login.'.$phpEx . $SID; - $l_login_logout = $lang['Login']; + $l_login_logout = $user->lang['Login']; } // Last visit date/time -$s_last_visit = ( $userdata['user_id'] ) ? $user->format_date($userdata['session_last_visit']) : ''; - -// Timezone : $user->dst -$s_timezone = ( $userdata['user_dst'] ) ? sprintf($lang['All_times'], $lang[floatval($board_config['board_timezone'])], $lang['tz']['dst']) : sprintf($lang['All_times'], $lang[floatval($board_config['board_timezone'])], ''); +$s_last_visit = ( $user->data['user_id'] ) ? $user->format_date($user->data['session_last_visit']) : ''; // Get users online list $userlist_ary = array(); @@ -64,12 +61,17 @@ $online_userlist = ''; $prev_user_id = 0; $prev_user_ip = ''; -// && $auth->acl_get('forum', 'read', $_GET['f']) -$user_forum_sql = ( empty($_GET['f'])) ? '' : "AND s.session_page LIKE '%f=" . intval($_GET['f']) . "%'"; + +$reading_sql = ''; +if ( !empty($_GET['f']) || !empty($_GET['t']) ) +{ + $reading_sql = "AND s.session_page LIKE '%" . ( ( !empty($_GET['t']) ) ? 't=' . intval($_GET['t']) : 'f=' . intval($_GET['f']) ) . "%'"; +} + $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s WHERE s.session_time >= ".( time() - 300 ) . " - $user_forum_sql + $reading_sql AND u.user_id = s.session_user_id ORDER BY u.username ASC, s.session_ip ASC"; $result = $db->sql_query($sql, false); @@ -77,7 +79,7 @@ $result = $db->sql_query($sql, false); while( $row = $db->sql_fetchrow($result) ) { // User is logged in and therefor not a guest - if ( $row['user_id'] ) + if ($row['user_id'] != ANONYMOUS) { // Skip multiple sessions for one user if ( $row['user_id'] != $prev_user_id ) @@ -120,16 +122,16 @@ while( $row = $db->sql_fetchrow($result) ) if ( empty($online_userlist) ) { - $online_userlist = $lang['None']; + $online_userlist = $user->lang['None']; } if ( empty($_GET['f']) ) { - $online_userlist = $lang['Registered_users'] . ' ' . $online_userlist; + $online_userlist = $user->lang['Registered_users'] . ' ' . $online_userlist; } else { - $l_online = ( $guests_online == 1 ) ? $lang['Browsing_forum_guest'] : $lang['Browsing_forum_guests']; + $l_online = ( $guests_online == 1 ) ? $user->lang['Browsing_forum_guest'] : $user->lang['Browsing_forum_guests']; $online_userlist = sprintf($l_online, $online_userlist, $guests_online); } @@ -153,54 +155,54 @@ if ( $total_online_users > $board_config['record_online_users']) if ( $total_online_users == 0 ) { - $l_t_user_s = $lang['Online_users_zero_total']; + $l_t_user_s = $user->lang['Online_users_zero_total']; } else if ( $total_online_users == 1 ) { - $l_t_user_s = $lang['Online_user_total']; + $l_t_user_s = $user->lang['Online_user_total']; } else { - $l_t_user_s = $lang['Online_users_total']; + $l_t_user_s = $user->lang['Online_users_total']; } if ( $logged_visible_online == 0 ) { - $l_r_user_s = $lang['Reg_users_zero_total']; + $l_r_user_s = $user->lang['Reg_users_zero_total']; } else if ( $logged_visible_online == 1 ) { - $l_r_user_s = $lang['Reg_user_total']; + $l_r_user_s = $user->lang['Reg_user_total']; } else { - $l_r_user_s = $lang['Reg_users_total']; + $l_r_user_s = $user->lang['Reg_users_total']; } if ( $logged_hidden_online == 0 ) { - $l_h_user_s = $lang['Hidden_users_zero_total']; + $l_h_user_s = $user->lang['Hidden_users_zero_total']; } else if ( $logged_hidden_online == 1 ) { - $l_h_user_s = $lang['Hidden_user_total']; + $l_h_user_s = $user->lang['Hidden_user_total']; } else { - $l_h_user_s = $lang['Hidden_users_total']; + $l_h_user_s = $user->lang['Hidden_users_total']; } if ( $guests_online == 0 ) { - $l_g_user_s = $lang['Guest_users_zero_total']; + $l_g_user_s = $user->lang['Guest_users_zero_total']; } else if ( $guests_online == 1 ) { - $l_g_user_s = $lang['Guest_user_total']; + $l_g_user_s = $user->lang['Guest_user_total']; } else { - $l_g_user_s = $lang['Guest_users_total']; + $l_g_user_s = $user->lang['Guest_users_total']; } $l_online_users = sprintf($l_t_user_s, $total_online_users); @@ -208,62 +210,52 @@ $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); $l_online_users .= sprintf($l_g_user_s, $guests_online); -// -// Obtain number of new private messages -// if user is logged in -// -if ( $userdata['user_id'] ) +// Obtain number of new private messages if user is logged in +if ($user->data['user_id'] != ANONYMOUS) { - if ( $userdata['user_new_privmsg'] ) + if ($user->data['user_new_privmsg']) { - $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; - $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); + $l_message_new = ( $user->data['user_new_privmsg'] == 1 ) ? $user->lang['New_pm'] : $user->lang['New_pms']; + $l_privmsgs_text = sprintf($l_message_new, $user->data['user_new_privmsg']); - if ( $userdata['user_last_privmsg'] > $userdata['session_last_visit'] ) + if ( $user->data['user_last_privmsg'] > $user->data['session_last_visit'] ) { $sql = "UPDATE " . USERS_TABLE . " - SET user_last_privmsg = " . $userdata['session_last_visit'] . " - WHERE user_id = " . $userdata['user_id']; + SET user_last_privmsg = " . $user->data['session_last_visit'] . " + WHERE user_id = " . $user->data['user_id']; $db->sql_query($sql); $s_privmsg_new = 1; - $icon_pm = $images['pm_new_msg']; } else { $s_privmsg_new = 0; - $icon_pm = $images['pm_no_new_msg']; } } else { - $l_privmsgs_text = $lang['No_new_pm']; - + $l_privmsgs_text = $user->lang['No_new_pm']; $s_privmsg_new = 0; - $icon_pm = $images['pm_no_new_msg']; } - if ( $userdata['user_unread_privmsg'] ) + if ( $user->data['user_unread_privmsg'] ) { - $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; - $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); + $l_message_unread = ( $user->data['user_unread_privmsg'] == 1 ) ? $user->lang['Unread_pm'] : $user->lang['Unread_pms']; + $l_privmsgs_text_unread = sprintf($l_message_unread, $user->data['user_unread_privmsg']); } else { - $l_privmsgs_text_unread = $lang['No_unread_pm']; + $l_privmsgs_text_unread = $user->lang['No_unread_pm']; } } else { - $icon_pm = $images['pm_no_new_msg']; - $l_privmsgs_text = $lang['Login_check_pm']; + $l_privmsgs_text = $user->lang['Login_check_pm']; $l_privmsgs_text_unread = ''; $s_privmsg_new = 0; } -// // Generate HTML required for Mozilla Navigation bar -// $nav_links_html = ''; /* $nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n"; @@ -283,77 +275,78 @@ foreach ( $nav_links as $nav_item => $nav_array ) } } */ -// + // The following assigns all _common_ variables that may be used at any point // in a template. -// $template->assign_vars(array( - 'SITENAME' => $board_config['sitename'], - 'SITE_DESCRIPTION' => $board_config['site_desc'], - 'PAGE_TITLE' => $page_title, - 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), - 'CURRENT_TIME' => sprintf($lang['Current_time'], $user->format_date(time())), - 'TOTAL_USERS_ONLINE' => $l_online_users, - 'LOGGED_IN_USER_LIST' => $online_userlist, - 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], $user->format_date($board_config['record_online_date'])), - 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, - 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, - 'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new, - - 'PRIVMSG_IMG' => $icon_pm, - - 'L_USERNAME' => $lang['Username'], - 'L_PASSWORD' => $lang['Password'], - 'L_LOGIN_LOGOUT' => $l_login_logout, - 'L_LOGIN' => $lang['Login'], - 'L_LOG_ME_IN' => $lang['Log_me_in'], - 'L_AUTO_LOGIN' => $lang['Log_me_in'], - 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), - 'L_REGISTER' => $lang['Register'], - 'L_PROFILE' => $lang['Profile'], - 'L_SEARCH' => $lang['Search'], - 'L_PRIVATEMSGS' => $lang['Private_Messages'], - 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], - 'L_MEMBERLIST' => $lang['Memberlist'], - 'L_FAQ' => $lang['FAQ'], - 'L_USERGROUPS' => $lang['Usergroups'], - 'L_SEARCH_NEW' => $lang['Search_new'], - 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], - 'L_SEARCH_SELF' => $lang['Search_your_posts'], - - 'U_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&search_id=unanswered', - 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&search_id=egosearch', - 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&search_id=newposts', - 'U_INDEX' => 'index.'.$phpEx.$SID, - 'U_REGISTER' => 'profile.'.$phpEx.$SID.'&mode=register', - 'U_PROFILE' => 'profile.'.$phpEx.$SID.'&mode=editprofile', - 'U_PRIVATEMSGS' => 'privmsg.'.$phpEx.$SID.'&folder=inbox', - 'U_PRIVATEMSGS_POPUP' => 'privmsg.'.$phpEx.$SID.'&mode=newpm', - 'U_SEARCH' => 'search.'.$phpEx.$SID, - 'U_MEMBERLIST' => 'memberlist.'.$phpEx.$SID, - 'U_MODCP' => 'modcp.'.$phpEx.$SID, - 'U_FAQ' => 'faq.'.$phpEx.$SID, - 'U_VIEWONLINE' => 'viewonline.'.$phpEx.$SID, - 'U_LOGIN_LOGOUT' => $u_login_logout, + 'SITENAME' => $board_config['sitename'], + 'SITE_DESCRIPTION' => $board_config['site_desc'], + 'PAGE_TITLE' => $page_title, + 'LAST_VISIT_DATE' => sprintf($user->lang['You_last_visit'], $s_last_visit), + 'CURRENT_TIME' => sprintf($user->lang['Current_time'], $user->format_date(time())), + 'TOTAL_USERS_ONLINE' => $l_online_users, + 'LOGGED_IN_USER_LIST' => $online_userlist, + 'RECORD_USERS' => sprintf($user->lang['Record_online_users'], $board_config['record_online_users'], $user->format_date($board_config['record_online_date'])), + 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, + 'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new, + 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, + + 'L_USERNAME' => $user->lang['Username'], + 'L_PASSWORD' => $user->lang['Password'], + 'L_LOGIN_LOGOUT' => $l_login_logout, + 'L_LOGIN' => $user->lang['Login'], + 'L_LOG_ME_IN' => $user->lang['Log_me_in'], + 'L_AUTO_LOGIN' => $user->lang['Log_me_in'], + 'L_INDEX' => sprintf($user->lang['Forum_Index'], $board_config['sitename']), + 'L_FAQ' => $user->lang['FAQ'], + 'L_REGISTER' => $user->lang['Register'], + 'L_PROFILE' => $user->lang['Profile'], + 'L_SEARCH' => $user->lang['Search'], + 'L_PRIVATEMSGS' => $user->lang['Private_Messages'], + 'L_MEMBERLIST' => $user->lang['Memberlist'], + 'L_USERGROUPS' => $user->lang['Usergroups'], + 'L_SEARCH_NEW' => $user->lang['Search_new'], + 'L_SEARCH_SELF' => $user->lang['Search_your_posts'], + 'L_WHO_IS_ONLINE' => $user->lang['Who_is_Online'], + 'L_SEARCH_UNANSWERED' => $user->lang['Search_unanswered'], + + 'U_PRIVATEMSGS' => 'privmsg.'.$phpEx.$SID.'&folder=inbox', + 'U_MEMBERLIST' => 'memberlist.'.$phpEx.$SID, + 'U_VIEWONLINE' => 'viewonline.'.$phpEx.$SID, 'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID, - 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID, - - 'S_USER_LOGGED_IN' => ( $userdata['user_id'] ) ? true : false, - 'S_USER_PM_POPUP' => ( !empty($userdata['user_popup_pm']) ) ? true : false, - 'S_USER_BROWSER' => $userdata['session_browser'], - 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], - 'S_CONTENT_ENCODING' => $lang['ENCODING'], - 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], - 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], - 'S_TIMEZONE' => $s_timezone, - 'S_LOGIN_ACTION' => 'login.'.$phpEx.$SID, - - 'T_STYLESHEET_DATA' => $theme['css_data'], - 'T_STYLESHEET_LINK' => 'templates/' . $theme['css_external'], + 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID, + 'U_LOGIN_LOGOUT'=> $u_login_logout, + 'U_INDEX' => 'index.'.$phpEx.$SID, + 'U_SEARCH' => 'search.'.$phpEx.$SID, + 'U_REGISTER' => 'profile.'.$phpEx.$SID.'&mode=register', + 'U_PROFILE' => 'profile.'.$phpEx.$SID.'&mode=editprofile', + 'U_MODCP' => 'modcp.'.$phpEx.$SID, + 'U_FAQ' => 'faq.'.$phpEx.$SID, + 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&search_id=egosearch', + 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&search_id=newposts', + 'U_PRIVATEMSGS_POPUP' => 'privmsg.'.$phpEx.$SID.'&mode=newpm', + 'U_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&search_id=unanswered', + + 'S_USER_LOGGED_IN' => ( $user->data['user_id'] ) ? true : false, + 'S_USER_PM_POPUP' => ( !empty($user->data['user_popup_pm']) ) ? true : false, + 'S_USER_BROWSER' => $user->data['session_browser'], + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'], + 'S_LOGIN_ACTION' => 'login.'.$phpEx.$SID, + 'S_TIMEZONE' => ( $user->data['user_dst'] ) ? sprintf($user->lang['All_times'], $user->lang[floatval($board_config['board_timezone'])], $user->lang['tz']['dst']) : sprintf($user->lang['All_times'], $user->lang[floatval($board_config['board_timezone'])], ''), + + 'T_STYLESHEET_DATA' => $user->theme['css_data'], + 'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'], 'NAV_LINKS' => $nav_links_html) ); +/*if ( $board_config['send_encoding'] ) +{ + header ('Content-type: text/html; charset: ' . $user->lang['ENCODING']); +}*/ header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT'); header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |