[Phpbb-checkins] CVS: phpBB2/admin admin_forumauth.php,1.20,1.21

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv19947/admin

Modified Files:
	admin_forumauth.php 
Log Message:
Various updates/changes

Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_forumauth.php	28 Jan 2002 02:44:50 -0000	1.20
--- admin_forumauth.php	28 Feb 2002 23:50:49 -0000	1.21
***************
*** 36,51 ****
  require('pagestart.inc');
  
- 
  //
  // Start program - define vars
  //
  $simple_auth_ary = array(
! 	0  => array(0, 0, 0, 0, 1, 1, 1, 3, 1, 1),
! 	1  => array(0, 0, 1, 1, 1, 1, 1, 3, 1, 1),
! 	2  => array(1, 1, 1, 1, 1, 1, 1, 3, 1, 1),
! 	3  => array(0, 2, 2, 2, 2, 2, 2, 3, 2, 2),
! 	4  => array(2, 2, 2, 2, 2, 2, 2, 3, 2, 2),
! 	5  => array(0, 3, 3, 3, 3, 3, 3, 3, 3, 3),
! 	6  => array(3, 3, 3, 3, 3, 3, 3, 3, 3, 3),
  );
  
--- 36,51 ----
  require('pagestart.inc');
  
  //
  // Start program - define vars
  //
+ //                View      Read      Post      Reply     Edit     Delete    Sticky   Announce    Vote      Poll
  $simple_auth_ary = array(
! 	0  => array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG),
! 	1  => array(AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG),
! 	2  => array(AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG),
! 	3  => array(AUTH_ALL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_MOD, AUTH_ACL, AUTH_ACL),
! 	4  => array(AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_MOD, AUTH_ACL, AUTH_ACL),
! 	5  => array(AUTH_ALL, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD),
! 	6  => array(AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD),
  );
  
***************
*** 155,159 ****
  		"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
  	);
! 	$message = $lang['Forum_auth_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_forumauth.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['return_forum_auth_admin'];
  	message_die(GENERAL_MESSAGE, $message);
  
--- 155,159 ----
  		"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
  	);
! 	$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'],  '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
  	message_die(GENERAL_MESSAGE, $message);
  
***************
*** 170,176 ****
  	$forum_sql
  	ORDER BY c.cat_order ASC, f.forum_order ASC";
! $f_result = $db->sql_query($sql);
  
! $forum_rows = $db->sql_fetchrowset($f_result);
  
  if( empty($forum_id) )
--- 170,180 ----
  	$forum_sql
  	ORDER BY c.cat_order ASC, f.forum_order ASC";
! if ( !($result = $db->sql_query($sql)) )
! {
! 	message_die(GENERAL_ERROR, "Couldn't obtain forum list", "", __LINE__, __FILE__, $sql);
! }
  
! $forum_rows = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
  
  if( empty($forum_id) )
***************
*** 184,193 ****
  	);
  
! 	$select_list = "<select name=\"" . POST_FORUM_URL . "\">";
  	for($i = 0; $i < count($forum_rows); $i++)
  	{
! 		$select_list .= "<option value=\"" . $forum_rows[$i]['forum_id'] . "\">" . $forum_rows[$i]['forum_name'] . "</option>";
  	}
! 	$select_list .= "</select>";
  
  	$template->assign_vars(array(
--- 188,197 ----
  	);
  
! 	$select_list = '<select name="' . POST_FORUM_URL . '">';
  	for($i = 0; $i < count($forum_rows); $i++)
  	{
! 		$select_list .= '<option value="' . $forum_rows[$i]['forum_id'] . '">' . $forum_rows[$i]['forum_name'] . '</option>';
  	}
! 	$select_list .= '</select>';
  
  	$template->assign_vars(array(
***************
*** 214,219 ****
  	$forum_name = $forum_rows[0]['forum_name'];
  
! 	reset($simple_auth_ary);
! 	while(list($key, $auth_levels) = each($simple_auth_ary))
  	{
  		$matched = 1;
--- 218,223 ----
  	$forum_name = $forum_rows[0]['forum_name'];
  
! 	@reset($simple_auth_ary);
! 	while( list($key, $auth_levels) = each($simple_auth_ary))
  	{
  		$matched = 1;
***************
*** 222,232 ****
  			$matched_type = $key;
  
! 			if($forum_rows[0][$forum_auth_fields[$k]] != $auth_levels[$k])
  			{
  				$matched = 0;
  			}
  		}
! 		if($matched)
  			break;
  	}
  
--- 226,239 ----
  			$matched_type = $key;
  
! 			if ( $forum_rows[0][$forum_auth_fields[$k]] != $auth_levels[$k] )
  			{
  				$matched = 0;
  			}
  		}
! 
! 		if ( $matched )
! 		{
  			break;
+ 		}
  	}
  
***************
*** 339,341 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 346,348 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file