Thread: [Phpbb-checkins] r9185 [1/4] - in /branches/acydburn/phpBB/includes: acm/index.php acp/auth.php aut

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: acydburn
Date: Thu Dec 11 17:39:51 2008
New Revision: 9185

Log:
add/remove some files. Since this branch is only a playground i do not want to preserve history for most files.
Put some functions from functions.php into core-relevant classes (security and url)
splitted session.php into session and user
added login to user class
call auth directly from session/user
added the acm abstract

Added:
    branches/acydburn/phpBB/includes/acm/index.php   (with props)
    branches/acydburn/phpBB/includes/auth/db.php   (with props)
    branches/acydburn/phpBB/includes/classes/acl.php   (with props)
    branches/acydburn/phpBB/includes/classes/acl_admin.php   (with props)
    branches/acydburn/phpBB/includes/classes/session.php   (with props)
    branches/acydburn/phpBB/includes/classes/user.php   (with props)
    branches/acydburn/phpBB/includes/core/core_security.php   (with props)
    branches/acydburn/phpBB/includes/core/core_url.php   (with props)
Removed:
    branches/acydburn/phpBB/includes/acp/auth.php
    branches/acydburn/phpBB/includes/auth.php
    branches/acydburn/phpBB/includes/auth/auth_db.php
    branches/acydburn/phpBB/includes/session.php

Added: branches/acydburn/phpBB/includes/acm/index.php
==============================================================================
*** branches/acydburn/phpBB/includes/acm/index.php (added)
--- branches/acydburn/phpBB/includes/acm/index.php Thu Dec 11 17:39:51 2008
***************
*** 0 ****
--- 1,434 ----
+ <?php
+ /**
+ *
+ * @package acm
+ * @version $Id$
+ * @copyright (c) 2008 phpBB Group
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
+ 
+ /**
+ * ACM call schema for developer
+ *
+ * Base Class: phpbb_acm
+ * Abstract: phpbb_acm_abstract
+ * Type-specific class: phpbb_acm_[object] extends abstract
+ *
+ * Pre-defined cache types:
+ *		data	=> data files
+ *		sql		=> sql files
+ *		tpl		=> template files
+ *		ctpl	=> custom template files
+ *
+ * Main Class used for calls is phpbb_acm
+ * Methods to be called for cache data handling:
+ *		get(): Get cached data. For global data, prefix name with #
+ *		put(): Put data in cache. For global data, prefix name with #
+ *		tidy(): Tidy complete cache and remove expired entries.
+ *		purge(): Purge complete cache and remove all entries.
+ *		unload(): Unload complete cache (called on __destruct)
+ *		__call(): for calling methods only defined in phpbb_acm_[object]; the cache type must be the first parameter
+ *			example: [acm]->call_custom_method([type], [additional parameter]);
+ *
+ * Methods for handling cache types
+ *		register(), supported()
+ *
+ * If you add a new cache object (shm for example), then these are the phpbb_acm_[object] methods you must (or can) define (based on the abstract):
+ *	Required: get_local(), put_local(), destroy_local(), load(), save(), exists(), _purge()
+ *	Optional: get_global(), put_global(), destroy_global(), _tidy()
+ *
+ */
+ 
+ 
+ /**
+ * @ignore
+ */
+ if (!defined('IN_PHPBB'))
+ {
+ 	exit;
+ }
+ 
+ /**
+ * Define missing ACM config variable... if not initialized yet
+ * @ignore
+ */
+ if (!defined('CONFIG_ACM_TYPE'))
+ {
+ 	define('CONFIG_ACM_TYPE', 'file');
+ }
+ 
+ /**
+ * Base, accessible ACM class. All ACM calls are directed to this class
+ * @package acm
+ */
+ class phpbb_acm
+ {
+ 	/**
+ 	* Currently registered core acm types
+ 	*/
+ 	private $cache_types = array('data' => NULL, 'sql' => NULL, 'tpl' => NULL, 'ctpl' => NULL);
+ 
+ 	/**
+ 	* Constructor
+ 	*/
+ 	public function __construct() { }
+ 
+ 	/**
+ 	* In case someone wants to access a public function for the acm plugin not defined within the phpbb_acm class,
+ 	* we use this magic method. We expect the cache type for those calls as the *first* argument
+ 	*/
+ 	public function __call($method, $arguments)
+ 	{
+ 		// Get cache type
+ 		$cache_type = $arguments[0];
+ 		array_shift($arguments);
+ 
+ 		// Check if the cache type is initialized and exist
+ 		if (!$this->type_exists($cache_type))
+ 		{
+ 			return false;
+ 		}
+ 
+ 		// $this->cache_types[$cache_type]->$method($arguments);
+ 		return call_user_func_array(array($this->cache_types[$cache_type], $method), $arguments);
+ 	}
+ 
+ 	/**
+ 	* Get data from cache
+ 	*
+ 	* @param string $var_name The variable name. If prefixed with #, then the global cache will be used.
+ 	* @param string $cache_type The cache type to use. Default is 'data'.
+ 	*
+ 	* @return mixed false if no data was stored within the cache, else the dataset.
+ 	*/
+ 	public function get($var_name, $cache_type = 'data')
+ 	{
+ 		return $this->__call('get', array($cache_type, $var_name));
+ 	}
+ 
+ 	/**
+ 	* Store data in cache
+ 	*
+ 	* @param string $var_name The variable name. If prefixed with #, then the global cache will be used.
+ 	* @param mixed $data The data to store, usually an array.
+ 	* @param int $ttl The time the cache should be valid in seconds.
+ 	* @param string $cache_type The cache type to use. Default is 'data'.
+ 	*
+ 	* @return mixed The dataset stored.
+ 	*/
+ 	public function put($var_name, $data, $ttl = 31536000, $cache_type = 'data')
+ 	{
+ 		return $this->__call('put', array($cache_type, $var_name, $data, $ttl));
+ 	}
+ 
+ 	/**
+ 	* Tidy cache.
+ 	* This removes all expired cache files
+ 	*/
+ 	public function tidy()
+ 	{
+ 		foreach ($this->cache_types as $cache_type => $object)
+ 		{
+ 			if ($object === NULL)
+ 			{
+ 				continue;
+ 			}
+ 
+ 			$this->cache_types[$cache_type]->tidy();
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Purge cache.
+ 	* This removes all cache files from currently registered cache objects
+ 	*/
+ 	public function purge()
+ 	{
+ 		foreach ($this->cache_types as $cache_type => $object)
+ 		{
+ 			if ($object === NULL)
+ 			{
+ 				continue;
+ 			}
+ 
+ 			$this->cache_types[$cache_type]->purge();
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Register a custom cache type/class
+ 	*
+ 	* @param string $cache_type		The cache type to register/set
+ 	* @param string $cache_append	String to append to the cached data as identifier (if the coder has different types to distinct from)
+ 	* @param string $cache_object	The exact name of the cache class to load.
+ 	*								The filename must be: <code>includes/acm/acm_{$cache_object}.php</code>
+ 	*								The class definition must be: <code>class phpbb_acm_{$cache_object} extends phpbb_acm_abstract
+ 	*
+ 	*/
+ 	public function register($cache_type, $cache_append = false, $cache_object = CONFIG_ACM_TYPE)
+ 	{
+ 		// We need to init every cache type...
+ 		if (!isset($this->cache_types[$cache_type]))
+ 		{
+ 			$this->cache_types[$cache_type] = NULL;
+ 		}
+ 
+ 		// Unregister if already registered
+ 		if ($this->cache_types[$cache_type] !== NULL)
+ 		{
+ 			$this->cache_types[$cache_type] = NULL;
+ 		}
+ 
+ 		if ($this->cache_types[$cache_type] === NULL)
+ 		{
+ 			$class_name = 'phpbb_acm_' . $cache_object;
+ 
+ 			if (!class_exists($class_name))
+ 			{
+ 				if (!file_exists(PHPBB_ROOT_PATH . 'includes/acm/acm_' . $cache_object . '.' . PHP_EXT))
+ 				{
+ 					return false;
+ 				}
+ 				require_once(PHPBB_ROOT_PATH . 'includes/acm/acm_' . $cache_object . '.' . PHP_EXT);
+ 			}
+ 
+ 			// Set cache prefix, for example ctpl_prosilver
+ 			$cache_prefix = ($cache_append === false) ? $cache_type : $cache_type . '_' . $cache_append;
+ 
+ 			$this->cache_types[$cache_type] = new $class_name($cache_prefix);
+ 
+ 			if (!$this->supported($cache_type))
+ 			{
+ 				$this->cache_types[$cache_type] = NULL;
+ 				return false;
+ 			}
+ 		}
+ 
+ 		return true;
+ 	}
+ 
+ 	/**
+ 	* Unload everything from cache and make sure non-stored cache items are properly saved.
+ 	*/
+ 	public function unload()
+ 	{
+ 		foreach ($this->cache_types as $cache_type => $object)
+ 		{
+ 			if ($object === NULL)
+ 			{
+ 				continue;
+ 			}
+ 
+ 			$this->cache_types[$cache_type]->unload();
+ 		}
+ 	}
+ 
+ 	/**
+ 	* Check if a specific cache type is supported with the ACM class
+ 	*
+ 	* @param string $cache_type The cache type to check.
+ 	*
+ 	* @return bool True if the type is supported, else false.
+ 	*/
+ 	public function supported($cache_type)
+ 	{
+ 		if (!$this->type_exists($cache_type))
+ 		{
+ 			return false;
+ 		}
+ 
+ 		return !empty($this->cache_types[$cache_type]->supported[$cache_type]);
+ 	}
+ 
+ 	/**
+ 	* Check if the cache type exists. Sometimes some types do not exist if the relevant files are not there or do not support the given cache type.
+ 	*
+ 	* @param string $cache_type The cache type to check.
+ 	*
+ 	* @return bool True if the type exist, else false.
+ 	* @access private
+ 	*/
+ 	private function type_exists($cache_type)
+ 	{
+ 		if (!isset($this->cache_types[$cache_type]) || $this->cache_types[$cache_type] === NULL)
+ 		{
+ 			$this->register($cache_type);
+ 		}
+ 
+ 		return ($this->cache_types[$cache_type] !== NULL);
+ 	}
+ }
+ 
+ /**
+ * The abstract class all ACM plugins must extend. This abstract defines an object to be filled, with some functions pre-filled and some which must be filled.
+ * @package acm
+ */
+ abstract class phpbb_acm_abstract
+ {
+ 	protected $vars = array();
+ 	protected $var_expires = array();
+ 	protected $is_modified = false;
+ 
+ 	public $cache_prefix = '';
+ 
+ 	abstract protected function get_local($var_name);
+ 	abstract protected function put_local($var_name, $data, $ttl = 31536000);
+ 	abstract protected function destroy_local($var_name, $additional_data = false);
+ 	abstract public function load();
+ 	abstract public function save();
+ 	abstract public function exists($var_name);
+ 
+ 	abstract protected function _purge();
+ 
+ 	public function get($var_name)
+ 	{
+ 		// A global variable, use the internal arrays
+ 		if ($var_name[0] === '#')
+ 		{
+ 			$var_name = substr($var_name, 1);
+ 			return $this->get_global($var_name);
+ 		}
+ 		else
+ 		{
+ 			return $this->get_local($var_name);
+ 		}
+ 	}
+ 
+ 	public function put($var_name, $data, $ttl = 31536000)
+ 	{
+ 		if ($var_name[0] === '#')
+ 		{
+ 			$var_name = substr($var_name, 1);
+ 			return $this->put_global($var_name, $data, $ttl);
+ 		}
+ 		else
+ 		{
+ 			return $this->put_local($var_name, $data, $ttl);
+ 		}
+ 	}
+ 
+ 	public function destroy($var_name, $additional_data = false)
+ 	{
+ 		if ($var_name[0] === '#')
+ 		{
+ 			$var_name = substr($var_name, 1);
+ 			$this->destroy_global($var_name, $additional_data);
+ 		}
+ 		else
+ 		{
+ 			$this->destroy_local($var_name, $additional_data);
+ 		}
+ 	}
+ 
+ 	public function unload()
+ 	{
+ 		$this->save();
+ 		unset($this->vars);
+ 		unset($this->var_expires);
+ 
+ 		$this->vars = array();
+ 		$this->var_expires = array();
+ 	}
+ 
+ 	protected function get_global($var_name)
+ 	{
+ 		// Check if we have all variables
+ 		if (!sizeof($this->vars))
+ 		{
+ 			$this->load();
+ 		}
+ 
+ 		if (!isset($this->var_expires[$var_name]))
+ 		{
+ 			return false;
+ 		}
+ 
+ 		// If expired... we remove this entry now...
+ 		if (time() > $this->var_expires[$var_name])
+ 		{
+ 			$this->destroy_global($var_name);
+ 			return false;
+ 		}
+ 
+ 		if (isset($this->vars[$var_name]))
+ 		{
+ 			return $this->vars[$var_name];
+ 		}
+ 
+ 		return false;
+ 	}
+ 
+ 	protected function put_global($var_name, $data, $ttl = 31536000)
+ 	{
+ 		$this->vars[$var_name] = $data;
+ 		$this->var_expires[$var_name] = time() + $ttl;
+ 		$this->is_modified = true;
+ 
+ 		return $data;
+ 	}
+ 
+ 	protected function destroy_global($var_name, $additional_data = false)
+ 	{
+ 		$this->is_modified = true;
+ 
+ 		unset($this->vars[$var_name]);
+ 		unset($this->var_expires[$var_name]);
+ 
+ 		// We save here to let the following cache hits succeed
+ 		$this->save();
+ 	}
+ 
+ 	/**
+ 	* Tidy cache
+ 	*/
+ 	public function tidy()
+ 	{
+ 		// If cache has no auto-gc, we call the _tidy function here
+ 		if (method_exists($this, '_tidy'))
+ 		{
+ 			$this->_tidy();
+ 		}
+ 
+ 		// Now tidy global settings
+ 		if (!sizeof($this->vars))
+ 		{
+ 			$this->load();
+ 		}
+ 
+ 		foreach ($this->var_expires as $var_name => $expires)
+ 		{
+ 			if (time() > $expires)
+ 			{
+ 				// We only unset, then save later
+ 				unset($this->vars[$var_name]);
+ 				unset($this->var_expires[$var_name]);
+ 			}
+ 		}
+ 
+ 		$this->is_modified = true;
+ 		$this->save();
+ 
+ 		set_config('cache_last_gc', time(), true);
+ 	}
+ 
+ 	/**
+ 	* Purge Cache
+ 	*/
+ 	public function purge()
+ 	{
+ 		$this->_purge();
+ 
+ 		// Now purge global settings
+ 		unset($this->vars);
+ 		unset($this->var_expires);
+ 
+ 		$this->vars = array();
+ 		$this->var_expires = array();
+ 
+ 		$this->is_modified = true;
+ 		$this->save();
+ 	}
+ }
+ 
+ ?>
\ No newline at end of file

Propchange: branches/acydburn/phpBB/includes/acm/index.php
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: branches/acydburn/phpBB/includes/acm/index.php
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Removed: branches/acydburn/phpBB/includes/acp/auth.php
==============================================================================
*** branches/acydburn/phpBB/includes/acp/auth.php (original)
--- branches/acydburn/phpBB/includes/acp/auth.php (removed)
***************
*** 1,1260 ****
- <?php
- /**
- *
- * @package phpBB3
- * @version $Id$
- * @copyright (c) 2005 phpBB Group
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- *
- */
- 
- /**
- * @ignore
- */
- if (!defined('IN_PHPBB'))
- {
- 	exit;
- }
- 
- /**
- * ACP Permission/Auth class
- * @package phpBB3
- */
- class auth_admin extends auth
- {
- 	/**
- 	* Init auth settings
- 	*/
- 	function __construct()
- 	{
- 		global $db, $cache;
- 
- 		if (($this->acl_options = $cache->get('_acl_options')) === false)
- 		{
- 			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local
- 				FROM ' . ACL_OPTIONS_TABLE . '
- 				ORDER BY auth_option_id';
- 			$result = $db->sql_query($sql);
- 
- 			$global = $local = 0;
- 			$this->acl_options = array();
- 			while ($row = $db->sql_fetchrow($result))
- 			{
- 				if ($row['is_global'])
- 				{
- 					$this->acl_options['global'][$row['auth_option']] = $global++;
- 				}
- 
- 				if ($row['is_local'])
- 				{
- 					$this->acl_options['local'][$row['auth_option']] = $local++;
- 				}
- 
- 				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id'];
- 				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option'];
- 			}
- 			$db->sql_freeresult($result);
- 
- 			$cache->put('_acl_options', $this->acl_options);
- 		}
- 	}
- 	
- 	/**
- 	* Get permission mask
- 	* This function only supports getting permissions of one type (for example a_)
- 	*
- 	* @param set|view $mode defines the permissions we get, view gets effective permissions (checking user AND group permissions), set only gets the user or group permission set alone
- 	* @param mixed $user_id user ids to search for (a user_id or a group_id has to be specified at least)
- 	* @param mixed $group_id group ids to search for, return group related settings (a user_id or a group_id has to be specified at least)
- 	* @param mixed $forum_id forum_ids to search for. Defining a forum id also means getting local settings
- 	* @param string $auth_option the auth_option defines the permission setting to look for (a_ for example)
- 	* @param local|global $scope the scope defines the permission scope. If local, a forum_id is additionally required
- 	* @param ACL_NEVER|ACL_NO|ACL_YES $acl_fill defines the mode those permissions not set are getting filled with
- 	*/
- 	public function get_mask($mode, $user_id = false, $group_id = false, $forum_id = false, $auth_option = false, $scope = false, $acl_fill = ACL_NEVER)
- 	{
- 		global $db, $user;
- 
- 		$hold_ary = array();
- 		$view_user_mask = ($mode == 'view' && $group_id === false) ? true : false;
- 
- 		if ($auth_option === false || $scope === false)
- 		{
- 			return array();
- 		}
- 
- 		$acl_user_function = ($mode == 'set') ? 'acl_user_raw_data' : 'acl_raw_data';
- 
- 		if (!$view_user_mask)
- 		{
- 			if ($forum_id !== false)
- 			{
- 				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', $forum_id) : $this->$acl_user_function($user_id, $auth_option . '%', $forum_id);
- 			}
- 			else
- 			{
- 				$hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false);
- 			}
- 		}
- 
- 		// Make sure hold_ary is filled with every setting (prevents missing forums/users/groups)
- 		$ug_id = ($group_id !== false) ? ((!is_array($group_id)) ? array($group_id) : $group_id) : ((!is_array($user_id)) ? array($user_id) : $user_id);
- 		$forum_ids = ($forum_id !== false) ? ((!is_array($forum_id)) ? array($forum_id) : $forum_id) : (($scope == 'global') ? array(0) : array());
- 
- 		// Only those options we need
- 		$compare_options = array_diff(preg_replace('/^((?!' . $auth_option . ').+)|(' . $auth_option . ')$/', '', array_keys($this->acl_options[$scope])), array(''));
- 
- 		// If forum_ids is false and the scope is local we actually want to have all forums within the array
- 		if ($scope == 'local' && !sizeof($forum_ids))
- 		{
- 			$sql = 'SELECT forum_id
- 				FROM ' . FORUMS_TABLE;
- 			$result = $db->sql_query($sql, 120);
- 
- 			while ($row = $db->sql_fetchrow($result))
- 			{
- 				$forum_ids[] = (int) $row['forum_id'];
- 			}
- 			$db->sql_freeresult($result);
- 		}
- 
- 		if ($view_user_mask)
- 		{
- 			$auth2 = null;
- 
- 			$sql = 'SELECT user_id, user_permissions, user_type
- 				FROM ' . USERS_TABLE . '
- 				WHERE ' . $db->sql_in_set('user_id', $ug_id);
- 			$result = $db->sql_query($sql);
- 
- 			while ($userdata = $db->sql_fetchrow($result))
- 			{
- 				if ($user->data['user_id'] != $userdata['user_id'])
- 				{
- 					$auth2 = new auth();
- 					$auth2->acl($userdata);
- 				}
- 				else
- 				{
- 					global $auth;
- 					$auth2 = &$auth;
- 				}
- 
- 				
- 				$hold_ary[$userdata['user_id']] = array();
- 				foreach ($forum_ids as $f_id)
- 				{
- 					$hold_ary[$userdata['user_id']][$f_id] = array();
- 					foreach ($compare_options as $option)
- 					{
- 						$hold_ary[$userdata['user_id']][$f_id][$option] = $auth2->acl_get($option, $f_id);
- 					}
- 				}
- 			}
- 			$db->sql_freeresult($result);
- 
- 			unset($userdata);
- 			unset($auth2);
- 		}
- 
- 		foreach ($ug_id as $_id)
- 		{
- 			if (!isset($hold_ary[$_id]))
- 			{
- 				$hold_ary[$_id] = array();
- 			}
- 
- 			foreach ($forum_ids as $f_id)
- 			{
- 				if (!isset($hold_ary[$_id][$f_id]))
- 				{
- 					$hold_ary[$_id][$f_id] = array();
- 				}
- 			}
- 		}
- 
- 		// Now, we need to fill the gaps with $acl_fill. ;)
- 
- 		// Now switch back to keys
- 		if (sizeof($compare_options))
- 		{
- 			$compare_options = array_combine($compare_options, array_fill(1, sizeof($compare_options), $acl_fill));
- 		}
- 
- 		// Defining the user-function here to save some memory
- 		$return_acl_fill = create_function('$value', 'return ' . $acl_fill . ';');
- 
- 		// Actually fill the gaps
- 		if (sizeof($hold_ary))
- 		{
- 			foreach ($hold_ary as $ug_id => $row)
- 			{
- 				foreach ($row as $id => $options)
- 				{
- 					// Do not include the global auth_option
- 					unset($options[$auth_option]);
- 
- 					// Not a "fine" solution, but at all it's a 1-dimensional
- 					// array_diff_key function filling the resulting array values with zeros
- 					// The differences get merged into $hold_ary (all permissions having $acl_fill set)
- 					$hold_ary[$ug_id][$id] = array_merge($options,
- 
- 						array_map($return_acl_fill,
- 							array_flip(
- 								array_diff(
- 									array_keys($compare_options), array_keys($options)
- 								)
- 							)
- 						)
- 					);
- 				}
- 			}
- 		}
- 		else
- 		{
- 			$hold_ary[($group_id !== false) ? $group_id : $user_id][(int) $forum_id] = $compare_options;
- 		}
- 
- 		return $hold_ary;
- 	}
- 
- 	/**
- 	* Get permission mask for roles
- 	* This function only supports getting masks for one role
- 	*/
- 	public function get_role_mask($role_id)
- 	{
- 		global $db;
- 
- 		$hold_ary = array();
- 
- 		// Get users having this role set...
- 		$sql = 'SELECT user_id, forum_id
- 			FROM ' . ACL_USERS_TABLE . '
- 			WHERE auth_role_id = ' . $role_id . '
- 			ORDER BY forum_id';
- 		$result = $db->sql_query($sql);
- 
- 		while ($row = $db->sql_fetchrow($result))
- 		{
- 			$hold_ary[$row['forum_id']]['users'][] = $row['user_id'];
- 		}
- 		$db->sql_freeresult($result);
- 
- 		// Now grab groups...
- 		$sql = 'SELECT group_id, forum_id
- 			FROM ' . ACL_GROUPS_TABLE . '
- 			WHERE auth_role_id = ' . $role_id . '
- 			ORDER BY forum_id';
- 		$result = $db->sql_query($sql);
- 
- 		while ($row = $db->sql_fetchrow($result))
- 		{
- 			$hold_ary[$row['forum_id']]['groups'][] = $row['group_id'];
- 		}
- 		$db->sql_freeresult($result);
- 
- 		return $hold_ary;
- 	}
- 
- 	/**
- 	* Display permission mask (assign to template)
- 	*/
- 	public function display_mask($mode, $permission_type, array $hold_ary, $user_mode = 'user', $local = false, $group_display = true)
- 	{
- 		global $template, $user, $db;
- 
- 		// Define names for template loops, might be able to be set
- 		$tpl_pmask = 'p_mask';
- 		$tpl_fmask = 'f_mask';
- 		$tpl_category = 'category';
- 		$tpl_mask = 'mask';
- 
- 		$l_acl_type = (isset($user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)])) ? $user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)] : 'ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type);
- 
- 		// Allow trace for viewing permissions and in user mode
- 		$show_trace = ($mode == 'view' && $user_mode == 'user') ? true : false;
- 
- 		// Get names
- 		if ($user_mode == 'user')
- 		{
- 			$sql = 'SELECT user_id as ug_id, username as ug_name
- 				FROM ' . USERS_TABLE . '
- 				WHERE ' . $db->sql_in_set('user_id', array_keys($hold_ary)) . '
- 				ORDER BY username_clean ASC';
- 		}
- 		else
- 		{
- 			$sql = 'SELECT group_id as ug_id, group_name as ug_name, group_type
- 				FROM ' . GROUPS_TABLE . '
- 				WHERE ' . $db->sql_in_set('group_id', array_keys($hold_ary)) . '
- 				ORDER BY group_type DESC, group_name ASC';
- 		}
- 		$result = $db->sql_query($sql);
- 
- 		$ug_names_ary = array();
- 		while ($row = $db->sql_fetchrow($result))
- 		{
- 			$ug_names_ary[$row['ug_id']] = ($user_mode == 'user') ? $row['ug_name'] : (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['ug_name']] : $row['ug_name']);
- 		}
- 		$db->sql_freeresult($result);
- 
- 		// Get used forums
- 		$forum_ids = array();
- 		foreach ($hold_ary as $ug_id => $row)
- 		{
- 			$forum_ids = array_merge($forum_ids, array_keys($row));
- 		}
- 		$forum_ids = array_unique($forum_ids);
- 
- 		$forum_names_ary = array();
- 		if ($local)
- 		{
- 			$forum_names_ary = make_forum_select(false, false, true, false, false, false, true);
- 
- 			// Remove the disabled ones, since we do not create an option field here...
- 			foreach ($forum_names_ary as $key => $value)
- 			{
- 				if (!$value['disabled'])
- 				{
- 					continue;
- 				}
- 				unset($forum_names_ary[$key]);
- 			}
- 		}
- 		else
- 		{
- 			$forum_names_ary[0] = $l_acl_type;
- 		}
- 
- 		// Get available roles
- 		$sql = 'SELECT *
- 			FROM ' . ACL_ROLES_TABLE . "
- 			WHERE role_type = '" . $db->sql_escape($permission_type) . "'
- 			ORDER BY role_order ASC";
- 		$result = $db->sql_query($sql);
- 
- 		$roles = array();
- 		while ($row = $db->sql_fetchrow($result))
- 		{
- 			$roles[$row['role_id']] = $row;
- 		}
- 		$db->sql_freeresult($result);
- 
- 		$cur_roles = $this->acl_role_data($user_mode, $permission_type, array_keys($hold_ary));
- 
- 		// Build js roles array (role data assignments)
- 		$s_role_js_array = '';
- 		
- 		if (sizeof($roles))
- 		{
- 			$s_role_js_array = array();
- 
- 			// Make sure every role (even if empty) has its array defined
- 			foreach ($roles as $_role_id => $null)
- 			{
- 				$s_role_js_array[$_role_id] = "\n" . 'role_options[' . $_role_id . '] = new Array();' . "\n";
- 			}
- 
- 			$sql = 'SELECT r.role_id, o.auth_option, r.auth_setting
- 				FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o
- 				WHERE o.auth_option_id = r.auth_option_id
- 					AND ' . $db->sql_in_set('r.role_id', array_keys($roles));
- 			$result = $db->sql_query($sql);
- 
- 			while ($row = $db->sql_fetchrow($result))
- 			{
- 				$flag = substr($row['auth_option'], 0, strpos($row['auth_option'], '_') + 1);
- 				if ($flag == $row['auth_option'])
- 				{
- 					continue;
- 				}
- 
- 				$s_role_js_array[$row['role_id']] .= 'role_options[' . $row['role_id'] . '][\'' . addslashes($row['auth_option']) . '\'] = ' . $row['auth_setting'] . '; ';
- 			}
- 			$db->sql_freeresult($result);
- 
- 			$s_role_js_array = implode('', $s_role_js_array);
- 		}
- 
- 		$template->assign_var('S_ROLE_JS_ARRAY', $s_role_js_array);
- 		unset($s_role_js_array);
- 
- 		// Now obtain memberships
- 		$user_groups_default = $user_groups_custom = array();
- 		if ($user_mode == 'user' && $group_display)
- 		{
- 			$sql = 'SELECT group_id, group_name, group_type
- 				FROM ' . GROUPS_TABLE . '
- 				ORDER BY group_type DESC, group_name ASC';
- 			$result = $db->sql_query($sql);
- 
- 			$groups = array();
- 			while ($row = $db->sql_fetchrow($result))
- 			{
- 				$groups[$row['group_id']] = $row;
- 			}
- 			$db->sql_freeresult($result);
- 
- 			$memberships = group_memberships(false, array_keys($hold_ary), false);
- 
- 			// User is not a member of any group? Bad admin, bad bad admin...
- 			if ($memberships)
- 			{
- 				foreach ($memberships as $row)
- 				{
- 					if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL)
- 					{
- 						$user_groups_default[$row['user_id']][] = $user->lang['G_' . $groups[$row['group_id']]['group_name']];
- 					}
- 					else
- 					{
- 						$user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name'];
- 					}
- 				}
- 			}
- 			unset($memberships, $groups);
- 		}
- 
- 		// If we only have one forum id to display or being in local mode and more than one user/group to display,
- 		// we switch the complete interface to group by user/usergroup instead of grouping by forum
- 		// To achieve this, we need to switch the array a bit
- 		if (sizeof($forum_ids) == 1 || ($local && sizeof($ug_names_ary) > 1))
- 		{
- 			$hold_ary_temp = $hold_ary;
- 			$hold_ary = array();
- 			foreach ($hold_ary_temp as $ug_id => $row)
- 			{
- 				foreach ($forum_names_ary as $forum_id => $forum_row)
- 				{
- 					if (isset($row[$forum_id]))
- 					{
- 						$hold_ary[$forum_id][$ug_id] = $row[$forum_id];
- 					}
- 				}
- 			}
- 			unset($hold_ary_temp);
- 
- 			foreach ($hold_ary as $forum_id => $forum_array)
- 			{
- 				$content_array = $categories = array();
- 				self::build_permission_array($hold_ary[$forum_id], $content_array, $categories, array_keys($ug_names_ary));
- 
- 				$template->assign_block_vars($tpl_pmask, array(
- 					'NAME'			=> ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
- 					'PADDING'		=> ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
- 
- 					'CATEGORIES'	=> implode('</th><th>', $categories),
- 
- 					'L_ACL_TYPE'	=> $l_acl_type,
- 
- 					'S_LOCAL'		=> ($local) ? true : false,
- 					'S_GLOBAL'		=> (!$local) ? true : false,
- 					'S_NUM_CATS'	=> sizeof($categories),
- 					'S_VIEW'		=> ($mode == 'view') ? true : false,
- 					'S_NUM_OBJECTS'	=> sizeof($content_array),
- 					'S_USER_MODE'	=> ($user_mode == 'user') ? true : false,
- 					'S_GROUP_MODE'	=> ($user_mode == 'group') ? true : false)
- 				);
- 
- 				@reset($content_array);
- 				while (list($ug_id, $ug_array) = each($content_array))
- 				{
- 					// Build role dropdown options
- 					$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;
- 
- 					$s_role_options = '';
- 
- 					@reset($roles);
- 					while (list($role_id, $role_row) = each($roles))
- 					{
- 						$role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
- 						$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
- 
- 						$title = ($role_description) ? ' title="' . $role_description . '"' : '';
- 						$s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';
- 					}
- 
- 					if ($s_role_options)
- 					{
- 						$s_role_options = '<option value="0"' . ((!$current_role_id) ? ' selected="selected"' : '') . ' title="' . htmlspecialchars($user->lang['NO_ROLE_ASSIGNED_EXPLAIN']) . '">' . $user->lang['NO_ROLE_ASSIGNED'] . '</option>' . $s_role_options;
- 					}
- 
- 					if (!$current_role_id && $mode != 'view')
- 					{
- 						$s_custom_permissions = false;
- 
- 						foreach ($ug_array as $key => $value)
- 						{
- 							if ($value['S_NEVER'] || $value['S_YES'])
- 							{
- 								$s_custom_permissions = true;
- 								break;
- 							}
- 						}
- 					}
- 					else
- 					{
- 						$s_custom_permissions = false;
- 					}
- 
- 					$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
- 						'NAME'				=> $ug_names_ary[$ug_id],
- 						'S_ROLE_OPTIONS'	=> $s_role_options,
- 						'UG_ID'				=> $ug_id,
- 						'S_CUSTOM'			=> $s_custom_permissions,
- 						'FORUM_ID'			=> $forum_id)
- 					);
- 
- 					self::assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view'));
- 
- 					unset($content_array[$ug_id]);
- 				}
- 
- 				unset($hold_ary[$forum_id]);
- 			}
- 		}
- 		else
- 		{
- 			foreach ($ug_names_ary as $ug_id => $ug_name)
- 			{
- 				if (!isset($hold_ary[$ug_id]))
- 				{
- 					continue;
- 				}
- 
- 				$content_array = $categories = array();
- 				self::build_permission_array($hold_ary[$ug_id], $content_array, $categories, array_keys($forum_names_ary));
- 
- 				$template->assign_block_vars($tpl_pmask, array(
- 					'NAME'			=> $ug_name,
- 					'CATEGO...

[truncated message content]

Thread: [Phpbb-checkins] r9185 [1/4] - in /branches/acydburn/phpBB/includes: acm/index.php acp/auth.php aut

phpBB is the world's leading open source discussion forum software.

phpbb-checkins