mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Fixed errors, non-sid-appended urls, lang switchovers, etc.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@707 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-07-20 15:16:03 +00:00
parent 862f5d6700
commit c285a885ae
6 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/includes/auth.php
View File

@@ -200,7 +200,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
}
}
$is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? TRUE : FALSE;
$is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? TRUE : 0;
$auth_user = array();
@@ -242,17 +242,17 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
break;
case AUTH_REG:
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : FALSE;
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
$auth_user[$key . '_type'] = $lang['Registered_Users'];
break;
case AUTH_ACL:
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : FALSE;
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0;
$auth_user[$key . '_type'] = $lang['Users_granted_access'];
break;
case AUTH_MOD:
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : FALSE;
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
$auth_user[$key . '_type'] = $lang['Moderators'];
break;
@@ -262,7 +262,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
break;
default:
$auth_user[$key] = FALSE;
$auth_user[$key] = 0;
break;
}
}
@@ -281,17 +281,17 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
break;
case AUTH_REG:
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : FALSE;
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
$auth_user[$f_forum_id][$key . '_type'] = $lang['Registered_Users'];
break;
case AUTH_ACL:
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : FALSE;
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0;
$auth_user[$f_forum_id][$key . '_type'] = $lang['Users_granted_access'];
break;
case AUTH_MOD:
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : FALSE;
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
$auth_user[$f_forum_id][$key . '_type'] = $lang['Moderators'];
break;
@@ -301,7 +301,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
break;
default:
$auth_user[$f_forum_id][$key] = FALSE;
$auth_user[$f_forum_id][$key] = 0;
break;
}
}
@@ -313,7 +313,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
//
if($forum_id != AUTH_LIST_ALL)
{
$auth_user['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : FALSE;
$auth_user['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
}
else
{
@@ -321,7 +321,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
{
$f_forum_id = $f_access[$k]['forum_id'];
$auth_user[$f_forum_id]['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : FALSE;
$auth_user[$f_forum_id]['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
}
}

19
phpBB/includes/page_header.php
View File

@@ -64,16 +64,11 @@ $template->set_filenames(array(
//
if($userdata['session_logged_in'])
{
$logged_in_status = $lang['You_are_logged_in'] . " <b>" . $userdata["username"] . "</b>.";
$logged_in_status .= " [<a href=\"" . append_sid("login.$phpEx?submit=logout") . "\">" . $lang['Logout'] . "</a>]";
$u_login_logout = "login.$phpEx?submit=logout";
$l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
}
else
{
$logged_in_status = $lang['You_are_not_logged_in'];
$u_login_logout = "login.$phpEx";
$l_login_logout = $lang['Login'];
}
@@ -121,7 +116,7 @@ while($row = $db->sql_fetchrow($result))
$userlist = "";
for($i = 0; $i < $logged_visible_online; $i++)
{
$userlist .= ($i == $logged_visible_online - 1 && $logged_visible_online > 1) ? " and " : "";
$userlist .= ($i == $logged_visible_online - 1 && $logged_visible_online > 1) ? " " . $lang['and'] . " " : "";
$userlist .= $userlist_ary[$i];
$userlist .= ($i < $logged_visible_online - 2) ? ", " : "";
}
@@ -151,17 +146,17 @@ if($userdata['session_logged_in'])
{
$new_messages = $pm_result['new_messages'];
$l_message_new = ($new_messages == 1) ? "message" : "messages";
$l_privmsgs_text = "You have $new_messages new $l_message_new";
$l_message_new = ($new_messages == 1) ? $lang['message'] : $lang['messages'];
$l_privmsgs_text = $lang['You_have'] . " $new_messages " . $lang['new'] . " $l_message_new";
}
else
{
$l_privmsgs_text = "You have no new messages";
$l_privmsgs_text = $lang['No_new_pm'];
}
}
else
{
$l_privmsgs_text = "To check your private messages you must login";
$l_privmsgs_text = $lang['Login_check_pm'];
}
//
@@ -172,9 +167,8 @@ else
$template->assign_vars(array(
"SITENAME" => $board_config['sitename'],
"PAGE_TITLE" => $page_title,
"LOGIN_STATUS" => $logged_in_status,
"META_INFO" => $meta_tags,
"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s and $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
"LOGGED_IN_USER_LIST" => $userlist,
"L_USERNAME" => $lang['Username'],
@@ -199,6 +193,7 @@ $template->assign_vars(array(
"L_MODERATOR" => $lang['Moderator'],
"L_NONEWPOSTS" => $lang['No_new_posts'],
"L_NEWPOSTS" => $lang['New_posts'],
"L_TOPIC_IS_LOCKED" => $lang['Topic_is_locked'],
"L_POSTED" => $lang['Posted'],
"L_JOINED" => $lang['Joined'],
"L_AUTO_LOGIN" => $lang['Log_me_in'],

8
phpBB/includes/page_tail.php
View File

@@ -27,7 +27,7 @@
//
if($userdata['user_level'] == ADMIN)
{
$admin_link = "<a href=\"admin/index.$phpEx\">Administration Panel</a>";
$admin_link = "<a href=\"" . append_sid("admin/index.$phpEx") . "\">" . $lang['Admin_panel'] . "</a>";
}
$current_time = time();
@@ -51,14 +51,18 @@ $endtime = $mtime;
$totaltime = ($endtime - $starttime);
$gzip_text = ($board_config['gzip_compress']) ? "GZIP compression enabled" : "GZIP compression disabled";
$debug_mode = (DEBUG) ? " : Debug Mode" : "";
printf("<center><font size=-2>phpBB Created this page in %f seconds : " . $db->num_queries . " queries executed : $gzip_text</font></center>", $totaltime);
printf("<center><font size=-2>phpBB Created this page in %f seconds : " . $db->num_queries . " queries executed : $gzip_text".$debug_mode."</font></center>", $totaltime);
//
// Close our DB connection.
//
$db->sql_close();
//for($i=0;$i<count($db->query_array);$i++)
// echo $db->query_array[$i] . "<BR>";
//
// Compress buffered output if required
// and send to browser