aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-24 18:37:51 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-24 18:37:51 +0000
commitfd62afbf4cbeee1cbbbeaa216947d6121d494d35 (patch)
treecaf52e7f1c0541aedfb26016617c8391f510af70
parent8738aa7021d679d70b48acb8a060ff88286cb72b (diff)
downloadforums-fd62afbf4cbeee1cbbbeaa216947d6121d494d35.tar
forums-fd62afbf4cbeee1cbbbeaa216947d6121d494d35.tar.gz
forums-fd62afbf4cbeee1cbbbeaa216947d6121d494d35.tar.bz2
forums-fd62afbf4cbeee1cbbbeaa216947d6121d494d35.tar.xz
forums-fd62afbf4cbeee1cbbbeaa216947d6121d494d35.zip
Minor updates + change of function name in group auth to prevent conflict.
git-svn-id: file:///svn/phpbb/trunk@1712 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/admin/admin_groupauth.php20
-rw-r--r--phpBB/admin/admin_userauth.php32
2 files changed, 26 insertions, 26 deletions
diff --git a/phpBB/admin/admin_groupauth.php b/phpBB/admin/admin_groupauth.php
index 9e6cf2f842..1fc660f21a 100644
--- a/phpBB/admin/admin_groupauth.php
+++ b/phpBB/admin/admin_groupauth.php
@@ -68,13 +68,13 @@ $field_names = array(
// ---------------
// Start Functions
//
-function a_auth_check_user($type, $key, $u_auth, $is_admin)
+function a_auth_check_group($type, $key, $u_auth, $is_admin)
{
$single_user = 0;
$auth_user = array();
- while( list($entry, $u_ary) = each($u_auth) )
+ while( list($entry, $u_ary) = @each($u_auth) )
{
if(!$single_user)
{
@@ -94,7 +94,7 @@ function a_auth_check_user($type, $key, $u_auth, $is_admin)
break;
}
- $auth_user['auth'] = (!$single_user) ? ( $auth_user || $result ) : $result;
+ $auth_user['auth'] = $auth_user || $result;
}
$auth_user['single_group'] = ($single_user) ? "single" : "group";
@@ -430,7 +430,7 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
//
// Checks complete, make updates to DB
//
- while( list($chg_forum_id, $sql) = each($valid_auth_mod_sql) )
+ while( list($chg_forum_id, $sql) = @each($valid_auth_mod_sql) )
{
if( !empty($sql) )
{
@@ -441,7 +441,7 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
}
}
- while( list($chg_forum_id, $sql) = each($valid_auth_prv_sql) )
+ while( list($chg_forum_id, $sql) = @each($valid_auth_prv_sql) )
{
if( !empty($sql) )
{
@@ -456,7 +456,7 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
// Any warnings?
//
$warning_list_mod = "";
- while( list($forum_id, $user_ary) = each($warning_mod_userid) )
+ while( list($forum_id, $user_ary) = @each($warning_mod_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
@@ -469,7 +469,7 @@ if( isset($HTTP_POST_VARS['submit']) && ( !empty($HTTP_POST_VARS[POST_GROUPS_URL
}
$warning_list_acl = "";
- while( list($forum_id, $user_ary) = each($warning_prv_userid) )
+ while( list($forum_id, $user_ary) = @each($warning_prv_userid) )
{
for($i = 0; $i < count($user_ary); $i++)
{
@@ -596,7 +596,7 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
case AUTH_ACL:
if($num_forum_access[$f_forum_id])
{
- $result = a_auth_check_user(AUTH_ACL, $key, $g_access[$f_forum_id], 0);
+ $result = a_auth_check_group(AUTH_ACL, $key, $g_access[$f_forum_id], 0);
$auth_group[$f_forum_id][$key] = $result['auth'];
$auth_field_acl[$f_forum_id][$key] = $result['auth'];
}
@@ -609,7 +609,7 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
case AUTH_MOD:
if($num_forum_access[$f_forum_id])
{
- $result = a_auth_check_user(AUTH_MOD, $key, $g_access[$f_forum_id], 0);
+ $result = a_auth_check_group(AUTH_MOD, $key, $g_access[$f_forum_id], 0);
$auth_group[$f_forum_id][$key] = $result['auth'];
}
else
@@ -633,7 +633,7 @@ else if( !empty($HTTP_POST_VARS[POST_GROUPS_URL]) || !empty($HTTP_GET_VARS[POST_
//
if($num_forum_access[$f_forum_id])
{
- $result = a_auth_check_user(AUTH_MOD, 'auth_mod', $g_access[$f_forum_id], 0);
+ $result = a_auth_check_group(AUTH_MOD, 'auth_mod', $g_access[$f_forum_id], 0);
$auth_group[$f_forum_id]['auth_mod'] = $result['auth'];
}
else
diff --git a/phpBB/admin/admin_userauth.php b/phpBB/admin/admin_userauth.php
index 27b84d2f3a..b587c15993 100644
--- a/phpBB/admin/admin_userauth.php
+++ b/phpBB/admin/admin_userauth.php
@@ -104,7 +104,7 @@ function a_auth_check_user($type, $key, $u_auth, $is_admin)
break;
}
- $auth_user['auth'] = (!$single_user) ? ( $auth_user || $result ) : $result;
+ $auth_user['auth'] = $auth_user || $result;
}
$auth_user['single_group'] = ($single_user) ? "single" : "group";
@@ -402,7 +402,7 @@ if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])
// Step through all auth fields
//
@reset($new_prv_ary);
- while( list($this_prv_field, $new_prv_status) = each($new_prv_ary) )
+ while( list($this_prv_field, $new_prv_status) = @each($new_prv_ary) )
{
//
// Is this field set to ACL?
@@ -469,7 +469,7 @@ if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])
$all_zeroed = TRUE;
@reset($new_prv_ary);
- while( list($this_prv_field, $new_prv_status) = each($new_prv_ary) )
+ while( list($this_prv_field, $new_prv_status) = @each($new_prv_ary) )
{
//
// Is this field set to ACL?
@@ -725,17 +725,17 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
}
$i = 0;
- while(list($forumkey, $user_ary) = each($auth_user))
+ while( list($forumkey, $user_ary) = @each($auth_user) )
{
if( empty($adv) )
{
- if($forum_auth_level[$forumkey] == AUTH_ACL)
+ if( $forum_auth_level[$forumkey] == AUTH_ACL )
{
$allowed = 1;
for($j = 0; $j < count($forum_auth_level_fields[$forumkey]); $j++)
{
- if(!$auth_user[$forumkey][$forum_auth_level_fields[$forumkey][$j]])
+ if( !$auth_user[$forumkey][$forum_auth_level_fields[$forumkey][$j]] )
{
$allowed = 0;
}
@@ -743,11 +743,11 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
$optionlist_acl = "<select name=\"private[$forumkey]\">";
- if($is_admin || $user_ary['auth_mod'])
+ if( $is_admin || $user_ary['auth_mod'] )
{
$optionlist_acl .= "<option value=\"1\">" . $lang['Allowed_Access'] . "</option>";
}
- else if($allowed)
+ else if( $allowed )
{
$optionlist_acl .= "<option value=\"1\" selected=\"selected\">" . $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>";
}
@@ -766,7 +766,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
else
{
@reset($forum_access);
- while(list($key, $forum_row) = each($forum_access))
+ while( list($key, $forum_row) = @each($forum_access) )
{
$forum_id = $forum_row['forum_id'];
@@ -780,7 +780,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
if( isset($auth_field_acl[$forum_id][$field_name]) && !($is_admin || $user_ary['auth_mod']) )
{
- if(!$auth_field_acl[$forum_id][$field_name])
+ if( !$auth_field_acl[$forum_id][$field_name] )
{
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected=\"selected\">" . $lang['OFF'] . "</option>";
}
@@ -791,7 +791,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
}
else
{
- if($is_admin || $user_ary['auth_mod'])
+ if( $is_admin || $user_ary['auth_mod'] )
{
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option>";
}
@@ -809,7 +809,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
}
$optionlist_mod = "<select name=\"moderator[$forumkey]\">";
- if($user_ary['auth_mod'])
+ if( $user_ary['auth_mod'] )
{
$optionlist_mod .= "<option value=\"1\" selected=\"selected\">" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>";
}
@@ -832,7 +832,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
"S_MOD_SELECT" => $optionlist_mod)
);
- if(!$adv)
+ if( !$adv )
{
$template->assign_block_vars("forums.aclvalues", array(
"S_ACL_SELECT" => $optionlist_acl)
@@ -857,14 +857,14 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
for($i = 0; $i < count($userinf); $i++)
{
- if(!$userinf[$i]['group_single_user'])
+ if( !$userinf[$i]['group_single_user'] )
{
$group_name[] = $userinf[$i]['group_name'];
$group_id[] = $userinf[$i]['group_id'];
}
}
- if(count($group_name))
+ if( count($group_name) )
{
$t_usergroup_list = "";
for($i = 0; $i < count($userinf); $i++)
@@ -885,7 +885,7 @@ else if( isset($HTTP_POST_VARS['username']) || $user_id)
$s_hidden_fields .= "<input type=\"hidden\" name=\"curadmin\" value=\"" . $is_admin ."\" />";
$s_column_span = 2; // Two columns always present
- if(!$adv)
+ if( !$adv )
{
$template->assign_block_vars("acltype", array(
"L_UG_ACL_TYPE" => $lang['Simple_Permission'])
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-18 09:20:51 +0000