Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.80,1.81 auth.php,1.33,1.34
|
From: Paul S. O. <ps...@us...> - 2001-12-16 18:53:47
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv17590/includes
Modified Files:
page_header.php auth.php
Log Message:
Changed way moderator lang is output on viewforum and index
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** page_header.php 2001/12/15 16:40:02 1.80
--- page_header.php 2001/12/16 18:53:44 1.81
***************
*** 270,274 ****
"L_POSTS" => $lang['Posts'],
"L_LASTPOST" => $lang['Last_Post'],
- "L_MODERATOR" => $lang['Moderator'],
"L_NO_NEW_POSTS" => $lang['No_new_posts'],
"L_NEW_POSTS" => $lang['New_posts'],
--- 270,273 ----
Index: auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/auth.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** auth.php 2001/11/21 01:20:17 1.33
--- auth.php 2001/12/16 18:53:44 1.34
***************
*** 57,61 ****
global $db, $lang;
! switch($type)
{
case AUTH_ALL:
--- 57,61 ----
global $db, $lang;
! switch( $type )
{
case AUTH_ALL:
***************
*** 125,129 ****
// then we need to pull the auth information on the given forum (or all forums)
//
! if($f_access == -1)
{
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE a.forum_id = $forum_id" : "";
--- 125,129 ----
// then we need to pull the auth information on the given forum (or all forums)
//
! if( $f_access == -1 )
{
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE a.forum_id = $forum_id" : "";
***************
*** 140,144 ****
else
{
! if(!$db->sql_numrows($af_result))
{
message_die(GENERAL_ERROR, "No forum access control lists exist!", "", __LINE__, __FILE__, $sql);
--- 140,144 ----
else
{
! if( !$db->sql_numrows($af_result) )
{
message_die(GENERAL_ERROR, "No forum access control lists exist!", "", __LINE__, __FILE__, $sql);
***************
*** 158,186 ****
$auth_user = array();
! if($userdata['session_logged_in'])
{
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND a.forum_id = $forum_id" : "";
! /* $sql = "SELECT au.forum_id, $a_sql, au.auth_mod, g.group_single_user
! FROM " . AUTH_ACCESS_TABLE . " au, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g
! WHERE ug.user_id = " . $userdata['user_id'] . "
! AND g.group_id = ug.group_id
! AND (
! ( au.user_id = ug.user_id
! AND g.group_id = 0 )
! OR
! ( au.group_id = ug.group_id
! AND g.group_id <> 0 )
! )
! $forum_match_sql";*/
! $sql = "SELECT a.forum_id, $a_sql, a.auth_mod, g.group_single_user
! FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
WHERE ug.user_id = ".$userdata['user_id']. "
AND ug.user_pending = 0
- AND g.group_id = ug.group_id
AND a.group_id = ug.group_id
$forum_match_sql";
$a_result = $db->sql_query($sql);
! if(!$a_result)
{
message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
--- 158,173 ----
$auth_user = array();
! if( $userdata['session_logged_in'] )
{
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND a.forum_id = $forum_id" : "";
! $sql = "SELECT a.forum_id, $a_sql, a.auth_mod
! FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug
WHERE ug.user_id = ".$userdata['user_id']. "
AND ug.user_pending = 0
AND a.group_id = ug.group_id
$forum_match_sql";
$a_result = $db->sql_query($sql);
! if( !$a_result )
{
message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
***************
*** 188,192 ****
$num_u_access = $db->sql_numrows($a_result);
! if($num_u_access)
{
if($forum_id != AUTH_LIST_ALL)
--- 175,179 ----
$num_u_access = $db->sql_numrows($a_result);
! if( $num_u_access )
{
if($forum_id != AUTH_LIST_ALL)
***************
*** 196,200 ****
else
{
! while($u_row = $db->sql_fetchrow($a_result))
{
$u_access[$u_row['forum_id']][] = $u_row;
--- 183,187 ----
else
{
! while( $u_row = $db->sql_fetchrow($a_result) )
{
$u_access[$u_row['forum_id']][] = $u_row;
***************
*** 204,208 ****
}
! $is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? TRUE : 0;
$auth_user = array();
--- 191,195 ----
}
! $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
$auth_user = array();
***************
*** 234,266 ****
// and instead set the auth to whatever the OR'd contents of the access levels are.
//
! if($forum_id != AUTH_LIST_ALL)
{
$value = $f_access[$key];
! switch($value)
{
case AUTH_ALL:
$auth_user[$key] = TRUE;
! $auth_user[$key . '_type'] = $lang['Anonymous_users'];
break;
case AUTH_REG:
$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) : 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) : 0;
! $auth_user[$key . '_type'] = $lang['Moderators'];
break;
case AUTH_ADMIN:
$auth_user[$key] = $is_admin;
! $auth_user[$key . '_type'] = $lang['Administrators'];
break;
--- 221,253 ----
// and instead set the auth to whatever the OR'd contents of the access levels are.
//
! if( $forum_id != AUTH_LIST_ALL )
{
$value = $f_access[$key];
! switch( $value )
{
case AUTH_ALL:
$auth_user[$key] = TRUE;
! $auth_user[$key . '_type'] = $lang['Auth_Anonymous_users'];
break;
case AUTH_REG:
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! $auth_user[$key . '_type'] = $lang['Auth_Registered_Users'];
break;
case AUTH_ACL:
$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0;
! $auth_user[$key . '_type'] = $lang['Auth_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) : 0;
! $auth_user[$key . '_type'] = $lang['Auth_Moderators'];
break;
case AUTH_ADMIN:
$auth_user[$key] = $is_admin;
! $auth_user[$key . '_type'] = $lang['Auth_Administrators'];
break;
***************
*** 277,305 ****
$f_forum_id = $f_access[$k]['forum_id'];
! switch($value)
{
case AUTH_ALL:
$auth_user[$f_forum_id][$key] = TRUE;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Anonymous_users'];
break;
case AUTH_REG:
$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) : 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) : 0;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Moderators'];
break;
case AUTH_ADMIN:
$auth_user[$f_forum_id][$key] = $is_admin;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Administrators'];
break;
--- 264,292 ----
$f_forum_id = $f_access[$k]['forum_id'];
! switch( $value )
{
case AUTH_ALL:
$auth_user[$f_forum_id][$key] = TRUE;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Anonymous_users'];
break;
case AUTH_REG:
$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_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) : 0;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_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) : 0;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Moderators'];
break;
case AUTH_ADMIN:
$auth_user[$f_forum_id][$key] = $is_admin;
! $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Administrators'];
break;
***************
*** 315,321 ****
// Is user a moderator?
//
! 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) : 0;
}
else
--- 302,308 ----
// Is user a moderator?
//
! 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) : 0;
}
else
***************
*** 325,329 ****
$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) : 0;
}
}
--- 312,316 ----
$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) : 0;
}
}
***************
*** 336,340 ****
$auth_user = 0;
! if(count($u_access))
{
for($j = 0; $j < count($u_access); $j++)
--- 323,327 ----
$auth_user = 0;
! if( count($u_access) )
{
for($j = 0; $j < count($u_access); $j++)
|
