From 6b7b082123d1487e49d10a129ab644987e36cf5e Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 4 May 2003 00:00:26 +0000 Subject: [PATCH] we commit thy source code to the trash, sectors to sectors, bytes to bytes, bits to bits. git-svn-id: file:///svn/phpbb/trunk@3970 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/page_header.php | 304 --------------------------------- phpBB/includes/page_tail.php | 64 ------- 2 files changed, 368 deletions(-) delete mode 100644 phpBB/includes/page_header.php delete mode 100644 phpBB/includes/page_tail.php diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php deleted file mode 100644 index 5801042a91..0000000000 --- a/phpBB/includes/page_header.php +++ /dev/null @@ -1,304 +0,0 @@ -data['user_id'] != ANONYMOUS) -{ - $u_login_logout = 'ucp.'.$phpEx. $SID . '&mode=logout'; - $l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']); -} -else -{ - $u_login_logout = 'ucp.'.$phpEx . $SID . '&mode=login'; - $l_login_logout = $user->lang['LOGIN']; -} - -// Last visit date/time -$s_last_visit = ($user->data['user_id'] != ANONYMOUS) ? $user->format_date($user->data['session_last_visit']) : ''; - -// Get users online list ... if required -$l_online_users = $online_userlist = $l_online_record = ''; -if (!empty($config['load_online']) && !empty($config['load_online_time'])) -{ - $userlist_ary = $userlist_visible = array(); - $logged_visible_online = $logged_hidden_online = $guests_online = 0; - - $prev_user_id = 0; - $prev_user_ip = $reading_sql = ''; - if (!empty($_REQUEST['f'])) - { - $reading_sql = "AND s.session_page LIKE '%f=" . intval($_REQUEST['f']) . "%'"; - } - - $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip, s.session_allow_viewonline - FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s - WHERE s.session_time >= " . (time() - (intval($config['load_online_time']) * 60)) . " - $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); - - while ($row = $db->sql_fetchrow($result)) - { - // User is logged in and therefor not a guest - if ($row['user_id'] != ANONYMOUS) - { - // Skip multiple sessions for one user - if ($row['user_id'] != $prev_user_id) - { - if ($row['user_colour']) - { - $row['username'] = '' . $row['username'] . ''; - } - - if ($row['user_allow_viewonline'] && $row['session_allow_viewonline']) - { - $user_online_link = $row['username']; - $logged_visible_online++; - } - else - { - $user_online_link = '' . $row['username'] . ''; - $logged_hidden_online++; - } - - if ($row['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) - { - $user_online_link = '' . $user_online_link . ''; - $online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link; - } - } - - $prev_user_id = $row['user_id']; - } - else - { - // Skip multiple sessions for one user - if ($row['session_ip'] != $prev_session_ip) - { - $guests_online++; - } - } - - $prev_session_ip = $row['session_ip']; - } - - if ($online_userlist == '') - { - $online_userlist = $user->lang['NONE']; - } - - if (empty($_REQUEST['f'])) - { - $online_userlist = $user->lang['Registered_users'] . ' ' . $online_userlist; - } - else - { - $l_online = ($guests_online == 1) ? $user->lang['Browsing_forum_guest'] : $user->lang['Browsing_forum_guests']; - $online_userlist = sprintf($l_online, $online_userlist, $guests_online); - } - - $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; - - if ($total_online_users > $config['record_online_users']) - { - set_config('record_online_users', $total_online_users, TRUE); - set_config('record_online_date', time(), TRUE); - } - - // Build online listing - $vars_online = array( - 'ONLINE'=> array('total_online_users', 'l_t_user_s'), - 'REG' => array('logged_visible_online', 'l_r_user_s'), - 'HIDDEN'=> array('logged_hidden_online', 'l_h_user_s'), - 'GUEST' => array('guests_online', 'l_g_user_s') - ); - - foreach ($vars_online as $l_prefix => $var_ary) - { - switch ($$var_ary[0]) - { - case 0: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_ZERO_TOTAL']; - break; - - case 1: - $$var_ary[1] = $user->lang[$l_prefix . '_USER_TOTAL']; - break; - - default: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_TOTAL']; - break; - } - } - unset($vars_online); - - $l_online_users = sprintf($l_t_user_s, $total_online_users); - $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); - $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date'])); - $l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES'; - $l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']); -} - -// Obtain number of new private messages if user is logged in -if ($user->data['user_id'] != ANONYMOUS) -{ - if ($user->data['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 ($user->data['user_last_privmsg'] > $user->data['session_last_visit']) - { - $sql = "UPDATE " . USERS_TABLE . " - SET user_last_privmsg = " . $user->data['session_last_visit'] . " - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - $s_privmsg_new = 1; - } - else - { - $s_privmsg_new = 0; - } - } - else - { - $l_privmsgs_text = $user->lang['No_new_pm']; - $s_privmsg_new = 0; - } - - if ($user->data['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 = $user->lang['No_unread_pm']; - } -} - -// Generate HTML required for Mozilla Navigation bar -$nav_links_html = ''; -/* -$nav_link_proto = '' . "\n"; -foreach ($nav_links as $nav_item => $nav_array) -{ - if (!empty($nav_array['url'])) - { - $nav_links_html .= sprintf($nav_link_proto, $nav_item, $nav_array['url'], $nav_array['title']); - } - else - { - // We have a nested array, used for items like that can occur more than once. - foreach ($nav_array as $key => $nested_array) - { - $nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']); - } - } -} -*/ - -// Which timezone? -$tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone'])); - -// The following assigns all _common_ variables that may be used at any point -// in a template. -$template->assign_vars(array( - 'SITENAME' => $config['sitename'], - 'SITE_DESCRIPTION' => $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' => $l_online_record, - 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, - 'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new, - 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, - - 'L_LOGIN_LOGOUT' => $l_login_logout, - 'L_INDEX' => $user->lang['FORUM_INDEX'], - 'L_ONLINE_EXPLAIN' => $l_online_time, - - 'U_PRIVATEMSGS' => 'ucp.'.$phpEx.$SID.'&mode=pm&folder=inbox', - 'U_MEMBERLIST' => 'memberlist.'.$phpEx.$SID, - 'U_VIEWONLINE' => 'viewonline.'.$phpEx.$SID, - 'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID, - 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID, - 'U_LOGIN_LOGOUT'=> $u_login_logout, - 'U_INDEX' => 'index.'.$phpEx.$SID, - 'U_SEARCH' => 'search.'.$phpEx.$SID, - 'U_REGISTER' => 'ucp.'.$phpEx.$SID.'&mode=register', - 'U_PROFILE' => 'ucp.'.$phpEx.$SID.'&mode=editprofile', - 'U_MODCP' => 'mcp.'.$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_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&search_id=unanswered', - - 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? 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_TIMEZONE' => ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang[$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang[$tz], ''), - 'S_DISPLAY_ONLINE_LIST' => (!empty($config['load_online'])) ? 1 : 0, - 'S_DISPLAY_SEARCH' => (!empty($config['load_search'])) ? 1 : 0, - 'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0, - 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, - - 'T_STYLESHEET_DATA' => $user->theme['css_data'], - 'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'], - - 'NAV_LINKS' => $nav_links_html) -); - -if ($config['send_encoding']) -{ - header ('Content-type: text/html; charset: ' . $user->lang['ENCODING']); -} -header ('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0'); -header ('Expires: 0'); -header ('Pragma: no-cache'); - -?> \ No newline at end of file diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php deleted file mode 100644 index 2d7b15a8bf..0000000000 --- a/phpBB/includes/page_tail.php +++ /dev/null @@ -1,64 +0,0 @@ -sql_close(); - -// Unload cache -if (!empty($cache)) -{ - $cache->unload(); -} - -// Output page creation time -if (defined('DEBUG')) -{ - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - if (!empty($_REQUEST['explain']) && $auth->acl_get('a_')) - { - echo $db->sql_report; - echo "
Page generated in $totaltime seconds with " . $db->num_queries . " queries,\nspending " . $db->sql_time . ' doing SQL queries and ' . ($totaltime - $db->sql_time) . ' doing PHP things.
'; - - exit; - } - - $debug_output = sprintf('

[ Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . ( ( $config['gzip_compress'] ) ? 'On' : 'Off' ) . ' | Load : ' . (($user->load) ? $user->load : 'N/A'), $totaltime); - - if ($auth->acl_get('a_')) - { - $debug_output .= ' | Explain'; - } - $debug_output .= ' ]'; -} - -$template->assign_vars(array( - 'PHPBB_VERSION' => $config['version'], - 'ADMIN_LINK' => ($auth->acl_get('a_')) ? sprintf($user->lang['ACP'], '', '') . '

' : '', - 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '' -)); - - -$template->display('body'); - -exit; -?> \ No newline at end of file