Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_userauth.php,1.23,1.24
|
From: Paul S. O. <ps...@us...> - 2001-10-17 00:42:40
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv15846/admin
Modified Files:
admin_userauth.php
Log Message:
Fixed error which would cause failure when making user an admin
Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** admin_userauth.php 2001/10/16 14:43:03 1.23
--- admin_userauth.php 2001/10/17 00:42:37 1.24
***************
*** 122,129 ****
//
//
! if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
{
$user_id = intval($HTTP_POST_VARS[POST_USERS_URL]);
! $adv = (isset($HTTP_POST_VARS['adv'])) ? TRUE : 0;
//
--- 122,129 ----
//
//
! if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]) )
{
$user_id = intval($HTTP_POST_VARS[POST_USERS_URL]);
! $adv = ( isset($HTTP_POST_VARS['adv']) ) ? TRUE : 0;
//
***************
*** 134,146 ****
// Get group_id for this user_id
//
! $sql_groupid = "SELECT ug.group_id, u.user_level
FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u, " . GROUPS_TABLE . " g
! WHERE u.user_id = $user_id
AND ug.user_id = u.user_id
AND g.group_id = ug.group_id
AND g.group_single_user = " . TRUE;
! if(!$result = $db->sql_query($sql_groupid))
{
! // Error no such user/group
}
$ug_info = $db->sql_fetchrow($result);
--- 134,146 ----
// Get group_id for this user_id
//
! $sql = "SELECT ug.group_id, u.user_level
FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u, " . GROUPS_TABLE . " g
! WHERE u.user_id = $user_id
AND ug.user_id = u.user_id
AND g.group_id = ug.group_id
AND g.group_single_user = " . TRUE;
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't select info from user/user_group table", "", __LINE__, __FILE__, $sql);
}
$ug_info = $db->sql_fetchrow($result);
***************
*** 164,168 ****
if(!$result = $db->sql_query($sql))
{
! // Error ...
}
--- 164,168 ----
if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
}
***************
*** 175,183 ****
if(!$result = $db->sql_query($sql))
{
! // Error ...
}
}
! header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
}
--- 175,183 ----
if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
}
}
! header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
}
***************
*** 188,197 ****
// Make user an admin (if already user)
//
! $sql_userlevel = "UPDATE " . USERS_TABLE . "
SET user_level = " . ADMIN . "
WHERE user_id = $user_id";
! if(!$result = $db->sql_query($sql_userlevel))
{
! // Error ...
}
--- 188,197 ----
// Make user an admin (if already user)
//
! $sql = "UPDATE " . USERS_TABLE . "
SET user_level = " . ADMIN . "
WHERE user_id = $user_id";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
}
***************
*** 200,220 ****
// admin
//
! $sql_unmod = "UPDATE " . AUTH_ACCESS_TABLE . "
SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
WHERE group_id = " . $ug_info['group_id'];
! if(!$result = $db->sql_query($sql_unmod))
{
! // Error ...
}
! $sql_unauth = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! WHERE group_id = $group_id
AND auth_mod = 0";
! if(!$result = $db->sql_query($sql_unauth))
{
! // Error ...
}
! header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
}
else
--- 200,220 ----
// admin
//
! $sql = "UPDATE " . AUTH_ACCESS_TABLE . "
SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
WHERE group_id = " . $ug_info['group_id'];
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
}
! $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! WHERE group_id = " . $ug_info['group_id'] . "
AND auth_mod = 0";
! if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete auth access info", "", __LINE__, __FILE__, $sql);
}
! header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
}
else
***************
*** 231,235 ****
$au_result = $db->sql_query($sql);
! if($num_u_access = $db->sql_numrows($au_result))
{
$u_access = $db->sql_fetchrowset($au_result);
--- 231,235 ----
$au_result = $db->sql_query($sql);
! if( $num_u_access = $db->sql_numrows($au_result) )
{
$u_access = $db->sql_fetchrowset($au_result);
***************
*** 320,335 ****
// Moderator control
//
! while(list($mod_forum_id, $new_mod_status) = @each($change_mod_ary))
{
! if($mod_forum_id == $this_forum_id)
{
for($j = 0; $j < count($u_access); $j++)
{
! if($u_access[$j]['forum_id'] == $this_forum_id)
{
$cur_mod_status = $u_access[$j]['auth_mod'];
$is_single_user = $u_access[$j]['group_single_user'];
! if($cur_mod_status == $new_mod_status && $is_single_user)
{
//
--- 320,335 ----
// Moderator control
//
! while( list($mod_forum_id, $new_mod_status) = @each($change_mod_ary) )
{
! if( $mod_forum_id == $this_forum_id )
{
for($j = 0; $j < count($u_access); $j++)
{
! if( $u_access[$j]['forum_id'] == $this_forum_id )
{
$cur_mod_status = $u_access[$j]['auth_mod'];
$is_single_user = $u_access[$j]['group_single_user'];
! if( $cur_mod_status == $new_mod_status && $is_single_user )
{
//
***************
*** 338,342 ****
$update_mod = TRUE;
}
! else if($cur_mod_status && !$new_mod_status && !$is_single_user)
{
//
--- 338,342 ----
$update_mod = TRUE;
}
! else if( $cur_mod_status && !$new_mod_status && !$is_single_user )
{
//
***************
*** 348,354 ****
$warning_mod_frmname[$this_forum_id][] = $forum_access[$i]['forum_name'];
}
! else if($cur_mod_status != $new_mod_status && $is_single_user)
{
! if($new_mod_status)
{
$valid_auth_mod_sql[$this_forum_id] = "UPDATE " . AUTH_ACCESS_TABLE . "
--- 348,354 ----
$warning_mod_frmname[$this_forum_id][] = $forum_access[$i]['forum_name'];
}
! else if( $cur_mod_status != $new_mod_status && $is_single_user )
{
! if( $new_mod_status )
{
$valid_auth_mod_sql[$this_forum_id] = "UPDATE " . AUTH_ACCESS_TABLE . "
***************
*** 368,372 ****
}
! if(!$update_mod && $new_mod_status)
{
$valid_auth_mod_sql[$this_forum_id] = "INSERT INTO " . AUTH_ACCESS_TABLE . "
--- 368,372 ----
}
! if( !$update_mod && $new_mod_status )
{
$valid_auth_mod_sql[$this_forum_id] = "INSERT INTO " . AUTH_ACCESS_TABLE . "
***************
*** 381,391 ****
// Private/ACL control
//
! while(list($prv_forum_id, $new_prv_ary) = @each($change_prv_list))
{
! if($prv_forum_id == $this_forum_id && empty($valid_auth_mod_sql[$this_forum_id]) )
{
for($j = 0; $j < count($u_access); $j++)
{
! if($u_access[$j]['forum_id'] == $this_forum_id)
{
$is_single_user = $u_access[$j]['group_single_user'];
--- 381,391 ----
// Private/ACL control
//
! while( list($prv_forum_id, $new_prv_ary) = @each($change_prv_list) )
{
! if( $prv_forum_id == $this_forum_id && empty($valid_auth_mod_sql[$this_forum_id]) )
{
for($j = 0; $j < count($u_access); $j++)
{
! if( $u_access[$j]['forum_id'] == $this_forum_id )
{
$is_single_user = $u_access[$j]['group_single_user'];
***************
*** 417,421 ****
$update_acl = TRUE;
}
! else if( ( $cur_prv_status || $u_access[$j]['auth_mod'] ) && !$new_prv_status && !$is_single_user && !$warned)
{
//
--- 417,421 ----
$update_acl = TRUE;
}
! else if( ( $cur_prv_status || $u_access[$j]['auth_mod'] ) && !$new_prv_status && !$is_single_user && !$warned )
{
//
***************
*** 428,432 ****
$warned = TRUE;
}
! else if($cur_prv_status != $new_prv_status && $is_single_user)
{
if( $valid_auth_prv_sql_val != "")
--- 428,432 ----
$warned = TRUE;
}
! else if( $cur_prv_status != $new_prv_status && $is_single_user )
{
if( $valid_auth_prv_sql_val != "")
***************
*** 445,451 ****
}
! if($is_single_user)
{
! if(!$is_all_zeroed)
{
$valid_auth_prv_sql[$this_forum_id] .= $valid_auth_prv_sql_val . " WHERE forum_id = $this_forum_id AND group_id = " . $ug_info['group_id'];
--- 445,451 ----
}
! if( $is_single_user )
{
! if( !$is_all_zeroed )
{
$valid_auth_prv_sql[$this_forum_id] .= $valid_auth_prv_sql_val . " WHERE forum_id = $this_forum_id AND group_id = " . $ug_info['group_id'];
***************
*** 462,466 ****
}
! if(!$update_acl)
{
//
--- 462,466 ----
}
! if( !$update_acl )
{
//
***************
*** 548,552 ****
for($i = 0; $i < count($group_ary); $i++)
{
! if(!empty($valid_auth_prv_sql[$forum_id]))
{
$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
--- 548,552 ----
for($i = 0; $i < count($group_ary); $i++)
{
! if( !empty($valid_auth_prv_sql[$forum_id]) )
{
$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
***************
*** 555,559 ****
}
! if($warning_list != "")
{
$warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
--- 555,559 ----
}
! if( $warning_list != "" )
{
$warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
|
