1 files changed, 232 insertions, 96 deletions
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++)
 
 <?php
 
-	if(isset($forum_id))
+	if(!empty($forum_id))
 	{
 
 ?>
@@ -114,49 +193,12 @@ for($i = 0; $i < count($forum_mods_list); $i++)
 
 ?>
 
-<div align="center"><table width="98%" cellspacing="1" cellpadding="3" border="1">
-	<tr><form method="post" action="forumauth.php">
-<?php
-
-	if(empty($forum_id))
-	{
-
-?>
-		<th>Forum Title</th>
-		<th>Moderator/s</th>
-<?php
-
-	}
-
-?>
-		<th>Simple Auth</th>
-<?php
-
-	for($j = 0; $j < count($forum_auth_fields); $j++)
-	{
-		echo "<th>".preg_replace("/auth_/", "", $forum_auth_fields[$j])."</th>\n";
-	}
-?>
-	</tr>
+<div align="center"><table cellspacing="1" cellpadding="4" border="0">
 <?php
 
 	for($i = 0; $i < count($forum_rows); $i++)
 	{
-		$forum_name = "<a href=\"" . append_sid("forumauth.php?" . POST_FORUM_URL . "=" . $forum_rows[$i]['forum_id']) . "\">" . $forum_rows[$i]['forum_name'] . "</a>";
-
-		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 .= "<br>";
-			}
-			$moderators_links .= "<a href=\"".append_sid("../profile.$phpEx?mode=viewprofile&".POST_USERS_URL."=".$forum_mods['forum_'.$forum_rows[$i]['forum_id'].'_id'][$mods])."\">".$forum_mods['forum_'.$forum_rows[$i]['forum_id'].'_name'][$mods]."</a>";
-		}
+		$forum_name[$i] = "<a href=\"" . append_sid("forumauth.php?" . POST_FORUM_URL . "=" . $forum_rows[$i]['forum_id']) . "\">" . $forum_rows[$i]['forum_name'] . "</a>";
 
 		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;
 		}
-		
+
 		//
-		// Determine whether the current
-		// forum auth fields match a preset 'simple'
-		// type
+		// If we've got a custom setup
+		// then we jump into advanced
+		// mode by default
 		//
-		$simple_auth = (isset($forum_id)) ? "<select name=\"simple_auth\">" : "";
-		if(!$matched)
+		if($adv == -1 && !$matched)
 		{
-			$simple_auth .= (isset($forum_id)) ? "<option value=\"-1\" selected>" : "";
-			$simple_auth .= "Custom";
-			$simple_auth .= (isset($forum_id)) ? "</option>" : ""; 
-
-			$matched_type = -1;
+			$adv = 1;
 		}
-		for($j = 0; $j < count($simple_auth_types); $j++)
+		
+		if($adv <= 0 || empty($forum_id))
 		{
-			if($matched_type == $j)
+
+			//
+			// Determine whether the current
+			// forum auth fields match a preset 'simple'
+			// type
+			//
+
+			$simple_auth[$i] = (isset($forum_id)) ? "<select name=\"simpleauth\">" : "";
+			if(!$matched && empty($forum_id))
 			{
-				$simple_auth .= (isset($forum_id)) ? "<option value=\"$k\" selected>" : "";
-				$simple_auth .= $simple_auth_types[$j];
-				$simple_auth .= (isset($forum_id)) ? "</option>" : "";
+				$simple_auth[$i] .= "Custom";
+				$matched_type = -1;
 			}
-			else if(isset($forum_id))
+			for($j = 0; $j < count($simple_auth_types); $j++)
 			{
-				$simple_auth .= "<option value=\"$k\">".$simple_auth_types[$j]."</option>";
+				if($matched_type == $j)
+				{
+					$simple_auth[$i] .= (isset($forum_id)) ? "<option value=\"$j\" selected>" : "";
+					$simple_auth[$i] .= $simple_auth_types[$j];
+					$simple_auth[$i] .= (isset($forum_id)) ? "</option>" : "";
+				}
+				else if(isset($forum_id))
+				{
+					$simple_auth[$i] .= "<option value=\"$j\">".$simple_auth_types[$j]."</option>";
+				}
 			}
+			$simple_auth[$i] .= (isset($forum_id)) ? "</select>" : "";
+
 		}
-		$simple_auth .= (isset($forum_id)) ? "</select>" : "";
 
-		//
-		// Output values of individual 
-		// fields
-		//
-		for($j = 0; $j < count($forum_auth_fields); $j++)
+		if($adv == 1 || empty($forum_id))
 		{
-			$custom_auth[$j] = (isset($forum_id)) ? "<select name=\"".$forum_auth_fields[$j]."\">" : "";
-			for($k = 0; $k < count($forum_auth_levels); $k++)
+
+			//
+			// Output values of individual 
+			// fields
+			//
+
+			for($j = 0; $j < count($forum_auth_fields); $j++)
 			{
-				if($forum_rows[$i][$forum_auth_fields[$j]] == $forum_auth_const[$k])
+				$custom_auth[$i][$j] = (isset($forum_id)) ? "<select name=\"".$forum_auth_fields[$j]."\">" : "";
+				for($k = 0; $k < count($forum_auth_levels); $k++)
 				{
-					$custom_auth[$j] .= (isset($forum_id)) ? "<option value=\"$k\" selected>" : "";
-					$custom_auth[$j] .= $forum_auth_levels[$k];
-					$custom_auth[$j] .= (isset($forum_id)) ? "</option>" : "";
-				}
-				else if(isset($forum_id))
-				{
-					$custom_auth[$j] .= "<option value=\"$k\">". $forum_auth_levels[$k]."</option>";
+					if($forum_rows[$i][$forum_auth_fields[$j]] == $forum_auth_const[$k])
+					{
+						$custom_auth[$i][$j] .= (isset($forum_id)) ? "<option value=\"$k\" selected>" : "";
+						$custom_auth[$i][$j] .= $forum_auth_levels[$k];
+						$custom_auth[$i][$j] .= (isset($forum_id)) ? "</option>" : "";
+					}
+					else if(isset($forum_id))
+						{
+						$custom_auth[$i][$j] .= "<option value=\"$k\">". $forum_auth_levels[$k]."</option>";
+					}
 				}
+				$custom_auth[$i][$j] .= (isset($forum_id)) ? "</select>" : "";
 			}
-			$custom_auth[$j] .= (isset($forum_id)) ? "</select>" : "";
 
 		}
+	}
+
+?>
+	<tr><form method="post" action="forumauth.php">
+<?php
+
+	if(empty($forum_id))
+	{
+
+?>
+		<th bgcolor="#CCCCCC">Forum Title</th>
+		<th bgcolor="#CCCCCC">Moderator/s</th>
+<?php
+
+	}
+
+	if($adv <= 0  || empty($forum_id))
+	{
+
+?>
+		<th bgcolor="#CCCCCC">Simple Auth</th>
+<?php
+
+	}
+
+	if($adv == 1 || empty($forum_id))
+	{
+		for($j = 0; $j < count($forum_auth_fields); $j++)
+		{
+			echo "<th bgcolor=\"#CCCCCC\">".preg_replace("/auth_/", "", $forum_auth_fields[$j])."</th>\n";
+		}
+	}
+
+?>
+	</tr>
+<?php
+
+	for($i = 0; $i < count($forum_rows); $i++)
+	{
+
+		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 .= "<br>";
+			}
+			$moderators_links .= "<a href=\"".append_sid("../profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $forum_mods['forum_'.$forum_rows[$i]['forum_id'] . '_id'][$mods]) . "\">" . $forum_mods['forum_'.$forum_rows[$i]['forum_id'] . '_name'][$mods] . "</a>";
+		}
 
 		echo "<tr>\n";
 
 		if(empty($forum_id))
 		{
-			echo "<td>".$forum_name."</td>\n";
-			echo "<td>".$moderators_links."</td>\n";
+			echo "<td align=\"center\" bgcolor=\"#DDDDDD\">".$forum_name[$i]."</td>\n";
+			echo "<td align=\"center\" bgcolor=\"#DDDDDD\">".$moderators_links."</td>\n";
+
+			$colspan = 2;
 		}
-		echo "<td>".$simple_auth."</td>\n";
 
-		for($j = 0; $j < count($custom_auth); $j++)
+		if($adv <= 0  || empty($forum_id))
 		{
-			echo "<td>".$custom_auth[$j]."</td>\n";
+			echo "<td align=\"center\" bgcolor=\"#DDDDDD\">".$simple_auth[$i]."</td>\n";
+
+			$colspan ++;
+		}
+
+		if($adv == 1 || empty($forum_id))
+		{
+			for($j = 0; $j < count($custom_auth[$i]); $j++)
+			{
+				echo "<td align=\"center\" bgcolor=\"#DDDDDD\">".$custom_auth[$i][$j]."</td>\n";
+
+				$colspan++;
+			}
 		}
 
 		echo "</tr>\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";
+
 ?>
 		<tr>
-			<td colspan="12"><table width="100%" cellspacing="0" cellpadding="4" border="0">
+			<td colspan="<?php echo $colspan; ?>"><table width="100%" cellspacing="0" cellpadding="4" border="0">
+				<tr>
+					<td align="center"><a href="<?php echo $switch_mode ?>">Switch to <?php echo $switch_mode_text; ?></a></td>
+				</tr>
+				<tr>
+					<td align="center"><input type="hidden" name="<?php echo POST_FORUM_URL; ?>" value="<?php echo $forum_id; ?>"><input type="submit" name="submit" value="Submit Changes">&nbsp;&nbsp;<input type="reset" value="Reset to Initial"></td>
+				</tr>
 				<tr>
-					<td width="33%" align="center"><input type="submit" name="return" value="Return to Forum Auth"></td>
-					<td width="34%" align="center"><input type="hidden" name="<?php echo POST_FORUM_URL; ?>" value="<?php echo $forum_id; ?>"><input type="submit" name="submit" value="Submit Changes"></td>
-					<td width="33%" align="center"><input type="reset" value="Reset to Initial"></td>
+					<td align="center"><a href="forumauth.php">Return to Forum Auth Index</a></td>
 				</tr>
 			</table></td>
 		</tr>
@@ -269,12 +405,12 @@ for($i = 0; $i < count($forum_mods_list); $i++)
 
 ?>
 <center>
-<br clear="all" />
-<font face="Verdana,serif" size="1">Powered By <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a></font>
-<br clear="all" />
+<br clear="all">
+<font face="Verdana,serif" size="1">Powered By <a href="http://www.phpbb.com/" target="_phpbb">phpBB 2.0</a></font>
+<br clear="all">
 <font face="Verdana,serif" size="1">
 Copyright &copy; 2001 phpBB Group, All Rights Reserved</font>
-<br />
+<br>
 
 </body>
 </html>
 \ No newline at end of file