Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes functions_validate.php,1.7,1.8 page_header.php,1.107,1.108 page_tail.php,1.29,1.30
|
From: Paul S. O. <ps...@us...> - 2002-07-14 14:41:59
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv14468/includes
Modified Files:
functions_validate.php page_header.php page_tail.php
Log Message:
Same as last commits, updates for various changes
Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_validate.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** functions_validate.php 20 Apr 2002 00:22:29 -0000 1.7
--- functions_validate.php 14 Jul 2002 14:41:55 -0000 1.8
***************
*** 9,13 ****
* $Id$
*
- *
***************************************************************************/
--- 9,12 ----
***************
*** 19,23 ****
* (at your option) any later version.
*
- *
***************************************************************************/
--- 18,21 ----
***************
*** 36,47 ****
FROM " . USERS_TABLE . "
WHERE LOWER(username) = '" . strtolower($username) . "'";
! if ( $result = $db->sql_query($sql) )
{
! if ( $row = $db->sql_fetchrow($result) )
{
! if ( ( $userdata['session_logged_in'] && $row['username'] != $userdata['username'] ) || !$userdata['session_logged_in'] )
! {
! return array('error' => true, 'error_msg' => $lang['Username_taken']);
! }
}
}
--- 34,44 ----
FROM " . USERS_TABLE . "
WHERE LOWER(username) = '" . strtolower($username) . "'";
! $result = $db->sql_query($sql);
!
! if ( $row = $db->sql_fetchrow($result) )
{
! if ( ( $userdata['session_logged_in'] && $row['username'] != $userdata['username'] ) || !$userdata['session_logged_in'] )
{
! return array('error' => true, 'error_msg' => $lang['Username_taken']);
}
}
***************
*** 50,71 ****
FROM " . GROUPS_TABLE . "
WHERE LOWER(group_name) = '" . strtolower($username) . "'";
! if ( $result = $db->sql_query($sql) )
{
! if ( $row = $db->sql_fetchrow($result) )
! {
! return array('error' => true, 'error_msg' => $lang['Username_taken']);
! }
}
$sql = "SELECT disallow_username
FROM " . DISALLOW_TABLE;
! if ( $result = $db->sql_query($sql) )
{
! while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
! {
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
! }
}
}
--- 47,66 ----
FROM " . GROUPS_TABLE . "
WHERE LOWER(group_name) = '" . strtolower($username) . "'";
! $result = $db->sql_query($sql);
!
! if ( $row = $db->sql_fetchrow($result) )
{
! return array('error' => true, 'error_msg' => $lang['Username_taken']);
}
$sql = "SELECT disallow_username
FROM " . DISALLOW_TABLE;
! $result = $db->sql_query($sql);
!
! while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['disallow_username'])) . ')\b#i', $username) )
{
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
}
}
***************
*** 73,84 ****
$sql = "SELECT word
FROM " . WORDS_TABLE;
! if ( $result = $db->sql_query($sql) )
{
! while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'])) . ")\b#i", $username) )
! {
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
! }
}
}
--- 68,78 ----
$sql = "SELECT word
FROM " . WORDS_TABLE;
! $result = $db->sql_query($sql);
!
! while( $row = $db->sql_fetchrow($result) )
{
! if ( preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['word'])) . ')\b#i', $username) )
{
! return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
}
}
***************
*** 107,119 ****
$sql = "SELECT ban_email
FROM " . BANLIST_TABLE;
! if ( $result = $db->sql_query($sql) )
{
! while( $row = $db->sql_fetchrow($result) )
{
! $match_email = str_replace('*', '.*?', $row['ban_email']);
! if ( preg_match('/^' . $match_email . '$/is', $email) )
! {
! return array('error' => true, 'error_msg' => $lang['Email_banned']);
! }
}
}
--- 101,112 ----
$sql = "SELECT ban_email
FROM " . BANLIST_TABLE;
! $result = $db->sql_query($sql);
!
! while( $row = $db->sql_fetchrow($result) )
{
! $match_email = str_replace('*', '.*?', $row['ban_email']);
! if ( preg_match('/^' . $match_email . '$/is', $email) )
{
! return array('error' => true, 'error_msg' => $lang['Email_banned']);
}
}
***************
*** 122,129 ****
FROM " . USERS_TABLE . "
WHERE user_email = '" . str_replace("\'", "''", $email) . "'";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain user email information.", "", __LINE__, __FILE__, $sql);
! }
if ( $row = $db->sql_fetchrow($result) )
--- 115,119 ----
FROM " . USERS_TABLE . "
WHERE user_email = '" . str_replace("\'", "''", $email) . "'";
! $result = $db->sql_query($sql);
if ( $row = $db->sql_fetchrow($result) )
***************
*** 163,167 ****
// website has to start with http://, followed by something with length at least 3 that
// contains at least one dot.
! if ( $website != "" )
{
if ( !preg_match('#^http:\/\/#i', $website) )
--- 153,157 ----
// website has to start with http://, followed by something with length at least 3 that
// contains at least one dot.
! if ( $website != '' )
{
if ( !preg_match('#^http:\/\/#i', $website) )
***************
*** 179,181 ****
}
! ?>
--- 169,171 ----
}
! ?>
\ No newline at end of file
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** page_header.php 20 Apr 2002 00:22:29 -0000 1.107
--- page_header.php 14 Jul 2002 14:41:55 -0000 1.108
***************
*** 9,13 ****
* $Id$
*
- *
***************************************************************************/
--- 9,12 ----
***************
*** 23,27 ****
if ( !defined('IN_PHPBB') )
{
! die("Hacking attempt");
}
--- 22,26 ----
if ( !defined('IN_PHPBB') )
{
! die('Hacking attempt');
}
***************
*** 36,40 ****
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' )
{
if ( extension_loaded('zlib') )
--- 35,39 ----
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
{
if ( extension_loaded('zlib') )
***************
*** 53,57 ****
ob_implicit_flush(0);
! header('Content-Encoding: gzip');
}
}
--- 52,56 ----
ob_implicit_flush(0);
! header("Content-Encoding: gzip");
}
}
***************
*** 60,73 ****
//
- // Parse and show the overall header.
- //
- $template->set_filenames(array(
- 'overall_header' => ( empty($gen_simple_header) ) ? 'overall_header.tpl' : 'simple_header.tpl')
- );
-
- //
// Generate logged in/logged out status
//
! if ( $userdata['session_logged_in'] )
{
$u_login_logout = 'login.'.$phpEx.'?logout=true';
--- 59,65 ----
//
// Generate logged in/logged out status
//
! if ( $userdata['user_id'] != ANONYMOUS )
{
$u_login_logout = 'login.'.$phpEx.'?logout=true';
***************
*** 80,84 ****
}
! $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';
//
--- 72,76 ----
}
! $s_last_visit = ( $userdata['user_id'] != ANONYMOUS ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';
//
***************
*** 86,100 ****
// situation
//
! $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = $forum_id" : '';
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
! FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
AND s.session_time >= ".( time() - 300 ) . "
$user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC";
! if( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql);
! }
$userlist_ary = array();
--- 78,89 ----
// situation
//
! $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page LIKE '%f=$forum_id%'" : '';
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_ip
! FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
WHERE u.user_id = s.session_user_id
AND s.session_time >= ".( time() - 300 ) . "
$user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC";
! $result = $db->sql_query($sql);
$userlist_ary = array();
***************
*** 112,140 ****
{
// User is logged in and therefor not a guest
! if ( $row['session_logged_in'] )
{
// Skip multiple sessions for one user
if ( $row['user_id'] != $prev_user_id )
{
! $style_color = '';
! if ( $row['user_level'] == ADMIN )
{
! $row['username'] = '<b>' . $row['username'] . '</b>';
! $style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
! }
! else if ( $row['user_level'] == MOD )
! {
! $row['username'] = '<b>' . $row['username'] . '</b>';
! $style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
}
if ( $row['user_allow_viewonline'] )
{
! $user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>';
$logged_visible_online++;
}
else
{
! $user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
$logged_hidden_online++;
}
--- 101,122 ----
{
// 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'] = '<b style="color:#' . $row['user_colour'] . '">' . $row['username'] . '</b>';
}
if ( $row['user_allow_viewonline'] )
{
! $user_online_link = '<a href="' . "profile.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '">' . $row['username'] . '</a>';
$logged_visible_online++;
}
else
{
! $user_online_link = '<a href="' . "profile.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '"><i>' . $row['username'] . '</i></a>';
$logged_hidden_online++;
}
***************
*** 176,191 ****
SET config_value = '$total_online_users'
WHERE config_name = 'record_online_users'";
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
! }
$sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '" . $board_config['record_online_date'] . "'
WHERE config_name = 'record_online_date'";
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql);
! }
}
--- 158,167 ----
SET config_value = '$total_online_users'
WHERE config_name = 'record_online_users'";
! $db->sql_query($sql);
$sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '" . $board_config['record_online_date'] . "'
WHERE config_name = 'record_online_date'";
! $db->sql_query($sql);
}
***************
*** 251,255 ****
// if user is logged in
//
! if ( $userdata['session_logged_in'] )
{
if ( $userdata['user_new_privmsg'] )
--- 227,231 ----
// if user is logged in
//
! if ( $userdata['user_id'] != ANONYMOUS )
{
if ( $userdata['user_new_privmsg'] )
***************
*** 263,270 ****
SET user_last_privmsg = " . $userdata['user_lastvisit'] . "
WHERE user_id = " . $userdata['user_id'];
! if ( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql);
! }
$s_privmsg_new = 1;
--- 239,243 ----
SET user_last_privmsg = " . $userdata['user_lastvisit'] . "
WHERE user_id = " . $userdata['user_id'];
! $db->sql_query($sql);
$s_privmsg_new = 1;
***************
*** 306,312 ****
// Generate HTML required for Mozilla Navigation bar
//
$nav_links_html = '';
$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
! while( list($nav_item, $nav_array) = @each($nav_links) )
{
if ( !empty($nav_array['url']) )
--- 279,286 ----
// Generate HTML required for Mozilla Navigation bar
//
+ /*
$nav_links_html = '';
$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
! foreach ( $nav_links as $nav_item => $nav_array )
{
if ( !empty($nav_array['url']) )
***************
*** 317,321 ****
{
// We have a nested array, used for items like <link rel='chapter'> that can occur more than once.
! while( list(,$nested_array) = each($nav_array) )
{
$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']);
--- 291,295 ----
{
// We have a nested array, used for items like <link rel='chapter'> 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']);
***************
*** 323,327 ****
}
}
!
//
// The following assigns all _common_ variables that may be used at any point
--- 297,301 ----
}
}
! */
//
// The following assigns all _common_ variables that may be used at any point
***************
*** 361,457 ****
'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
'L_SEARCH_SELF' => $lang['Search_your_posts'],
- 'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'),
- 'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
- 'L_WHOSONLINE_USER' => sprintf($lang['User_online_color'], '<span style="color:#' . $theme['fontcolor1'] . '">', '</span>'),
- 'L_LEGEND' => $lang['Legend'],
-
- 'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'),
- 'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'),
- 'U_SEARCH_NEW' => append_sid('search.'.$phpEx.'?search_id=newposts'),
- 'U_INDEX' => append_sid('index.'.$phpEx),
- 'U_REGISTER' => append_sid('profile.'.$phpEx.'?mode=register'),
- 'U_PROFILE' => append_sid('profile.'.$phpEx.'?mode=editprofile'),
- 'U_PRIVATEMSGS' => append_sid('privmsg.'.$phpEx.'?folder=inbox'),
- 'U_PRIVATEMSGS_POPUP' => append_sid('privmsg.'.$phpEx.'?mode=newpm'),
- 'U_SEARCH' => append_sid('search.'.$phpEx),
- 'U_MEMBERLIST' => append_sid('memberlist.'.$phpEx),
- 'U_MODCP' => append_sid('modcp.'.$phpEx),
- 'U_FAQ' => append_sid('faq.'.$phpEx),
- 'U_VIEWONLINE' => append_sid('viewonline.'.$phpEx),
- 'U_LOGIN_LOGOUT' => append_sid($u_login_logout),
- 'U_MEMBERSLIST' => append_sid('memberlist.'.$phpEx),
- 'U_GROUP_CP' => append_sid('groupcp.'.$phpEx),
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_ENCODING' => $lang['ENCODING'],
'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
! 'S_TIMEZONE' => sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]),
! 'S_LOGIN_ACTION' => append_sid('login.'.$phpEx),
- 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
- 'T_BODY_BACKGROUND' => $theme['body_background'],
- 'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
- 'T_BODY_TEXT' => '#'.$theme['body_text'],
- 'T_BODY_LINK' => '#'.$theme['body_link'],
- 'T_BODY_VLINK' => '#'.$theme['body_vlink'],
- 'T_BODY_ALINK' => '#'.$theme['body_alink'],
- 'T_BODY_HLINK' => '#'.$theme['body_hlink'],
- 'T_TR_COLOR1' => '#'.$theme['tr_color1'],
- 'T_TR_COLOR2' => '#'.$theme['tr_color2'],
- 'T_TR_COLOR3' => '#'.$theme['tr_color3'],
- 'T_TR_CLASS1' => $theme['tr_class1'],
- 'T_TR_CLASS2' => $theme['tr_class2'],
- 'T_TR_CLASS3' => $theme['tr_class3'],
- 'T_TH_COLOR1' => '#'.$theme['th_color1'],
- 'T_TH_COLOR2' => '#'.$theme['th_color2'],
- 'T_TH_COLOR3' => '#'.$theme['th_color3'],
- 'T_TH_CLASS1' => $theme['th_class1'],
- 'T_TH_CLASS2' => $theme['th_class2'],
- 'T_TH_CLASS3' => $theme['th_class3'],
- 'T_TD_COLOR1' => '#'.$theme['td_color1'],
- 'T_TD_COLOR2' => '#'.$theme['td_color2'],
- 'T_TD_COLOR3' => '#'.$theme['td_color3'],
- 'T_TD_CLASS1' => $theme['td_class1'],
- 'T_TD_CLASS2' => $theme['td_class2'],
- 'T_TD_CLASS3' => $theme['td_class3'],
- 'T_FONTFACE1' => $theme['fontface1'],
- 'T_FONTFACE2' => $theme['fontface2'],
- 'T_FONTFACE3' => $theme['fontface3'],
- 'T_FONTSIZE1' => $theme['fontsize1'],
- 'T_FONTSIZE2' => $theme['fontsize2'],
- 'T_FONTSIZE3' => $theme['fontsize3'],
- 'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
- 'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
- 'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
- 'T_SPAN_CLASS1' => $theme['span_class1'],
- 'T_SPAN_CLASS2' => $theme['span_class2'],
- 'T_SPAN_CLASS3' => $theme['span_class3'],
-
'NAV_LINKS' => $nav_links_html)
);
- //
- // Login box?
- //
- if ( !$userdata['session_logged_in'] )
- {
- $template->assign_block_vars('switch_user_logged_out', array());
- }
- else
- {
- $template->assign_block_vars('switch_user_logged_in', array());
-
- if ( !empty($userdata['user_popup_pm']) )
- {
- $template->assign_block_vars('switch_enable_pm_popup', array());
- }
- }
-
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');
!
! $template->pparse('overall_header');
?>
--- 335,376 ----
'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,
+ 'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID,
+ 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID,
+
+ 'S_USER_LOGGED_IN' => ( $userdata['user_id'] == ANONYMOUS ) ? false : true,
+ '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' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
! 'S_LOGIN_ACTION' => 'login.'.$phpEx.$SID,
!
! 'T_STYLESHEET_DATA' => $theme['css_data'],
! 'T_STYLESHEET_LINK' => 'templates/' . $theme['css_external'],
'NAV_LINKS' => $nav_links_html)
);
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');
! header ('Pragma: private');
?>
Index: page_tail.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_tail.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** page_tail.php 8 Jun 2002 16:45:41 -0000 1.29
--- page_tail.php 14 Jul 2002 14:41:55 -0000 1.30
***************
*** 9,13 ****
* $Id$
*
- *
***************************************************************************/
--- 9,12 ----
***************
*** 27,57 ****
//
- // Show the overall footer.
- //
- $admin_link = ( $userdata['user_level'] == ADMIN ) ? '<a href="' . append_sid("admin/index.$phpEx") . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '';
-
- $template->set_filenames(array(
- 'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl')
- );
-
- //
// Output page creation time
//
! if ( DEBUG )
{
$mtime = microtime();
$mtime = explode(' ', $mtime);
$totaltime = ( $mtime[1] + $mtime[0] ) - $starttime;
! $gzip_text = ( $board_config['gzip_compress'] ) ? 'GZIP compression enabled' : 'GZIP compression disabled';
}
$template->assign_vars(array(
! 'PHPBB_VERSION' => '2' . $board_config['version'],
! 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '',
! 'ADMIN_LINK' => $admin_link,
! 'DEBUG_OUTPUT' => ( DEBUG ) ? sprintf('<br /><br />phpBB Created this page in %f seconds : ' . $db->sql_num_queries() . ' queries executed : ' . $gzip_text, $totaltime) : '')
);
! $template->pparse('overall_footer');
//
--- 26,47 ----
//
// Output page creation time
//
! if ( defined('DEBUG') )
{
$mtime = microtime();
$mtime = explode(' ', $mtime);
$totaltime = ( $mtime[1] + $mtime[0] ) - $starttime;
!
! $debug_output = sprintf('<br /><br />[ Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . ( ( $board_config['gzip_compress'] ) ? 'On' : 'Off' ) . ' | Load : ' . (( $session->load ) ? $session->load : 'N/A') . ' ]', $totaltime);
}
$template->assign_vars(array(
! 'PHPBB_VERSION' => $board_config['version'],
! 'ADMIN_LINK' => ( $acl->get_acl_admin() ) ? '<a href="' . "admin/index.$phpEx$SID" . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '',
! 'DEBUG_OUTPUT' => ( defined('DEBUG') ) ? $debug_output : '')
);
! $template->display('body');
//
|
