satanasov / phpbbgallery

core/controller/comment.php

Indentation +2 added lines, -2 removed lines

@@ -825,8 +825,8 @@
 		generate_smilies('inline', 0);
 
 		/**
-		* Rating-System: now you can comment and rate in one form
-		*/
+		 * Rating-System: now you can comment and rate in one form
+		 */
 		$s_user_rated = false;
 		if ($this->gallery_config->get('allow_rates'))
 		{

core/ext.php

Indentation +19 added lines, -19 removed lines

@@ -14,11 +14,11 @@ 
 		'phpbbgallery/acpcleanup',
 	);
 	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single enable step that installs any included migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function enable_step($old_state)
 	{
 		switch ($old_state)
@@ -52,11 +52,11 @@ 
 	}
 
 	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single disable step that does nothing
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function disable_step($old_state)
 	{
 		switch ($old_state)
@@ -87,21 +87,21 @@ 
 	}
 
 	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single purge step that reverts any included and installed migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function purge_step($old_state)
 	{
 		switch ($old_state)
 		{
 			case '': // Empty means nothing has run yet
 				/**
-				* @todo Remove this try/catch condition once purge_notifications is fixed
-				* in the core to work with disabled extensions without fatal errors.
-				* https://tracker.phpbb.com/browse/PHPBB3-12435
-				*/
+				 * @todo Remove this try/catch condition once purge_notifications is fixed
+				 * in the core to work with disabled extensions without fatal errors.
+				 * https://tracker.phpbb.com/browse/PHPBB3-12435
+				 */
 				try
 				{
 					// Purge board rules notifications

core/moderate.php

Indentation +5 added lines, -5 removed lines

@@ -59,11 +59,11 @@
 	}
 
 	/**
-	* Helper function building queues
-	* @param	int		$album	album we build queue for
-	* @param	int		$page	This queue builder should return objects for MCP queues, so page?
-	* @param	int		$per_page	We need how many elements per page
-	*/
+	 * Helper function building queues
+	 * @param	int		$album	album we build queue for
+	 * @param	int		$page	This queue builder should return objects for MCP queues, so page?
+	 * @param	int		$per_page	We need how many elements per page
+	 */
 	public function build_list($album, $page = 1, $per_page = 0)
 	{
 		// So if we are not forcing par page get it from config

core/album/album.php

Indentation +25 added lines, -25 removed lines

@@ -14,40 +14,40 @@ 
 
 class album
 {
-    /** @var \phpbb\db\driver\driver_interface  */
-    protected $db;
+	/** @var \phpbb\db\driver\driver_interface  */
+	protected $db;
 
-    /** @var \phpbb\user  */
-    protected $user;
+	/** @var \phpbb\user  */
+	protected $user;
 
-    /** @var language  */
-    protected $language;
+	/** @var language  */
+	protected $language;
 
-    /** @var \phpbb\profilefields\manager  */
-    protected $user_cpf;
+	/** @var \phpbb\profilefields\manager  */
+	protected $user_cpf;
 
-    /** @var \phpbbgallery\core\auth\auth  */
-    protected $gallery_auth;
+	/** @var \phpbbgallery\core\auth\auth  */
+	protected $gallery_auth;
 
-    /** @var \phpbbgallery\core\cache  */
-    protected $gallery_cache;
+	/** @var \phpbbgallery\core\cache  */
+	protected $gallery_cache;
 
-    /** @var \phpbbgallery\core\block  */
-    protected $block;
+	/** @var \phpbbgallery\core\block  */
+	protected $block;
 
-    /** @var \phpbbgallery\core\config  */
-    protected $gallery_config;
+	/** @var \phpbbgallery\core\config  */
+	protected $gallery_config;
 
-    /** @var  */
-    protected $images_table;
+	/** @var  */
+	protected $images_table;
 
-    /** @var  */
-    protected $watch_table;
+	/** @var  */
+	protected $watch_table;
 
-    /** @var  */
-    protected $contest_table;
+	/** @var  */
+	protected $contest_table;
 
-    /** @var  */
+	/** @var  */
 	protected $albums_table;
 
 	/**
@@ -463,8 +463,8 @@ 
 	}
 
 	/**
-	* Create array of album IDs that are public
-	*/
+	 * Create array of album IDs that are public
+	 */
 	public function get_public_albums()
 	{
 		$sql = 'SELECT album_id

core/album/loader.php

Indentation +13 added lines, -13 removed lines

@@ -40,12 +40,12 @@ 
 	}
 
 	/**
-	* Load the data of an album
-	*
-	* @param	int		$album_id
-	* @return	bool	True if the album was loaded
-	* @throws	\OutOfBoundsException	if the album does not exist
-	*/
+	 * Load the data of an album
+	 *
+	 * @param	int		$album_id
+	 * @return	bool	True if the album was loaded
+	 * @throws	\OutOfBoundsException	if the album does not exist
+	 */
 	public function load($album_id)
 	{
 		$sql_array = array(
@@ -107,13 +107,13 @@ 
 	}
 
 	/**
-	* Check whether the album_user is the user who wants to do something
-	*
-	* @param	int		$album_id
-	* @param	mixed	$user_id	If false the current user will be compared
-	* @return	bool	True if the user is the owner of the album
-	* @throws	\DomainException	if the user is not the owner of the album
-	*/
+	 * Check whether the album_user is the user who wants to do something
+	 *
+	 * @param	int		$album_id
+	 * @param	mixed	$user_id	If false the current user will be compared
+	 * @return	bool	True if the user is the owner of the album
+	 * @throws	\DomainException	if the user is not the owner of the album
+	 */
 	public function validate_owner($album_id, $user_id = false)
 	{
 		$album_id = (int) $album_id;

core/album/manage.php

Indentation +27 added lines, -27 removed lines

@@ -751,8 +751,8 @@ 
 		$log_action = implode('_', array($log_action_images, $log_action_albums));
 
 		/**
-		* Log what we did
-		*/
+		 * Log what we did
+		 */
 		switch ($log_action)
 		{
 			case 'MOVE_IMAGES_MOVE_ALBUMS':
@@ -842,14 +842,14 @@ 
 		$this->gallery_notification->delete_albums($from_id);
 
 		/**
-		* Event related to moving album content
-		*
-		* @event phpbbgallery.core.album.manage.move_album_content
-		* @var	int	from_id		Album we are moving from
-		* @var	int	to_id		Album we are moving to
-		* @var	bool	sync	Should we sync the albums data
-		* @since 1.2.0
-		*/
+		 * Event related to moving album content
+		 *
+		 * @event phpbbgallery.core.album.manage.move_album_content
+		 * @var	int	from_id		Album we are moving from
+		 * @var	int	to_id		Album we are moving to
+		 * @var	bool	sync	Should we sync the albums data
+		 * @since 1.2.0
+		 */
 		$vars = array('from_id', 'to_id', 'sync');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.move_album_content', compact($vars)));
 
@@ -951,12 +951,12 @@ 
 		$this->gallery_config->set('num_comments', $row['num_comments']);
 
 		/**
-		* Event delete album content
-		*
-		* @event phpbbgallery.core.album.manage.delete_album_content
-		* @var	int	album_id		Album we are deleting
-		* @since 1.2.0
-		*/
+		 * Event delete album content
+		 *
+		 * @event phpbbgallery.core.album.manage.delete_album_content
+		 * @var	int	album_id		Album we are deleting
+		 * @since 1.2.0
+		 */
 		$vars = array('album_id');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.delete_album_content', compact($vars)));
 
@@ -979,11 +979,11 @@ 
 	public function move_album_by($album_row, $action = 'move_up', $steps = 1)
 	{
 		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
+		 * Fetch all the siblings between the module's current spot
+		 * and where we want to move it to. If there are less than $steps
+		 * siblings between the current spot and the target then the
+		 * module will move as far as possible
+		 */
 		$sql = 'SELECT album_id, album_name, left_id, right_id
 			FROM ' . $this->albums_table . ' 
 			WHERE parent_id = ' . (int) $album_row['parent_id'] . '
@@ -1005,12 +1005,12 @@ 
 		}
 
 		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
+		 * $left_id and $right_id define the scope of the nodes that are affected by the move.
+		 * $diff_up and $diff_down are the values to substract or add to each node's left_id
+		 * and right_id in order to move them up or down.
+		 * $move_up_left and $move_up_right define the scope of the nodes that are moving
+		 * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
+		 */
 		if ($action == 'move_up')
 		{
 			$left_id = $target['left_id'];

core/search.php

Indentation +3 added lines, -3 removed lines

@@ -213,9 +213,9 @@
 	}
 
 	/**
-	* Get all recent images the user has access to
-	* return (int) $images_count
-	*/
+	 * Get all recent images the user has access to
+	 * return (int) $images_count
+	 */
 	public function recent_count()
 	{
 		$this->gallery_auth->load_user_premissions($this->user->data['user_id']);

core/user.php

Indentation +169 added lines, -169 removed lines

@@ -103,8 +103,8 @@ 
 	}
 
 	/**
-	* Load the users data from the database and cast it...
-	*/
+	 * Load the users data from the database and cast it...
+	 */
 	public function load_data()
 	{
 		$this->entry_exists	= false;
@@ -134,9 +134,9 @@ 
 	}
 
 	/**
-	* Some functions need the data to be loaded or at least checked.
-	* So here we loaded if it is not laoded yet and we need it ;)
-	*/
+	 * Some functions need the data to be loaded or at least checked.
+	 * So here we loaded if it is not laoded yet and we need it ;)
+	 */
 	public function force_load()
 	{
 		if (is_null($this->entry_exists))
@@ -146,12 +146,12 @@ 
 	}
 
 	/**
-	* Get user-setting, if the user does not have his own settings we fall back to default.
-	*
-	* @param	string	$key		Column name from the users-table
-	* @param	bool	$default	Load default value, if user has no entry
-	* @return	mixed			Returns the value of the column, it it does not exist it returns false.
-	*/
+	 * Get user-setting, if the user does not have his own settings we fall back to default.
+	 *
+	 * @param	string	$key		Column name from the users-table
+	 * @param	bool	$default	Load default value, if user has no entry
+	 * @return	mixed			Returns the value of the column, it it does not exist it returns false.
+	 */
 	public function get_data($key, $default = true)
 	{
 		if (isset($this->data[$key]))
@@ -217,11 +217,11 @@ 
 	}
 
 	/**
-	* Updates the users table with the new data.
-	*
-	* @param	array	$data	Array of data we want to add/update.
-	* @return	bool			Returns true if the columns were updated successfully
-	*/
+	 * Updates the users table with the new data.
+	 *
+	 * @param	array	$data	Array of data we want to add/update.
+	 * @return	bool			Returns true if the columns were updated successfully
+	 */
 	private function update($data)
 	{
 		$sql_ary = array_merge($this->validate_data($data), array(
@@ -240,11 +240,11 @@ 
 	}
 
 	/**
-	* Updates the users table by increasing the values.
-	*
-	* @param	int		$num	Number of images to add to the counter
-	* @return	bool			Returns true if the columns were updated successfully, else false
-	*/
+	 * Updates the users table by increasing the values.
+	 *
+	 * @param	int		$num	Number of images to add to the counter
+	 * @return	bool			Returns true if the columns were updated successfully, else false
+	 */
 	protected function update_image_count($num)
 	{
 		$sql = 'UPDATE ' . $this->gallery_users_table . '
@@ -267,11 +267,11 @@ 
 	}
 
 	/**
-	* Updates the users table with the new data.
-	*
-	* @param	array	$data	Array of data we want to insert
-	* @return	bool			Returns true if the data was inserted successfully
-	*/
+	 * Updates the users table with the new data.
+	 *
+	 * @param	array	$data	Array of data we want to insert
+	 * @return	bool			Returns true if the data was inserted successfully
+	 */
 	private function insert($data)
 	{
 		$sql_ary = array_merge(self::get_default_values(), $this->validate_data($data), array(
@@ -295,8 +295,8 @@ 
 	}
 
 	/**
-	* Delete the user from the table.
-	*/
+	 * Delete the user from the table.
+	 */
 	public function delete()
 	{
 		$sql = 'DELETE FROM ' . $this->gallery_users_table . '
@@ -305,10 +305,10 @@ 
 	}
 
 	/**
-	* Delete the user from the table.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to delete all users.
-	*/
+	 * Delete the user from the table.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to delete all users.
+	 */
 	public function delete_users($user_ids)
 	{
 
@@ -320,12 +320,12 @@ 
 	}
 
 	/**
-	* Updates the users table with new data.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
-	* @param	array	$data		Array of data we want to add/update.
-	* @return	bool				Returns true if the columns were updated successfully
-	*/
+	 * Updates the users table with new data.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
+	 * @param	array	$data		Array of data we want to add/update.
+	 * @return	bool				Returns true if the columns were updated successfully
+	 */
 	public function update_users($user_ids, $data)
 	{
 		$sql_ary = array_merge($this->validate_data($data), array(
@@ -344,11 +344,11 @@ 
 	}
 
 	/**
-	* Builds a valid WHERE-sql-statement, with casted integers, or empty to allow handling all users.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
-	* @return	string				The WHERE statement with "WHERE " if needed.
-	*/
+	 * Builds a valid WHERE-sql-statement, with casted integers, or empty to allow handling all users.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
+	 * @return	string				The WHERE statement with "WHERE " if needed.
+	 */
 	public function sql_build_where($user_ids)
 	{
 		if (is_array($user_ids) && !empty($user_ids))
@@ -368,12 +368,12 @@ 
 	}
 
 	/**
-	* Validate user data.
-	*
-	* @param	array	$data	Array of data we need to validate
-	* @param	bool	$inc	Are we incrementing the value
-	* @return	array			Array with all allowed keys and their casted and selected values
-	*/
+	 * Validate user data.
+	 *
+	 * @param	array	$data	Array of data we need to validate
+	 * @param	bool	$inc	Are we incrementing the value
+	 * @return	array			Array with all allowed keys and their casted and selected values
+	 */
 	public function validate_data($data, $inc = false)
 	{
 		$validated_data = array();
@@ -412,14 +412,14 @@ 
 					$is_validated = false;
 
 					/**
-					* Event user validat data
-					*
-					* @event phpbbgallery.core.user.validate_data
-					* @var	bool	is_validated	is value validated
-					* @var	string	name			value name
-					* @var	mixed	value			value of the value
-					* @since 1.2.0
-					*/
+					 * Event user validat data
+					 *
+					 * @event phpbbgallery.core.user.validate_data
+					 * @var	bool	is_validated	is value validated
+					 * @var	string	name			value name
+					 * @var	mixed	value			value of the value
+					 * @since 1.2.0
+					 */
 					$vars = array('is_validated', 'name', 'value');
 					extract($this->dispatcher->trigger_event('phpbbgallery.core.user.validate_data', compact($vars)));
 
@@ -457,12 +457,12 @@ 
 		$default_values = self::$default_values;
 
 		/**
-		* Event user validat data
-		*
-		* @event phpbbgallery.core.user.get_default_values
-		* @var	array	default_values	the default values array
-		* @since 1.2.0
-		*/
+		 * Event user validat data
+		 *
+		 * @event phpbbgallery.core.user.get_default_values
+		 * @var	array	default_values	the default values array
+		 * @since 1.2.0
+		 */
 		$vars = array('default_values');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.user.get_default_values', compact($vars)));
 
@@ -470,8 +470,8 @@ 
 	}
 
 	/**
-	* Default values for new users.
-	*/
+	 * Default values for new users.
+	 */
 	static protected $default_values = array(
 		'user_images'		=> 0,
 		'personal_album_id'	=> 0,
@@ -505,111 +505,111 @@ 
 			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
 		}
 
-        $now = $this->user->create_datetime();
-        $now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset());
-
-        // Cache various user specific data ... so we don't have to recompute
-        // this each time the same user appears on this page
-        if (!isset($user_cache[$user_id])) {
-            if ($user_id == ANONYMOUS) {
-                $user_cache_data = array(
-                    'user_type' => USER_IGNORE,
-                    'joined' => '',
-                    'posts' => '',
-                    'sig' => '',
-                    'sig_bbcode_uid' => '',
-                    'sig_bbcode_bitfield' => '',
-                    'online' => false,
-                    'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
-                    'rank_title' => '',
-                    'rank_image' => '',
-                    'rank_image_src' => '',
-                    'pm' => '',
-                    'email' => '',
-                    'jabber' => '',
-                    'search' => '',
-                    'age' => '',
-                    'username' => $row['username'],
-                    'user_colour' => $row['user_colour'],
-                    'contact_user' => '',
-                    'warnings' => 0,
-                    'allow_pm' => 0,
-                );
-            } else {
-                $user_sig = '';
-                // We add the signature to every posters entry because enable_sig is post dependent
-                if ($row['user_sig'] && $this->config['allow_sig'] && $this->user->optionget('viewsigs')) {
-                    $user_sig = $row['user_sig'];
-                }
-                $user_cache_data = array(
-                    'user_type' => $row['user_type'],
-                    'user_inactive_reason' => $row['user_inactive_reason'],
-                    'joined' => $this->user->format_date($row['user_regdate']),
-                    'posts' => $row['user_posts'],
-                    'warnings' => (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
-                    'sig' => $user_sig,
-                    'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '',
-                    'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '',
-                    'viewonline' => $row['user_allow_viewonline'],
-                    'allow_pm' => $row['user_allow_pm'],
-                    'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
-                    'age' => '',
-                    'rank_title' => '',
-                    'rank_image' => '',
-                    'rank_image_src' => '',
-                    'username' => $row['username'],
-                    'user_colour' => $row['user_colour'],
-                    'contact_user' => $this->user->lang('CONTACT_USER', get_username_string('username', $user_id, $row['username'], $row['user_colour'], $row['username'])),
-                    'online' => false,
-                    'jabber' => ($this->config['jab_enable'] && $row['user_jabber'] && $this->auth->acl_get('u_sendim')) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=contact&action=jabber&u=$user_id") : '',
-                    'search' => ($this->config['load_search'] && $this->auth->acl_get('u_search')) ? append_sid("{$this->root_path}search.$this->php_ext", "author_id=$user_id&sr=posts") : '',
-                    'author_full' => get_username_string('full', $user_id, $row['username'], $row['user_colour']),
-                    'author_colour' => get_username_string('colour', $user_id, $row['username'], $row['user_colour']),
-                    'author_username' => get_username_string('username', $user_id, $row['username'], $row['user_colour']),
-                    'author_profile' => get_username_string('profile', $user_id, $row['username'], $row['user_colour']),
-                );
-
-                $user_cache[$user_id] = $user_cache_data;
-
-                $user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
-                $user_cache[$user_id]['rank_title'] = $user_rank_data['title'];
-                $user_cache[$user_id]['rank_image'] = $user_rank_data['img'];
-                $user_cache[$user_id]['rank_image_src'] = $user_rank_data['img_src'];
-
-                if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
-                {
-                    $user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
-                }
-                else
-                {
-                    $user_cache[$user_id]['email'] = '';
-                }
-                if ($this->config['allow_birthdays'] && !empty($row['user_birthday']))
-                {
-                    list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday']));
-                    if ($bday_year)
-                    {
-                        $diff = $now['mon'] - $bday_month;
-                        if ($diff == 0)
-                        {
-                            $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-                        }
-                        else
-                        {
-                            $diff = ($diff < 0) ? 1 : 0;
-                        }
-                        $user_cache[$user_id]['age'] = (int) ($now['year'] - $bday_year - $diff);
-                    }
-                }
-            }
-        }
+		$now = $this->user->create_datetime();
+		$now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset());
+
+		// Cache various user specific data ... so we don't have to recompute
+		// this each time the same user appears on this page
+		if (!isset($user_cache[$user_id])) {
+			if ($user_id == ANONYMOUS) {
+				$user_cache_data = array(
+					'user_type' => USER_IGNORE,
+					'joined' => '',
+					'posts' => '',
+					'sig' => '',
+					'sig_bbcode_uid' => '',
+					'sig_bbcode_bitfield' => '',
+					'online' => false,
+					'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
+					'rank_title' => '',
+					'rank_image' => '',
+					'rank_image_src' => '',
+					'pm' => '',
+					'email' => '',
+					'jabber' => '',
+					'search' => '',
+					'age' => '',
+					'username' => $row['username'],
+					'user_colour' => $row['user_colour'],
+					'contact_user' => '',
+					'warnings' => 0,
+					'allow_pm' => 0,
+				);
+			} else {
+				$user_sig = '';
+				// We add the signature to every posters entry because enable_sig is post dependent
+				if ($row['user_sig'] && $this->config['allow_sig'] && $this->user->optionget('viewsigs')) {
+					$user_sig = $row['user_sig'];
+				}
+				$user_cache_data = array(
+					'user_type' => $row['user_type'],
+					'user_inactive_reason' => $row['user_inactive_reason'],
+					'joined' => $this->user->format_date($row['user_regdate']),
+					'posts' => $row['user_posts'],
+					'warnings' => (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
+					'sig' => $user_sig,
+					'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '',
+					'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '',
+					'viewonline' => $row['user_allow_viewonline'],
+					'allow_pm' => $row['user_allow_pm'],
+					'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
+					'age' => '',
+					'rank_title' => '',
+					'rank_image' => '',
+					'rank_image_src' => '',
+					'username' => $row['username'],
+					'user_colour' => $row['user_colour'],
+					'contact_user' => $this->user->lang('CONTACT_USER', get_username_string('username', $user_id, $row['username'], $row['user_colour'], $row['username'])),
+					'online' => false,
+					'jabber' => ($this->config['jab_enable'] && $row['user_jabber'] && $this->auth->acl_get('u_sendim')) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=contact&amp;action=jabber&amp;u=$user_id") : '',
+					'search' => ($this->config['load_search'] && $this->auth->acl_get('u_search')) ? append_sid("{$this->root_path}search.$this->php_ext", "author_id=$user_id&amp;sr=posts") : '',
+					'author_full' => get_username_string('full', $user_id, $row['username'], $row['user_colour']),
+					'author_colour' => get_username_string('colour', $user_id, $row['username'], $row['user_colour']),
+					'author_username' => get_username_string('username', $user_id, $row['username'], $row['user_colour']),
+					'author_profile' => get_username_string('profile', $user_id, $row['username'], $row['user_colour']),
+				);
+
+				$user_cache[$user_id] = $user_cache_data;
+
+				$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
+				$user_cache[$user_id]['rank_title'] = $user_rank_data['title'];
+				$user_cache[$user_id]['rank_image'] = $user_rank_data['img'];
+				$user_cache[$user_id]['rank_image_src'] = $user_rank_data['img_src'];
+
+				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
+				{
+					$user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&amp;u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
+				}
+				else
+				{
+					$user_cache[$user_id]['email'] = '';
+				}
+				if ($this->config['allow_birthdays'] && !empty($row['user_birthday']))
+				{
+					list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday']));
+					if ($bday_year)
+					{
+						$diff = $now['mon'] - $bday_month;
+						if ($diff == 0)
+						{
+							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
+						}
+						else
+						{
+							$diff = ($diff < 0) ? 1 : 0;
+						}
+						$user_cache[$user_id]['age'] = (int) ($now['year'] - $bday_year - $diff);
+					}
+				}
+			}
+		}
 	}
 
 	/**
-	* Get user personal album
-	* Checks and returns users personal album
-	* returns (int) $album_id or 0
-	*/
+	 * Get user personal album
+	 * Checks and returns users personal album
+	 * returns (int) $album_id or 0
+	 */
 	public function get_own_root_album()
 	{
 		$sql = 'SELECT personal_album_id FROM ' . $this->gallery_users_table . ' WHERE user_id = ' . (int) $this->user_id;
@@ -619,8 +619,8 @@ 
 	}
 
 	/**
-	* Destroy user data and set this class to empty
-	*/
+	 * Destroy user data and set this class to empty
+	 */
 	public function destroy()
 	{
 		$this->user_id = null;

core/file/file.php

Indentation +9 added lines, -9 removed lines

@@ -231,9 +231,9 @@ 
 	}
 
 	/**
-	* We need to disable the "last-modified" caching for guests and in cases of image-errors,
-	* so that they can view them, if they logged in or the error was fixed.
-	*/
+	 * We need to disable the "last-modified" caching for guests and in cases of image-errors,
+	 * so that they can view them, if they logged in or the error was fixed.
+	 */
 	public function disable_browser_cache()
 	{
 		$this->browser_cache = false;
@@ -460,12 +460,12 @@ 
 	}
 
 	/**
-	* Delete file from disc.
-	*
-	* @param	mixed		$files		String with filename or an array of filenames
-	*									Array-Format: $image_id => $filename
-	* @param	array		$locations	Array of valid url::path()s where the image should be deleted from
-	*/
+	 * Delete file from disc.
+	 *
+	 * @param	mixed		$files		String with filename or an array of filenames
+	 *									Array-Format: $image_id => $filename
+	 * @param	array		$locations	Array of valid url::path()s where the image should be deleted from
+	 */
 	public function delete($files, $locations = array('thumbnail', 'medium', 'upload'))
 	{
 		if (!is_array($files))