Permission changes, updates admin functions, indented jumpboxes ... note that the update script doesn't seem to introduce the user_permissions field @ present so you need to add it manually

git-svn-id: file:///svn/phpbb/trunk@2942 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2002-10-08 20:06:55 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2002-10-08 20:06:55 +0000
commit: 64aee6d171aaf3e74b7b3755e054cdcc89061a5d (patch)
tree: 5ec82435e1ed68b4dcce09c42d6648278a87a515 /phpBB/includes/functions_admin.php
parent: c0a0d11d089ac4faf30edc998b47eeff3cadae26 (diff)
download: forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar
forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.gz
forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.bz2
forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.xz
forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.zip
1 files changed, 222 insertions, 69 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e17a4138a8..c44aa1df40 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -19,35 +19,46 @@
  *
  ***************************************************************************/
 
-//
 // Simple version of jumpbox, just lists authed forums
-//
 function make_forum_select($box_name, $ignore_forum = false)
 {
-	global $db, $userdata, $acl, $lang;
+	global $db, $userdata, $auth, $lang;
 
-	$sql = "SELECT forum_id, forum_name
-		FROM " . FORUMS_TABLE . " 
-		ORDER BY cat_id, forum_order";
+	$sql = "SELECT forum_id, forum_name, left_id, right_id
+		FROM " . FORUMS_TABLE . "
+		ORDER BY left_id ASC";
 	$result = $db->sql_query($sql);
 
+	$right = 0;
+	$subforum = '';
 	$forum_list = '';
-	while( $row = $db->sql_fetchrow($result) )
+	while ( $row = $db->sql_fetchrow($result) )
 	{
-		if ( $acl->get_acl($row['forum_id'], 'forum', 'read') && $ignore_forum != $row['forum_id'] )
+		if ( ( $auth->acl_get('f_list', $forum_id) || $auth->acl_get('a_') ) && $ignore_forum != $row['forum_id'] )
 		{
-			$forum_list .= '<option value="' . $row['forum_id'] . '">' . $row['forum_name'] . '</option>';
+			if ( $row['left_id'] < $right  )
+			{
+				$subforum .= '&nbsp;&nbsp;&nbsp;';
+			}
+			else if ( $row['left_id'] > $right + 1 )
+			{
+				$subforum = substr($subforum, 0, -18 * ( $row['left_id'] - $right + 1 ));
+			}
+
+			$forum_list .= '<option value="' . $row['forum_id'] . '">' . $subforum . $row['forum_name'] . '</option>';
+
+			$right = $row['right_id'];
 		}
+
 	}
+	$db->sql_freeresult($result);
 
 	$forum_list = ( $forum_list == '' ) ? '<option value="-1">' . $lang['No_forums'] . '</option>' : '<select name="' . $box_name . '">' . $forum_list . '</select>';
 
 	return $forum_list;
 }
 
-//
 // Synchronise functions for forums/topics
-//
 function sync($type, $id)
 {
 	global $db;
@@ -77,10 +88,10 @@ function sync($type, $id)
 			break;
 
 	  	case 'forum':
-			$sql = "SELECT MAX(p.post_id) AS last_post, COUNT(p.post_id) AS total 
-				FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE  . " t 
-				WHERE p.forum_id = $id 
-					AND t.topic_id = p.topic_id 
+			$sql = "SELECT MAX(p.post_id) AS last_post, COUNT(p.post_id) AS total
+				FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE  . " t
+				WHERE p.forum_id = $id
+					AND t.topic_id = p.topic_id
 					AND t.topic_status <> " . ITEM_MOVED;
 			$result = $db->sql_query($sql);
 
@@ -97,7 +108,7 @@ function sync($type, $id)
 
 			$sql = "SELECT COUNT(topic_id) AS total
 				FROM " . TOPICS_TABLE . "
-				WHERE forum_id = $id 
+				WHERE forum_id = $id
 					AND topic_status <> " . ITEM_MOVED;
 			$result = $db->sql_query($sql);
 
@@ -118,7 +129,7 @@ function sync($type, $id)
 			if ( $row = $db->sql_fetchrow($result) )
 			{
 				$sql = "UPDATE " . TOPICS_TABLE . "
-					SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " 
+					SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . "
 					WHERE topic_id = $id";
 				$db->sql_query($sql);
 			}
@@ -128,7 +139,7 @@ function sync($type, $id)
 
 			break;
 	}
-	
+
 	return true;
 }
 
@@ -138,15 +149,13 @@ function prune($forum_id, $prune_date)
 
 	require_once($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
 
-	//
 	// Those without polls ...
-	//
-	$sql = "SELECT t.topic_id 
+	$sql = "SELECT t.topic_id
 		FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t
 		WHERE t.forum_id = $forum_id
-			AND t.topic_vote = 0 
-			AND t.topic_type <> " . POST_ANNOUNCE . " 
-			AND ( p.post_id = t.topic_last_post_id 
+			AND t.topic_vote = 0
+			AND t.topic_type <> " . POST_ANNOUNCE . "
+			AND ( p.post_id = t.topic_last_post_id
 				OR t.topic_last_post_id = 0 )";
 	if ( $prune_date != '' )
 	{
@@ -159,12 +168,12 @@ function prune($forum_id, $prune_date)
 	{
 		$sql_topics .= ( ( $sql_topics != '' ) ? ', ' : '' ) . $row['topic_id'];
 	}
-		
+
 	if ( $sql_topics != '' )
 	{
 		$sql = "SELECT post_id
-			FROM " . POSTS_TABLE . " 
-			WHERE forum_id = $forum_id 
+			FROM " . POSTS_TABLE . "
+			WHERE forum_id = $forum_id
 				AND topic_id IN ($sql_topics)";
 		$result = $db->sql_query($sql);
 
@@ -178,23 +187,23 @@ function prune($forum_id, $prune_date)
 		{
 			$db->sql_transaction();
 
-			$sql = "DELETE FROM " . TOPICS_TABLE . " 
+			$sql = "DELETE FROM " . TOPICS_TABLE . "
 				WHERE topic_id IN ($sql_topics)";
 			$db->sql_query($sql);
 
 			$pruned_topics = $db->sql_affectedrows();
 
-			$sql = "DELETE FROM " . POSTS_TABLE . " 
+			$sql = "DELETE FROM " . POSTS_TABLE . "
 				WHERE post_id IN ($sql_post)";
 			$db->sql_query($sql);
 
 			$pruned_posts = $db->sql_affectedrows();
 
-			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
+			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
 				WHERE post_id IN ($sql_post)";
 			$db->sql_query($sql);
 
-			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
+			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
 				WHERE post_id IN ($sql_post)";
 			$db->sql_query($sql);
 
@@ -209,15 +218,13 @@ function prune($forum_id, $prune_date)
 	return array('topics' => 0, 'posts' => 0);
 }
 
-//
 // Function auto_prune(), this function will read the configuration data from
 // the auto_prune table and call the prune function with the necessary info.
-//
 function auto_prune($forum_id = 0)
 {
 	global $db, $lang;
 
-	$sql = "SELECT prune_freq, prune_days 
+	$sql = "SELECT prune_freq, prune_days
 		FROM " . FORUMS_TABLE . "
 		WHERE forum_id = $forum_id";
 	$result = $db->sql_query($sql);
@@ -232,8 +239,8 @@ function auto_prune($forum_id = 0)
 			prune($forum_id, $prune_date);
 			sync('forum', $forum_id);
 
-			$sql = "UPDATE " . FORUMS_TABLE . " 
-				SET prune_next = $next_prune 
+			$sql = "UPDATE " . FORUMS_TABLE . "
+				SET prune_next = $next_prune
 				WHERE forum_id = $forum_id";
 			$db->sql_query($sql);
 		}
@@ -242,19 +249,8 @@ function auto_prune($forum_id = 0)
 	return;
 }
 
-/***************************************************************************
-*
-*	These functions are mainly for use in the db_utilities under the admin
-*	however in order to make these functions available elsewhere, specifically
-*	in the installation phase of phpBB I have seperated out a couple of 
-*	functions into this file.  JLH
-*
-\***************************************************************************/
-
-//
 // remove_comments will strip the sql comment lines out of an uploaded sql file
 // specifically for mssql and postgres type files in the install....
-//
 function remove_comments(&$output)
 {
 	$lines = explode("\n", $output);
@@ -286,16 +282,14 @@ function remove_comments(&$output)
 	return $output;
 }
 
-//
 // remove_remarks will strip the sql comment lines out of an uploaded sql file
-//
 function remove_remarks($sql)
 {
 	$lines = explode("\n", $sql);
-	
+
 	// try to keep mem. use down
 	$sql = '';
-	
+
 	$linecount = count($lines);
 	$output = '';
 
@@ -308,15 +302,13 @@ function remove_remarks($sql)
 			$lines[$i] = '';
 		}
 	}
-	
+
 	return $output;
-	
+
 }
 
-//
 // split_sql_file will split an uploaded sql file into single sql statements.
 // Note: expects trim() to have already been run on $sql.
-//
 function split_sql_file($sql, $delimiter)
 {
 	// Split up our string into "possible" SQL statements.
@@ -325,10 +317,10 @@ function split_sql_file($sql, $delimiter)
 	// try to save mem.
 	$sql = '';
 	$output = array();
-	
+
 	// we don't actually care about the matches preg gives us.
 	$matches = array();
-	
+
 	// this is faster than calling count($oktens) every time thru the loop.
 	$token_count = count($tokens);
 	for ($i = 0; $i < $token_count; $i++)
@@ -338,12 +330,12 @@ function split_sql_file($sql, $delimiter)
 		{
 			// This is the total number of single quotes in the token.
 			$total_quotes = preg_match_all("/'/", $tokens[$i], $matches);
-			// Counts single quotes that are preceded by an odd number of backslashes, 
+			// Counts single quotes that are preceded by an odd number of backslashes,
 			// which means they're escaped quotes.
 			$escaped_quotes = preg_match_all("/(?<!\\\\)(\\\\\\\\)*\\\\'/", $tokens[$i], $matches);
-			
+
 			$unescaped_quotes = $total_quotes - $escaped_quotes;
-			
+
 			// If the number of unescaped quotes is even, then the delimiter did NOT occur inside a string literal.
 			if ( !($unescaped_quotes % 2) )
 			{
@@ -359,20 +351,20 @@ function split_sql_file($sql, $delimiter)
 				$temp = $tokens[$i] . $delimiter;
 				// save memory..
 				$tokens[$i] = '';
-				
-				// Do we have a complete statement yet? 
+
+				// Do we have a complete statement yet?
 				$complete_stmt = false;
-				
+
 				for ($j = $i + 1; (!$complete_stmt && ($j < $token_count)); $j++)
 				{
 					// This is the total number of single quotes in the token.
 					$total_quotes = preg_match_all("/'/", $tokens[$j], $matches);
-					// Counts single quotes that are preceded by an odd number of backslashes, 
+					// Counts single quotes that are preceded by an odd number of backslashes,
 					// which means they're escaped quotes.
 					$escaped_quotes = preg_match_all("/(?<!\\\\)(\\\\\\\\)*\\\\'/", $tokens[$j], $matches);
-			
+
 					$unescaped_quotes = $total_quotes - $escaped_quotes;
-					
+
 					if ( ($unescaped_quotes % 2) == 1 )
 					{
 						// odd number of unescaped quotes. In combination with the previous incomplete
@@ -382,7 +374,7 @@ function split_sql_file($sql, $delimiter)
 						// save memory.
 						$tokens[$j] = '';
 						$temp = '';
-						
+
 						// exit the loop.
 						$complete_stmt = true;
 						// make sure the outer loop continues at the right point.
@@ -390,13 +382,13 @@ function split_sql_file($sql, $delimiter)
 					}
 					else
 					{
-						// even number of unescaped quotes. We still don't have a complete statement. 
+						// even number of unescaped quotes. We still don't have a complete statement.
 						// (1 odd and 1 even always make an odd)
 						$temp .= $tokens[$j] . $delimiter;
 						// save memory.
 						$tokens[$j] = '';
 					}
-					
+
 				} // for..
 			} // else
 		}
@@ -405,4 +397,165 @@ function split_sql_file($sql, $delimiter)
 	return $output;
 }
 
+// Extension of auth class for changing permissions
+class auth_admin extends auth
+{
+	function acl_set_user(&$forum_id, &$user_id, &$auth)
+	{
+		global $db;
+
+		$forum_sql = ( $forum_id ) ? "AND a.forum_id IN ($forum_id, 0)" : '';
+
+		$sql = "SELECT o.auth_option_id, o.auth_value, a.auth_allow_deny
+			FROM " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
+			WHERE a.auth_option_id = o.auth_option_id
+				$forum_sql
+				AND a.user_id = $user_id";
+		$result = $db->sql_query($sql);
+
+		$user_auth = array();
+		if ( $row = $db->sql_fetchrow($result) )
+		{
+			do
+			{
+				$user_auth[$user_id][$row['auth_option_id']] = $row['auth_allow_deny'];
+			}
+			while ( $row = $db->sql_fetchrow($result) );
+		}
+		$db->sql_freeresult($result);
+
+		foreach ( $auth as $auth_option_id => $allow )
+		{
+			if ( !empty($user_auth) )
+			{
+				foreach ( $user_auth as $user => $user_auth_ary )
+				{
+					$sql_ary[] = ( !isset($user_auth_ary[$auth_option_id]) ) ? "INSERT INTO " . ACL_USERS_TABLE . " (user_id, forum_id, auth_option_id, auth_allow_deny) VALUES ($user_id, $forum_id, $auth_option_id, $allow)" : ( ( $user_auth_ary[$auth_option_id] != $allow ) ? "UPDATE " . ACL_USERS_TABLE . " SET auth_allow_deny = $allow WHERE user_id = $user_id AND forum_id = $forum_id AND auth_option_id = $auth_option_id" : '' );
+				}
+			}
+			else
+			{
+				$sql_ary[] = "INSERT INTO " . ACL_USERS_TABLE . " (user_id, forum_id, auth_option_id, auth_allow_deny) VALUES ($user_id, $forum_id, $auth_option_id, $allow)";
+			}
+		}
+
+		foreach ( $sql_ary as $sql )
+		{
+			$db->sql_query($sql);
+		}
+
+		unset($user_auth);
+		unset($sql_ary);
+
+		$this->acl_clear_prefetch();
+	}
+
+	function acl_set_group(&$forum_id, &$group_id, &$auth)
+	{
+		global $db;
+
+		$forum_sql = "AND a.forum_id IN ($forum_id, 0)";
+
+		$sql = "SELECT o.auth_option_id, o.auth_value, a.auth_allow_deny
+			FROM " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
+			WHERE a.auth_option_id = o.auth_option_id
+				$forum_sql
+				AND a.group_id = $group_id";
+		$result = $db->sql_query($sql);
+
+		$group_auth = array();
+		if ( $row = $db->sql_fetchrow($result) )
+		{
+			do
+			{
+				$group_auth[$group_id][$row['auth_option_id']] = $row['auth_allow_deny'];
+			}
+			while ( $row = $db->sql_fetchrow($result) );
+		}
+		$db->sql_freeresult($result);
+
+		foreach ( $auth as $auth_option_id => $allow )
+		{
+			if ( !empty($group_auth) )
+			{
+				foreach ( $group_auth as $group => $group_auth_ary )
+				{
+					$sql_ary[] = ( !isset($group_auth_ary[$auth_option_id]) ) ? "INSERT INTO " . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_allow_deny) VALUES ($group_id, $forum_id, $auth_option_id, $allow)" : ( ( $group_auth_ary[$auth_option_id] != $allow ) ? "UPDATE " . ACL_GROUPS_TABLE . " SET auth_allow_deny = $allow WHERE group_id = $group_id AND forum_id = $forum_id and auth_option_id = $auth_option_id" : '' );
+				}
+			}
+			else
+			{
+				$sql_ary[] = "INSERT INTO " . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_allow_deny) VALUES ($group_id, $forum_id, $auth_option_id, $allow)";
+			}
+		}
+
+		foreach ( $sql_ary as $sql )
+		{
+			$db->sql_query($sql);
+		}
+
+		unset($group_auth);
+		unset($sql_ary);
+
+		$this->acl_clear_prefetch();
+	}
+
+	function acl_delete_user($forum_id, $user_id, $auth_ids = false)
+	{
+		global $db;
+
+		$auth_sql = '';
+		if ( $auth_ids )
+		{
+			for($i = 0; $i < count($auth_ids); $i++)
+			{
+				$auth_sql .= ( ( $auth_sql != '' ) ? ', ' : '' ) . $auth_ids[$i];
+			}
+			$auth_sql = " AND auth_option_id IN ($auth_sql)";
+		}
+
+		$sql = "DELETE FROM " . ACL_USERS_TABLE . "
+			WHERE user_id = $user_id
+				AND forum_id = $forum_id
+				$auth_sql";
+		$db->sql_query($sql);
+
+		$this->acl_clear_prefetch();
+	}
+
+	function acl_delete_group($forum_id, $group_id, $auth_type = false)
+	{
+		global $db;
+
+		$auth_sql = '';
+		if ( $auth_ids )
+		{
+			for($i = 0; $i < count($auth_ids); $i++)
+			{
+				$auth_sql .= ( ( $auth_sql != '' ) ? ', ' : '' ) . $auth_ids[$i];
+			}
+			$auth_sql = " AND auth_option_id IN ($auth_sql)";
+		}
+
+		$sql = "DELETE FROM " . ACL_GROUPS_TABLE . "
+			WHERE group_id = $group_id
+				AND forum_id = $forum_id
+				$auth_sql";
+		$db->sql_query($sql);
+
+		$this->acl_clear_prefetch();
+	}
+
+	function acl_clear_prefetch()
+	{
+		global $db;
+
+		$sql = "UPDATE " . USERS_TABLE . "
+			SET user_permissions = ''";
+		$db->sql_query($sql);
+
+		return;
+	}
+}
+
 ?>
 \ No newline at end of file
author	Paul S. Owen <psotfx@users.sourceforge.net>	2002-10-08 20:06:55 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2002-10-08 20:06:55 +0000
commit	64aee6d171aaf3e74b7b3755e054cdcc89061a5d (patch)
tree	5ec82435e1ed68b4dcce09c42d6648278a87a515 /phpBB/includes/functions_admin.php
parent	c0a0d11d089ac4faf30edc998b47eeff3cadae26 (diff)
download	forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.gz forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.bz2 forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.tar.xz forums-64aee6d171aaf3e74b7b3755e054cdcc89061a5d.zip