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/controller/image.php

Indentation +198 added lines, -198 removed lines

@@ -125,51 +125,51 @@ 
 	protected $profile_fields_data;
 	protected $can_receive_pm_list;
 
-    /**
-     * Constructor
-     *
-     * @param \phpbb\request\request $request
-     * @param \phpbb\auth\auth $auth Gallery auth object
-     * @param \phpbb\config\config $config Config object
-     * @param \phpbb\controller\helper $helper Controller helper object
-     * @param \phpbb\db\driver\driver|\phpbb\db\driver\driver_interface $db Database object
-     * @param \phpbb\event\dispatcher $dispatcher Event dispatcher object
-     * @param \phpbb\pagination $pagination Pagination object
-     * @param \phpbb\template\template $template Template object
-     * @param \phpbb\user $user User object
-     * @param manager $cpf_manager
-     * @param \phpbb\language\language $language
-     * @param \phpbbgallery\core\album\display $display Albums display object
-     * @param \phpbbgallery\core\album\loader $loader Albums display object
-     * @param \phpbbgallery\core\album\album $album
-     * @param \phpbbgallery\core\image\image $image
-     * @param \phpbbgallery\core\auth\auth $gallery_auth
-     * @param \phpbbgallery\core\user $gallery_user
-     * @param \phpbbgallery\core\config $gallery_config
-     * @param \phpbbgallery\core\auth\level $auth_level Gallery auth level object
-     * @param \phpbbgallery\core\url $url
-     * @param \phpbbgallery\core\misc $misc
-     * @param \phpbbgallery\core\comment $comment
-     * @param \phpbbgallery\core\report $report
-     * @param \phpbbgallery\core\notification\helper $notification_helper
-     * @param \phpbbgallery\core\log $gallery_log
-     * @param \phpbbgallery\core\moderate $moderate
-     * @param \phpbbgallery\core\rating $gallery_rating
-     * @param \phpbbgallery\core\block $block
-     * @param ContainerInterface $phpbb_container
-     * @param string $albums_table Gallery albums table
-     * @param string $images_table Gallery images table
-     * @param string $users_table Gallery users table
-     * @param                                                           $table_comments
-     * @param                                                           $phpbb_root_path
-     * @param                                                           $php_ext
-     * @internal param \phpbbgallery\core\comment $gallery_comment Gallery comment class
-     */
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\request\request $request
+	 * @param \phpbb\auth\auth $auth Gallery auth object
+	 * @param \phpbb\config\config $config Config object
+	 * @param \phpbb\controller\helper $helper Controller helper object
+	 * @param \phpbb\db\driver\driver|\phpbb\db\driver\driver_interface $db Database object
+	 * @param \phpbb\event\dispatcher $dispatcher Event dispatcher object
+	 * @param \phpbb\pagination $pagination Pagination object
+	 * @param \phpbb\template\template $template Template object
+	 * @param \phpbb\user $user User object
+	 * @param manager $cpf_manager
+	 * @param \phpbb\language\language $language
+	 * @param \phpbbgallery\core\album\display $display Albums display object
+	 * @param \phpbbgallery\core\album\loader $loader Albums display object
+	 * @param \phpbbgallery\core\album\album $album
+	 * @param \phpbbgallery\core\image\image $image
+	 * @param \phpbbgallery\core\auth\auth $gallery_auth
+	 * @param \phpbbgallery\core\user $gallery_user
+	 * @param \phpbbgallery\core\config $gallery_config
+	 * @param \phpbbgallery\core\auth\level $auth_level Gallery auth level object
+	 * @param \phpbbgallery\core\url $url
+	 * @param \phpbbgallery\core\misc $misc
+	 * @param \phpbbgallery\core\comment $comment
+	 * @param \phpbbgallery\core\report $report
+	 * @param \phpbbgallery\core\notification\helper $notification_helper
+	 * @param \phpbbgallery\core\log $gallery_log
+	 * @param \phpbbgallery\core\moderate $moderate
+	 * @param \phpbbgallery\core\rating $gallery_rating
+	 * @param \phpbbgallery\core\block $block
+	 * @param ContainerInterface $phpbb_container
+	 * @param string $albums_table Gallery albums table
+	 * @param string $images_table Gallery images table
+	 * @param string $users_table Gallery users table
+	 * @param                                                           $table_comments
+	 * @param                                                           $phpbb_root_path
+	 * @param                                                           $php_ext
+	 * @internal param \phpbbgallery\core\comment $gallery_comment Gallery comment class
+	 */
 	public function __construct(\phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\config\config $config,
 		\phpbb\controller\helper $helper, \phpbb\db\driver\driver_interface $db,
 		\phpbb\event\dispatcher $dispatcher, \phpbb\pagination $pagination,
 		\phpbb\template\template $template, \phpbb\user $user, \phpbb\profilefields\manager $cpf_manager,
-        \phpbb\language\language $language, \phpbbgallery\core\album\display $display,
+		\phpbb\language\language $language, \phpbbgallery\core\album\display $display,
 		\phpbbgallery\core\album\loader $loader, \phpbbgallery\core\album\album $album,
 		\phpbbgallery\core\image\image $image, \phpbbgallery\core\auth\auth $gallery_auth,
 		\phpbbgallery\core\user $gallery_user, \phpbbgallery\core\config $gallery_config,
@@ -428,15 +428,15 @@ 
 		$image_data = $this->data;
 
 		/**
-		* Event view image
-		*
-		* @event phpbbgallery.core.viewimage
-		* @var	int		image_id		id of the image we are viewing
-		* @var	array	image_data		All the data related to the image
-		* @var	array	album_data		All the data related to the album image is part of
-		* @var	string	page_title		Page title
-		* @since 1.2.0
-		*/
+		 * Event view image
+		 *
+		 * @event phpbbgallery.core.viewimage
+		 * @var	int		image_id		id of the image we are viewing
+		 * @var	array	image_data		All the data related to the image
+		 * @var	array	album_data		All the data related to the album image is part of
+		 * @var	string	page_title		Page title
+		 * @since 1.2.0
+		 */
 		$vars = array('image_id', 'image_data', 'album_data', 'page_title');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.viewimage', compact($vars)));
 
@@ -444,7 +444,7 @@ 
 
 		$this->users_id_array[$this->data['image_user_id']] = $this->data['image_user_id'];
 
-        $this->load_users_data();
+		$this->load_users_data();
 
 		$this->users_data_array[$this->data['image_user_id']]['username'] = ($this->data['image_username']) ? $this->data['image_username'] : $this->language->lang('GUEST');
 		$this->template->assign_vars(array(
@@ -499,8 +499,8 @@ 
 			unset($rating);
 		}
 		/**
-		* Posting comment
-		*/
+		 * Posting comment
+		 */
 		$comments_disabled = (!$this->gallery_config->get('allow_comments') || ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments']));
 		if (!$comments_disabled && $this->gallery_auth->acl_check('c_post', $album_id, $album_data['album_user_id']) && ($album_data['album_status'] != $this->block->get_album_status_locked()) && (($image_data['image_status'] != $this->block->get_image_status_locked()) || $this->gallery_auth->acl_check('m_status', $album_id, $album_data['album_user_id'])))
 		{
@@ -585,13 +585,13 @@ 
 			$this->template->assign_var('S_COMMENTS_DISABLED', true);
 		}
 
-        /**
-         * Listing comment
-         */
-        if (($this->gallery_config->get('allow_comments') && $this->gallery_auth->acl_check('c_read', $album_id, $album_data['album_user_id'])) /*&& (time() > ($album_data['contest_start'] + $album_data['contest_end']))*/)
-        {
-            $this->display_comments($image_id, $this->data, $album_id, $album_data, ($page - 1) * $this->gallery_config->get('items_per_page'), $this->gallery_config->get('items_per_page'));
-        }
+		/**
+		 * Listing comment
+		 */
+		if (($this->gallery_config->get('allow_comments') && $this->gallery_auth->acl_check('c_read', $album_id, $album_data['album_user_id'])) /*&& (time() > ($album_data['contest_start'] + $album_data['contest_end']))*/)
+		{
+			$this->display_comments($image_id, $this->data, $album_id, $album_data, ($page - 1) * $this->gallery_config->get('items_per_page'), $this->gallery_config->get('items_per_page'));
+		}
 		return $this->helper->render('gallery/viewimage_body.html', $page_title);
 	}
 	protected function display_comments($image_id, $image_data, $album_id, $album_data, $start, $limit)
@@ -625,7 +625,7 @@ 
 				$this->users_id_array[$row['comment_user_id']] = $row['comment_user_id'];
 				if ($row['comment_edit_count'] > 0)
 				{
-                    $this->users_id_array[$row['comment_edit_user_id']] = $row['comment_edit_user_id'];
+					$this->users_id_array[$row['comment_edit_user_id']] = $row['comment_edit_user_id'];
 				}
 			}
 			$this->db->sql_freeresult($result);
@@ -655,43 +655,43 @@ 
 
 
 				// Let's deply new profile
-                $poster_id = $row['comment_user_id'];
-
-                if ($row['comment_edit_count'] > 0)
-                {
-                    $edit_info = ($row['comment_edit_count'] == 1) ? $this->language->lang('IMAGE_EDITED_TIME_TOTAL') : $this->language->lang('IMAGE_EDITED_TIMES_TOTAL');
-                    $edit_info = sprintf($edit_info, get_username_string('full', $row['comment_edit_user_id'], $this->users_data_array[$row['comment_edit_user_id']]['username'], $this->users_data_array[$row['comment_edit_user_id']]['user_colour']), $this->user->format_date($row['comment_edit_time'], false, true), $row['comment_edit_count']);
-                }
-                $user_deleted = (isset($this->users_data_array[$poster_id]) ? false : true);
-                // End signature parsing, only if needed
-                if ($this->users_data_array[$poster_id]['sig'] && empty($this->users_data_array[$poster_id]['sig_parsed']))
-                {
-                    $parse_flags = ($this->users_data_array[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
-                    $user_cache[$poster_id]['sig'] = generate_text_for_display($this->users_data_array[$poster_id]['sig'], $this->users_data_array[$poster_id]['sig_bbcode_uid'], $this->users_data_array[$poster_id]['sig_bbcode_bitfield'],  $parse_flags, true);
-                    $user_cache[$poster_id]['sig_parsed'] = true;
-                }
-
-                $cp_row = array();
-                //CPF
-                if ($this->config['load_cpf_viewtopic'])
-                {
-                    $cp_row = (isset($this->profile_fields_data[$poster_id])) ? $this->cpf_manager->generate_profile_fields_template_data($this->profile_fields_data[$poster_id]) : array();
-                }
-                $can_receive_pm = (
-                    // They must be a "normal" user
-                    $this->users_data_array[$poster_id]['user_type'] != USER_IGNORE &&
-                    // They must not be deactivated by the administrator
-                    ($this->users_data_array[$poster_id]['user_type'] != USER_INACTIVE || $this->users_data_array[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) &&
-                    // They must be able to read PMs
-                    in_array($poster_id, $this->can_receive_pm_list) &&
-                    // They must allow users to contact via PM
-                    (($this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_')) || $this->users_data_array[$poster_id]['allow_pm'])
-                );
-                $u_pm = '';
-                if ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && $can_receive_pm)
-                {
-                    $u_pm = append_sid("{$this->phpbb_root_path}ucp.$this->php_ext", 'i=pm&mode=compose');
-                }
+				$poster_id = $row['comment_user_id'];
+
+				if ($row['comment_edit_count'] > 0)
+				{
+					$edit_info = ($row['comment_edit_count'] == 1) ? $this->language->lang('IMAGE_EDITED_TIME_TOTAL') : $this->language->lang('IMAGE_EDITED_TIMES_TOTAL');
+					$edit_info = sprintf($edit_info, get_username_string('full', $row['comment_edit_user_id'], $this->users_data_array[$row['comment_edit_user_id']]['username'], $this->users_data_array[$row['comment_edit_user_id']]['user_colour']), $this->user->format_date($row['comment_edit_time'], false, true), $row['comment_edit_count']);
+				}
+				$user_deleted = (isset($this->users_data_array[$poster_id]) ? false : true);
+				// End signature parsing, only if needed
+				if ($this->users_data_array[$poster_id]['sig'] && empty($this->users_data_array[$poster_id]['sig_parsed']))
+				{
+					$parse_flags = ($this->users_data_array[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+					$user_cache[$poster_id]['sig'] = generate_text_for_display($this->users_data_array[$poster_id]['sig'], $this->users_data_array[$poster_id]['sig_bbcode_uid'], $this->users_data_array[$poster_id]['sig_bbcode_bitfield'],  $parse_flags, true);
+					$user_cache[$poster_id]['sig_parsed'] = true;
+				}
+
+				$cp_row = array();
+				//CPF
+				if ($this->config['load_cpf_viewtopic'])
+				{
+					$cp_row = (isset($this->profile_fields_data[$poster_id])) ? $this->cpf_manager->generate_profile_fields_template_data($this->profile_fields_data[$poster_id]) : array();
+				}
+				$can_receive_pm = (
+					// They must be a "normal" user
+					$this->users_data_array[$poster_id]['user_type'] != USER_IGNORE &&
+					// They must not be deactivated by the administrator
+					($this->users_data_array[$poster_id]['user_type'] != USER_INACTIVE || $this->users_data_array[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) &&
+					// They must be able to read PMs
+					in_array($poster_id, $this->can_receive_pm_list) &&
+					// They must allow users to contact via PM
+					(($this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_')) || $this->users_data_array[$poster_id]['allow_pm'])
+				);
+				$u_pm = '';
+				if ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && $can_receive_pm)
+				{
+					$u_pm = append_sid("{$this->phpbb_root_path}ucp.$this->php_ext", 'i=pm&mode=compose');
+				}
 
 				$comment_row = array(
 					'U_COMMENT'		=> $this->helper->route('phpbbgallery_core_image', array('image_id'	=> $image_id)) . '#comment_' . $row['comment_id'],
@@ -704,10 +704,10 @@ 
 					'U_EDIT'		=> ($this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']) || ($this->gallery_auth->acl_check('c_edit', $album_id, $album_data['album_user_id']) && ($row['comment_user_id'] == $this->user->data['user_id']) && $this->user->data['is_registered'])) ? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $image_id, 'comment_id'	=> $row['comment_id'])) : '',
 					'U_INFO'		=> ($this->auth->acl_get('a_')) ? $this->url->append_sid('mcp', 'mode=whois&ip=' . $row['comment_user_ip']) : '',
 
-                    'POSTER_FULL'		=> get_username_string('full', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'POSTER_COLOUR'		=> get_username_string('colour', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'POSTER_USERNAME'	=> get_username_string('username', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
-                    'U_POSTER'			=> get_username_string('profile', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_FULL'		=> get_username_string('full', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_COLOUR'		=> get_username_string('colour', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'POSTER_USERNAME'	=> get_username_string('username', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
+					'U_POSTER'			=> get_username_string('profile', $poster_id, $this->users_data_array[$poster_id]['username'], $this->users_data_array[$poster_id]['user_colour']),
 
 					'SIGNATURE'			=> ($row['comment_signature'] && !$user_deleted) ? $this->users_data_array[$poster_id]['sig'] : '',
 					'RANK_TITLE'		=> $user_deleted ? '' : $this->users_data_array[$poster_id]['rank_title'],
@@ -725,60 +725,60 @@ 
 					'ONLINE_IMG'		=> ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? '' : ($user_deleted ? '' : (($this->users_data_array[$poster_id]['online']) ? $this->user->img('icon_user_online', 'ONLINE') : $this->user->img('icon_user_offline', 'OFFLINE'))),
 					'S_ONLINE'			=> ($poster_id == ANONYMOUS || !$this->config['load_onlinetrack']) ? false : ($user_deleted ? '' : (($this->users_data_array[$poster_id]['online']) ? true : false)),
 
-                    'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && count($cp_row['row'])) ? true : false,
-                );
-                if (isset($cp_row['row']) && count($cp_row['row']))
-                {
-                    $comment_row = array_merge($comment_row, $cp_row['row']);
-                }
+					'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && count($cp_row['row'])) ? true : false,
+				);
+				if (isset($cp_row['row']) && count($cp_row['row']))
+				{
+					$comment_row = array_merge($comment_row, $cp_row['row']);
+				}
 				$this->template->assign_block_vars('commentrow', $comment_row);
 
-                $contact_fields = array(
-                    array(
-                        'ID'		=> 'pm',
-                        'NAME' 		=> $this->language->lang('SEND_PRIVATE_MESSAGE'),
-                        'U_CONTACT'	=> $u_pm,
-                    ),
-                    array(
-                        'ID'		=> 'email',
-                        'NAME'		=> $this->language->lang('SEND_EMAIL'),
-                        'U_CONTACT'	=> $this->users_data_array[$poster_id]['email'],
-                    ),
-                    array(
-                        'ID'		=> 'jabber',
-                        'NAME'		=> $this->language->lang('JABBER'),
-                        'U_CONTACT'	=> $this->users_data_array[$poster_id]['jabber'],
-                    ),
-                );
-
-                foreach ($contact_fields as $field)
-                {
-                    if ($field['U_CONTACT'])
-                    {
-                        $this->template->assign_block_vars('commentrow.contact', $field);
-                    }
-                }
-
-                if (!empty($cp_row['blockrow']))
-                {
-                    foreach ($cp_row['blockrow'] as $field_data)
-                    {
-                        if ($field_data['S_PROFILE_CONTACT'])
-                        {
-                            $this->template->assign_block_vars('commentrow.contact', array(
-                                'ID'		=> $field_data['PROFILE_FIELD_IDENT'],
-                                'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
-                                'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
-                            ));
-                        }
-                        else
-                        {
-                            $this->template->assign_block_vars('commentrow.custom_fields', $field_data);
-                        }
-
-
-                    }
-                }
+				$contact_fields = array(
+					array(
+						'ID'		=> 'pm',
+						'NAME' 		=> $this->language->lang('SEND_PRIVATE_MESSAGE'),
+						'U_CONTACT'	=> $u_pm,
+					),
+					array(
+						'ID'		=> 'email',
+						'NAME'		=> $this->language->lang('SEND_EMAIL'),
+						'U_CONTACT'	=> $this->users_data_array[$poster_id]['email'],
+					),
+					array(
+						'ID'		=> 'jabber',
+						'NAME'		=> $this->language->lang('JABBER'),
+						'U_CONTACT'	=> $this->users_data_array[$poster_id]['jabber'],
+					),
+				);
+
+				foreach ($contact_fields as $field)
+				{
+					if ($field['U_CONTACT'])
+					{
+						$this->template->assign_block_vars('commentrow.contact', $field);
+					}
+				}
+
+				if (!empty($cp_row['blockrow']))
+				{
+					foreach ($cp_row['blockrow'] as $field_data)
+					{
+						if ($field_data['S_PROFILE_CONTACT'])
+						{
+							$this->template->assign_block_vars('commentrow.contact', array(
+								'ID'		=> $field_data['PROFILE_FIELD_IDENT'],
+								'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
+								'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
+							));
+						}
+						else
+						{
+							$this->template->assign_block_vars('commentrow.custom_fields', $field_data);
+						}
+
+
+					}
+				}
 
 			}
 			//$this->db->sql_freeresult($result);
@@ -1219,48 +1219,48 @@ 
 	}
 
 	protected function load_users_data()
-    {
-
-        $sql = $this->db->sql_build_query('SELECT', array(
-            'SELECT'	=> 'u.*, gu.personal_album_id, gu.user_images',
-            'FROM'		=> array(USERS_TABLE => 'u'),
-
-            'LEFT_JOIN'	=> array(
-                array(
-                    'FROM'	=> array($this->table_users => 'gu'),
-                    'ON'	=> 'gu.user_id = u.user_id'
-                ),
-            ),
-
-            'WHERE'		=> $this->db->sql_in_set('u.user_id', $this->users_id_array),
-        ));
-        $result = $this->db->sql_query($sql);
-
-        while ($row = $this->db->sql_fetchrow($result))
-        {
-            $this->gallery_user->add_user_to_cache($this->users_data_array, $row);
-        }
-        $this->db->sql_freeresult($result);
-
-
-        // Load CPF's
-        $profile_fields_tmp = $this->cpf_manager->grab_profile_fields_data($this->users_id_array);
-        foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
-        {
-            $this->profile_fields_data[$profile_user_id] = array();
-            foreach ($profile_fields as $used_ident => $profile_field)
-            {
-                if ($profile_field['data']['field_show_on_vt'])
-                {
-                    $this->profile_fields_data[$profile_user_id][$used_ident] = $profile_field;
-                }
-            }
-        }
-        unset($profile_fields_tmp);
-
-        // Get the list of users who can receive private messages
-        $this->can_receive_pm_list = $this->auth->acl_get_list(array_keys($this->users_data_array), 'u_readpm');
-        $this->can_receive_pm_list = (empty($this->can_receive_pm_list) || !isset($this->can_receive_pm_list[0]['u_readpm'])) ? array() : $this->can_receive_pm_list[0]['u_readpm'];
-
-    }
+	{
+
+		$sql = $this->db->sql_build_query('SELECT', array(
+			'SELECT'	=> 'u.*, gu.personal_album_id, gu.user_images',
+			'FROM'		=> array(USERS_TABLE => 'u'),
+
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array($this->table_users => 'gu'),
+					'ON'	=> 'gu.user_id = u.user_id'
+				),
+			),
+
+			'WHERE'		=> $this->db->sql_in_set('u.user_id', $this->users_id_array),
+		));
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->gallery_user->add_user_to_cache($this->users_data_array, $row);
+		}
+		$this->db->sql_freeresult($result);
+
+
+		// Load CPF's
+		$profile_fields_tmp = $this->cpf_manager->grab_profile_fields_data($this->users_id_array);
+		foreach ($profile_fields_tmp as $profile_user_id => $profile_fields)
+		{
+			$this->profile_fields_data[$profile_user_id] = array();
+			foreach ($profile_fields as $used_ident => $profile_field)
+			{
+				if ($profile_field['data']['field_show_on_vt'])
+				{
+					$this->profile_fields_data[$profile_user_id][$used_ident] = $profile_field;
+				}
+			}
+		}
+		unset($profile_fields_tmp);
+
+		// Get the list of users who can receive private messages
+		$this->can_receive_pm_list = $this->auth->acl_get_list(array_keys($this->users_data_array), 'u_readpm');
+		$this->can_receive_pm_list = (empty($this->can_receive_pm_list) || !isset($this->can_receive_pm_list[0]['u_readpm'])) ? array() : $this->can_receive_pm_list[0]['u_readpm'];
+
+	}
 }

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;