satanasov / phpbbgallery

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'];
+
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -228,7 +228,7 @@ 
 	public function base($image_id, $page = 0)
 	{
 
-		$this->language->add_lang( array('gallery'), 'phpbbgallery/core');
+		$this->language->add_lang(array('gallery'), 'phpbbgallery/core');
 		try
 		{
 			$sql = 'SELECT *
@@ -508,8 +508,8 @@ 
 			$this->language->add_lang('posting');
 			$this->url->_include('functions_posting', 'phpbb');
 
-			$bbcode_status	= ($this->config['allow_bbcode']) ? true : false;
-			$smilies_status	= ($this->config['allow_smilies']) ? true : false;
+			$bbcode_status = ($this->config['allow_bbcode']) ? true : false;
+			$smilies_status = ($this->config['allow_smilies']) ? true : false;
 			$img_status		= ($bbcode_status) ? true : false;
 			$url_status		= ($this->config['allow_post_links']) ? true : false;
 			$flash_status	= false;
@@ -667,7 +667,7 @@ 
                 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'] = 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;
                 }
 
@@ -812,8 +812,8 @@ 
 		$this->display->generate_navigation($album_data);
 		add_form_key('gallery');
 		$submit = $this->request->variable('submit', false);
-		$image_backlink = append_sid('./gallery/image/'. $image_id);
-		$album_backlink = append_sid('./gallery/album/'. $image_data['image_album_id']);
+		$image_backlink = append_sid('./gallery/image/' . $image_id);
+		$album_backlink = append_sid('./gallery/album/' . $image_data['image_album_id']);
 		$disp_image_data = $image_data;
 		$owner_id = $image_data['image_user_id'];
 		$album_loginlink = './ucp.php?mode=login';
@@ -846,7 +846,7 @@ 
 				include_once($this->phpbb_root_path . 'includes/message_parser.' . $this->php_ext);
 			}
 			$message_parser = new \parse_message();
-			$message_parser->message	= utf8_normalize_nfc($image_desc);
+			$message_parser->message = utf8_normalize_nfc($image_desc);
 			if ($message_parser->message)
 			{
 				$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -1002,8 +1002,8 @@ 
 		{
 			include_once($this->phpbb_root_path . 'includes/message_parser.' . $this->php_ext);
 		}
-		$message_parser				= new \parse_message();
-		$message_parser->message	= $disp_image_data['image_desc'];
+		$message_parser = new \parse_message();
+		$message_parser->message = $disp_image_data['image_desc'];
 		$message_parser->decode_message($disp_image_data['image_desc_uid']);
 
 		$page_title = $disp_image_data['image_name'];
@@ -1114,8 +1114,8 @@ 
 		$album_data = $this->album->get_info($album_id);
 		$this->language->add_lang(array('gallery'), 'phpbbgallery/core');
 		$album_loginlink = './ucp.php?mode=login';
-		$image_backlink = append_sid('./gallery/image/'. $image_id);
-		$album_backlink = append_sid('./gallery/album/'. $image_data['image_album_id']);
+		$image_backlink = append_sid('./gallery/image/' . $image_id);
+		$album_backlink = append_sid('./gallery/album/' . $image_data['image_album_id']);
 		$this->gallery_auth->load_user_premissions($this->user->data['user_id']);
 		if (!$this->gallery_auth->acl_check('i_report', $album_id, $album_data['album_user_id']) || ($image_data['image_user_id'] == $this->user->data['user_id']))
 		{

Braces +10 added lines, -20 removed lines

@@ -245,8 +245,7 @@ 
 			}
 
 			$this->loader->load($this->data['image_album_id']);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'INVALID_IMAGE');
 		}
@@ -306,8 +305,7 @@ 
 		if (in_array($sort_key, array('r', 'ra')))
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		}
-		else
+		} else
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
 		}
@@ -532,8 +530,7 @@ 
 			if (isset($album_data['contest_start']))
 			{
 				$s_hide_comment_input = (time() < ($album_data['contest_start'] + $album_data['contest_end'])) ? true : false;
-			}
-			else
+			} else
 			{
 				$s_hide_comment_input = false;
 			}
@@ -579,8 +576,7 @@ 
 				//$this->template->assign_var('S_COMMENT_ACTION', append_sid($this->url->path('full') . 'comment/' . $image_id . '/add/0'));
 				$this->template->assign_var('S_COMMENT_ACTION', $this->helper->route('phpbbgallery_core_comment_add', array('image_id' => $image_id, 'comment_id' => 0)));
 			}
-		}
-		else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
+		} else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
 		{
 			$this->template->assign_var('S_COMMENTS_DISABLED', true);
 		}
@@ -770,8 +766,7 @@ 
                                 'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
                                 'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
                             ));
-                        }
-                        else
+                        } else
                         {
                             $this->template->assign_block_vars('commentrow.custom_fields', $field_data);
                         }
@@ -899,8 +894,7 @@ 
 					{
 						$change_image_count = true;
 					}
-				}
-				else if ($this->request->variable('change_author', '', true))
+				} else if ($this->request->variable('change_author', '', true))
 				{
 					$errors[] = $this->language->lang('INVALID_USERNAME');
 				}
@@ -921,8 +915,7 @@ 
 					{
 						$personal_album_id = $this->album->generate_personal_album($image_data['image_username'], $image_data['image_user_id'], $image_data['image_user_colour'], $image_user);
 					}
-				}
-				else
+				} else
 				{
 					$personal_album_id = $this->gallery_user->get_data('personal_album_id');
 					if (!$personal_album_id && $this->gallery_auth->acl_check('i_upload', $this->gallery_auth->get_own_album()))
@@ -1090,8 +1083,7 @@ 
 			$this->notification_helper->read('approval', $album_id);
 			$this->url->meta_refresh(3, $album_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
@@ -1099,8 +1091,7 @@ 
 				$message .= '<br />' . sprintf($this->language->lang('CLICK_RETURN_IMAGE'), '<a href="' . $image_backlink . '">', '</a>');
 				$this->url->meta_refresh(3, $image_backlink);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_IMAGE2', $s_hidden_fields);
 			}
@@ -1204,8 +1195,7 @@ 
 			{
 				// @todo Add "redirect after login" url
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				redirect('/gallery/album/' . $album_id);

core/migrations/release_1_2_0_add_bbcode.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 				{
 					$bbcode_id = NUM_CORE_BBCODES + 1;
 				}
-			}
-			else
+			} else
 			{
 				$bbcode_id = NUM_CORE_BBCODES + 1;
 			}
@@ -63,8 +62,7 @@ 
 			if ($this->config['enable_mod_rewrite'])
 			{
 				$url .= 'gallery/image/';
-			}
-			else
+			} else
 			{
 				$url .= 'app.php/gallery/image/';
 			}

core/migrations/release_1_2_0.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 			if (isset(self::$is_dynamic[$name]))
 			{
 				$config->set('phpbb_gallery_' . $name, $value, true);
-			}
-			else
+			} else
 			{
 				$config->set('phpbb_gallery_' . $name, $value);
 			}

core/migrations/release_1_2_0_create_filesystem.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
 			if (is_dir($file))
 			{
 				$this->recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}

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

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report');
-				}
-				catch (\phpbb\notification\exception $e)
+				} catch (\phpbb\notification\exception $e)
 				{
 					// continue
 				}

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

Spacing +7 added lines, -7 removed lines

@@ -142,7 +142,7 @@ 
 				'IMAGE_ALBUM_ID'	=> $VAR['image_album_id'],
 			));
 			unset($album_tmp);
-			$waiting_images ++;
+			$waiting_images++;
 		}
 		$this->template->assign_vars(array(
 			'TOTAL_IMAGES_WAITING' => $this->lang->lang('WAITING_UNAPPROVED_IMAGE', (int) $count),
@@ -212,21 +212,21 @@ 
 		{
 			$status[] = 0;
 			$status[] = 2;
-			$actions['approve']	= 'QUEUES_A_APPROVE';
-			$actions['unapprove']	= 'QUEUES_A_UNAPPROVE';
-			$actions['lock']	= 'QUEUES_A_LOCK';
+			$actions['approve'] = 'QUEUES_A_APPROVE';
+			$actions['unapprove'] = 'QUEUES_A_UNAPPROVE';
+			$actions['lock'] = 'QUEUES_A_LOCK';
 		}
 		if ($this->gallery_auth->acl_check('m_delete', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['delete']	= 'QUEUES_A_DELETE';
+			$actions['delete'] = 'QUEUES_A_DELETE';
 		}
 		if ($this->gallery_auth->acl_check('m_move', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['move']	= 'QUEUES_A_MOVE';
+			$actions['move'] = 'QUEUES_A_MOVE';
 		}
 		if ($this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['report']	= 'REPORT_A_CLOSE';
+			$actions['report'] = 'REPORT_A_CLOSE';
 		}
 		$sql = 'SELECT COUNT(DISTINCT image_id) AS count FROM ' . $this->images_table . ' WHERE ' . $this->db->sql_in_set('image_status', $status) . ' AND image_album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);

Braces +2 added lines, -4 removed lines

@@ -83,8 +83,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -161,8 +160,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES'				=> $this->lang->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(

core/config.php

Braces +2 added lines, -4 removed lines

@@ -147,8 +147,7 @@ 
 			if (isset($this->config['phpbb_gallery_' . $option]))
 			{
 				$config_ary[$option] = $this->config['phpbb_gallery_' . $option];
-			}
-			else
+			} else
 			{
 				$config_ary[$option] = $default;
 			}
@@ -161,8 +160,7 @@ 
 		if (isset($this->config['phpbb_gallery_' . $key]))
 		{
 			return $this->config['phpbb_gallery_' . $key];
-		}
-		else
+		} else
 		{
 			return $this->configs_array[$key];
 		}

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

Spacing +7 added lines, -7 removed lines

@@ -126,7 +126,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'ALBUM_NOT_EXIST');
 		}
 
-		if ($extended_info  && !isset($row['contest_id']))
+		if ($extended_info && !isset($row['contest_id']))
 		{
 			$row['contest_id'] = 0;
 			$row['contest_rates_start'] = 0;
@@ -339,7 +339,7 @@ 
 
 		// Get the album_user_id, so we can keep the user_colour
 		$sql = 'SELECT album_user_id
-			FROM ' . $this->albums_table .'
+			FROM ' . $this->albums_table . '
 			WHERE album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);
 		$album_user_id = $this->db->sql_fetchfield('album_user_id');
@@ -347,7 +347,7 @@ 
 
 		// Number of not unapproved images
 		$sql = 'SELECT COUNT(image_id) images
-			FROM ' . $this->images_table .' 
+			FROM ' . $this->images_table . ' 
 			WHERE image_status <> ' . (int) $this->block->get_image_status_unapproved() . '
 				AND image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id;
@@ -357,7 +357,7 @@ 
 
 		// Number of total images
 		$sql = 'SELECT COUNT(image_id) images_real
-			FROM ' . $this->images_table .'
+			FROM ' . $this->images_table . '
 			WHERE image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);
@@ -366,7 +366,7 @@ 
 
 		// Data of the last not unapproved image
 		$sql = 'SELECT image_id, image_time, image_name, image_username, image_user_colour, image_user_id
-			FROM ' . $this->images_table .'
+			FROM ' . $this->images_table . '
 			WHERE image_status <> ' . (int) $this->block->get_image_status_unapproved() . '
 				AND image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id . '
@@ -405,7 +405,7 @@ 
 		}
 		$this->db->sql_freeresult($result);
 
-		$sql = 'UPDATE ' . $this->albums_table .' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE ' . $this->albums_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 			WHERE album_id = ' . (int) $album_id;
 		$this->db->sql_query($sql);
 
@@ -435,7 +435,7 @@ 
 			'album_last_username'			=> '',
 			'album_last_user_colour'		=> $user_colour,
 		);
-		$this->db->sql_query('INSERT INTO ' . $this->albums_table. ' ' . $this->db->sql_build_array('INSERT', $album_data));
+		$this->db->sql_query('INSERT INTO ' . $this->albums_table . ' ' . $this->db->sql_build_array('INSERT', $album_data));
 		$personal_album_id = $this->db->sql_nextid();
 
 		$gallery_user->update_data(array(

Braces +9 added lines, -18 removed lines

@@ -219,8 +219,7 @@ 
 			{
 				$padding .= '   ';
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}
@@ -246,15 +245,13 @@ 
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
 			{
 				$list = true;
-			}
-			else if (!$row['album_user_id'])
+			} else if (!$row['album_user_id'])
 			{
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
 				{
 					$list = true;
 				}
-			}
-			else if (!$ignore_personals)
+			} else if (!$ignore_personals)
 			{
 				if ($row['album_user_id'] == $this->user->data['user_id'])
 				{
@@ -265,16 +262,14 @@ 
 						if ($requested_permission)
 						{
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
-						}
-						else
+						} else
 						{
 							$requested_own = false; // We need the negated version of true here
 						}
 					}
 					$list = (!$list) ? $access_own : $list;
 					$disabled = (!$disabled) ? $requested_own : $disabled;
-				}
-				else if ($row['album_user_id'])
+				} else if ($row['album_user_id'])
 				{
 					if (!$c_access_personal)
 					{
@@ -283,8 +278,7 @@ 
 						if ($requested_permission)
 						{
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
-						}
-						else
+						} else
 						{
 							$requested_personal = false; // We need the negated version of true here
 						}
@@ -296,8 +290,7 @@ 
 			if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
 			{
 				$list = false;
-			}
-			else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
+			} else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
 			{
 				$disabled = true;
 			}
@@ -315,8 +308,7 @@ 
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
 			$gallery_albumbox .= $album_list;
 			$gallery_albumbox .= '</select>';
-		}
-		else
+		} else
 		{
 			$gallery_albumbox = $album_list;
 		}
@@ -384,8 +376,7 @@ 
 				'album_last_user_colour'	=> $row['image_user_colour'],
 				'album_last_user_id'		=> $row['image_user_id'],
 			);
-		}
-		else
+		} else
 		{
 			// No approved image, so we clear the columns
 			$sql_ary = array(

core/album/display.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
 	public $album_mode;
 
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\controller\helper $helper,
-								\phpbb\db\driver\driver_interface $db, 	\phpbb\pagination $pagination,
+								\phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination,
 								\phpbb\request\request $request, \phpbb\template\template $template,
 								\phpbb\user $user, \phpbb\language\language $language, \phpbbgallery\core\auth\auth $gallery_auth,
 								\phpbbgallery\core\user $gallery_user, \phpbbgallery\core\misc $misc,
@@ -94,7 +94,7 @@ 
 
 		$sql = 'SELECT a2.*
 			FROM ' . $this->table_albums . ' a1
-			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .'
+			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . '
 			WHERE a1.album_id = ' . (int) $album_id . '
 				AND a1.album_user_id = ' . (int) $branch_user_id . '
 			ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC');
@@ -177,9 +177,9 @@ 
 			'ALBUM_ID' 		=> $album_data['album_id'],
 			'ALBUM_NAME'	=> $album_data['album_name'],
 			'ALBUM_DESC'	=> generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']),
-			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
-			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
-			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
+			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
+			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
+			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
 			'U_VIEW_ALBUM'	=> $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_data['album_id'])),
 		));
 
@@ -691,9 +691,9 @@ 
 				// phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id']));
 				// phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_name = ''; //@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_icon = ''; //@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 			}
 			else
 			{

Braces +15 added lines, -25 removed lines

@@ -222,8 +222,7 @@ 
 					SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "'
 					WHERE parent_id = " . (int) $album_data['parent_id'];
 				$this->db->sql_query($sql);
-			}
-			else
+			} else
 			{
 				$album_parents = unserialize($album_data['album_parents']);
 			}
@@ -291,16 +290,14 @@ 
 			if (!empty($row['user_id']))
 			{
 				$album_moderators[$a_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-			}
-			else
+			} else
 			{
 				$group_name = (($row['group_type'] == GROUP_SPECIAL) ? $this->language->lang('G_' . $row['group_name']) : $row['group_name']);
 
 				if ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile'))
 				{
 					$album_moderators[$a_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
-				}
-				else
+				} else
 				{
 					$album_moderators[$a_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 				}
@@ -344,8 +341,7 @@ 
 			}
 			$root_data = array('album_id' => \phpbbgallery\core\block::PUBLIC_ALBUM);
 			$sql_where = 'a.album_user_id = ' . \phpbbgallery\core\block::PUBLIC_ALBUM;
-		}
-		else if ($root_data == 'personal')
+		} else if ($root_data == 'personal')
 		{
 			if ($mark_read == 'albums')
 			{
@@ -362,8 +358,7 @@ 
 				{
 					$sql_where .= ' AND u.username_clean NOT ' . $this->db->sql_like_expression(chr($i) . $this->db->any_char);
 				}
-			}
-			else if ($first_char)
+			} else if ($first_char)
 			{
 				$sql_where .= ' AND u.username_clean ' . $this->db->sql_like_expression(substr($first_char, 0, 1) . $this->db->any_char);
 			}
@@ -407,8 +402,7 @@ 
 					'phpbbgallery_core_search_recent_page',),
 					'params' => array()), 'pagination', 'page', $num_pegas, $limit, $start
 			);*/
-		}
-		else
+		} else
 		{
 			$sql_where = 'a.left_id > ' . $root_data['left_id'] . ' AND a.left_id < ' . $root_data['right_id'] . ' AND a.album_user_id = ' . $root_data['album_user_id'];
 		}
@@ -496,10 +490,12 @@ 
 				continue;
 			}
 
-			if (false)//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
+			if (false) {
+				//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
 			{
 				// if the user does not have permissions to list this album, skip everything until next branch
 				$right_id = $row['right_id'];
+			}
 				continue;
 			}
 
@@ -524,8 +520,7 @@ 
 				$album_rows[$parent_id]['album_type_last_image'] = $row['album_type'];
 				$album_rows[$parent_id]['album_contest_marked'] = $row['contest_marked'];
 				$album_rows[$parent_id]['orig_album_last_image_time'] = $row['album_last_image_time'];
-			}
-			else if ($row['album_type'])
+			} else if ($row['album_type'])
 			{
 				$subalbums[$parent_id][$album_id]['display'] = ($row['display_on_index']) ? true : false;
 				$subalbums[$parent_id][$album_id]['name'] = $row['album_name'];
@@ -567,16 +562,14 @@ 
 				{
 					$this->misc->markread('all');
 					$message = $this->language->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>');
-				}
-				else
+				} else
 				{
 					$this->misc->markread('albums', $album_ids);
 					$message = $this->language->lang('RETURN_ALBUM', '<a href="' . $redirect . '">', '</a>');
 				}
 				meta_refresh(3, $redirect);
 				trigger_error($this->language->lang('ALBUMS_MARKED') . '<br /><br />' . $message);
-			}
-			else
+			} else
 			{
 				$message = $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 				meta_refresh(3, $redirect);
@@ -654,8 +647,7 @@ 
 							'name'		=> $subalbum_row['name'],
 							'unread'	=> $subalbum_unread,
 						);
-					}
-					else
+					} else
 					{
 						unset($subalbums[$album_id][$subalbum_id]);
 					}
@@ -668,8 +660,7 @@ 
 
 				$l_subalbums = (sizeof($subalbums[$album_id]) == 1) ? $this->language->lang('SUBALBUM') : $this->language->lang('SUBALBUMS');
 				$folder_image = ($album_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
-			}
-			else
+			} else
 			{
 				$folder_alt = ($album_unread) ? 'NEW_IMAGES' : 'NO_NEW_IMAGES';
 				$folder_image = ($album_unread) ? 'forum_unread' : 'forum_read';
@@ -694,8 +685,7 @@ 
 				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-			}
-			else
+			} else
 			{
 				$lastimage_time = $lastimage_album_type = $lastimage_contest_marked = 0;
 				$lastimage_uc_fake_thumbnail = $lastimage_uc_thumbnail = $lastimage_uc_name = $lastimage_uc_icon = '';