diff --git a/phpBB/admin/forumauth.php b/phpBB/admin/forumauth.php index d1ea8f5d2d..a8799f979b 100644 --- a/phpBB/admin/forumauth.php +++ b/phpBB/admin/forumauth.php @@ -26,32 +26,111 @@ $simple_auth_ary = array( 8 => array(0, 0, 3, 1, 0, 0, 3, 3, 3) ); -$simple_auth_types = array("Public", "Registered", "Registered [Hidden]", "Private", "Private_[Hidden]", "Moderators", "Moderators [Hidden]", "Mod Post, All Reply", "Mod Post, Reg Reply"); +$simple_auth_types = array("Public", "Registered", "Registered [Hidden]", "Private", "Private [Hidden]", "Moderators", "Moderators [Hidden]", "Moderator Post + All Reply", "Moderator Post + Reg Reply"); + +$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_votecreate", "auth_vote", "auth_attachments"); $forum_auth_levels = array("ALL", "REG", "ACL", "MOD", "ADMIN"); $forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN); -$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_votecreate", "auth_vote", "auth_attachments"); -if(isset($HTTP_GET_VARS[POST_FORUM_URL])) +if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL])) { - $forum_id = $HTTP_GET_VARS[POST_FORUM_URL]; - $forum_sql = "WHERE forum_id = $forum_id"; + $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL]; +// $forum_sql = "WHERE forum_id = $forum_id"; + $forum_sql = "AND f.forum_id = $forum_id"; } else { + unset($forum_id); $forum_sql = ""; } +if(isset($HTTP_GET_VARS['adv'])) +{ + $adv = $HTTP_GET_VARS['adv']; +} +else +{ + $adv = -1; +} + +if(isset($HTTP_POST_VARS['submit'])) +{ + if(!empty($forum_id)) + { +// $sql = "UPDATE " . FORUMS_TABLE . " SET "; + $sql = "UPDATE " . AUTH_FORUMS_TABLE . " SET "; + + if(isset($HTTP_POST_VARS['simpleauth'])) + { + $simple_ary = $simple_auth_ary[$HTTP_POST_VARS['simpleauth']]; + for($i = 0; $i < count($simple_ary); $i++) + { + $sql .= $forum_auth_fields[$i] . " = " . $simple_ary[$i]; + if($i < count($simple_ary) - 1) + { + $sql .= ", "; + } + } + + $sql .= " WHERE forum_id = $forum_id"; + } + else + { +// $sql = "UPDATE " . FORUMS_TABLE . " SET "; + $sql = "UPDATE " . AUTH_FORUMS_TABLE . " SET "; + + for($i = 0; $i < count($forum_auth_fields); $i++) + { + $value = $HTTP_POST_VARS[$forum_auth_fields[$i]]; + if($forum_auth_fields[$i] != 'auth_view') + { + if($HTTP_POST_VARS['auth_view'] > $value) + { + $value = $HTTP_POST_VARS['auth_view']; + } + } + $sql .= $forum_auth_fields[$i] . " = " . $value; + if($i < count($forum_auth_fields) - 1) + { + $sql .= ", "; + } + } + + $sql .= " WHERE forum_id = $forum_id"; + + } + + if(strlen($sql)) + { + if(!$db->sql_query($sql)) + { + error_die(QUERY_ERROR, "Couldn't update auth table!", __LINE__, __FILE__); + } + } + + unset($forum_id); + $forum_sql = ""; + $adv = 0; + + } +} + + // // Start output // -$sql = "SELECT * +/*$sql = "SELECT * FROM ".FORUMS_TABLE." $forum_sql - ORDER BY forum_id ASC"; + ORDER BY forum_id ASC";*/ +$sql = "SELECT f.forum_id, f.forum_name, fa.* + FROM " . FORUMS_TABLE . " f, ".AUTH_FORUMS_TABLE." fa + WHERE fa.forum_id = f.forum_id + $forum_sql + ORDER BY f.forum_id ASC"; $f_result = $db->sql_query($sql); - $forum_rows = $db->sql_fetchrowset($f_result); $sql = "SELECT f.forum_id, u.username, u.user_id @@ -103,7 +182,7 @@ for($i = 0; $i < count($forum_mods_list); $i++) @@ -114,49 +193,12 @@ for($i = 0; $i < count($forum_mods_list); $i++) ?> -
- - - - - - -".preg_replace("/auth_/", "", $forum_auth_fields[$j])."\n"; - } -?> - +
Forum TitleModerator/sSimple Auth
" . $forum_rows[$i]['forum_name'] . ""; - - unset($moderators_links); - for($mods = 0; $mods < count($forum_mods['forum_'.$forum_rows[$i]['forum_id'].'_id']); $mods++) - { - if(isset($moderators_links)) - { - $moderators_links .= ", "; - } - if(!($mods % 2) && $mods != 0) - { - $moderators_links .= "
"; - } - $moderators_links .= "".$forum_mods['forum_'.$forum_rows[$i]['forum_id'].'_name'][$mods].""; - } + $forum_name[$i] = "" . $forum_rows[$i]['forum_name'] . ""; reset($simple_auth_ary); while(list($key, $auth_levels) = each($simple_auth_ary)) @@ -173,72 +215,156 @@ for($i = 0; $i < count($forum_mods_list); $i++) if($matched) break; } + + // + // If we've got a custom setup + // then we jump into advanced + // mode by default + // + if($adv == -1 && !$matched) + { + $adv = 1; + } - // - // Determine whether the current - // forum auth fields match a preset 'simple' - // type - // - $simple_auth = (isset($forum_id)) ? "" : ""; + // + // Determine whether the current + // forum auth fields match a preset 'simple' + // type + // - // - // Output values of individual - // fields - // - for($j = 0; $j < count($forum_auth_fields); $j++) - { - $custom_auth[$j] = (isset($forum_id)) ? "" : ""; + if(!$matched && empty($forum_id)) { - if($forum_rows[$i][$forum_auth_fields[$j]] == $forum_auth_const[$k]) + $simple_auth[$i] .= "Custom"; + $matched_type = -1; + } + for($j = 0; $j < count($simple_auth_types); $j++) + { + if($matched_type == $j) { - $custom_auth[$j] .= (isset($forum_id)) ? "" : ""; + $simple_auth[$i] .= (isset($forum_id)) ? "" : ""; } else if(isset($forum_id)) { - $custom_auth[$j] .= ""; + $simple_auth[$i] .= ""; } } - $custom_auth[$j] .= (isset($forum_id)) ? "" : ""; + $simple_auth[$i] .= (isset($forum_id)) ? "" : ""; } + if($adv == 1 || empty($forum_id)) + { + + // + // Output values of individual + // fields + // + + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $custom_auth[$i][$j] = (isset($forum_id)) ? "" : ""; + } + + } + } + +?> + + + + + + +".preg_replace("/auth_/", "", $forum_auth_fields[$j])."\n"; + } + } + +?> + +"; + } + $moderators_links .= "" . $forum_mods['forum_'.$forum_rows[$i]['forum_id'] . '_name'][$mods] . ""; + } + echo "\n"; if(empty($forum_id)) { - echo "\n"; - echo "\n"; - } - echo "\n"; + echo "\n"; + echo "\n"; - for($j = 0; $j < count($custom_auth); $j++) + $colspan = 2; + } + + if($adv <= 0 || empty($forum_id)) { - echo "\n"; + echo "\n"; + + $colspan ++; + } + + if($adv == 1 || empty($forum_id)) + { + for($j = 0; $j < count($custom_auth[$i]); $j++) + { + echo "\n"; + + $colspan++; + } } echo "\n"; @@ -247,13 +373,23 @@ for($i = 0; $i < count($forum_mods_list); $i++) if(isset($forum_id)) { + + $switch_mode = "forumauth.php?" . POST_FORUM_URL . "=" . $forum_id . "&adv="; + $switch_mode .= ($adv <= 0 ) ? "1" : "0"; + + $switch_mode_text = ($adv <= 0 ) ? "Advanced Mode" : "Simple Mode"; + ?> -
Forum TitleModerator/sSimple Auth
".$forum_name."".$moderators_links."".$simple_auth."".$forum_name[$i]."".$moderators_links."".$custom_auth[$j]."".$simple_auth[$i]."".$custom_auth[$i][$j]."
+ @@ -269,12 +405,12 @@ for($i = 0; $i < count($forum_mods_list); $i++) ?>
-
-Powered By phpBB -
+
+Powered By phpBB 2.0 +
Copyright © 2001 phpBB Group, All Rights Reserved -
+
\ No newline at end of file
- - - + + + + + + +
Switch to
  
Return to Forum Auth Index