satanasov / phpbbgallery

core/image/image.php

Spacing +9 added lines, -9 removed lines

@@ -102,7 +102,7 @@ 
 		\phpbbgallery\core\album\album $album, \phpbbgallery\core\config $gallery_config, \phpbb\controller\helper $helper,
 		\phpbbgallery\core\url $url, \phpbbgallery\core\log $gallery_log, \phpbbgallery\core\notification\helper $notification_helper,
 		\phpbbgallery\core\report $report, \phpbbgallery\core\cache $gallery_cache, \phpbbgallery\core\user $gallery_user,
-		\phpbbgallery\core\contest $contest,\phpbbgallery\core\file\file $file,
+		\phpbbgallery\core\contest $contest, \phpbbgallery\core\file\file $file,
 		$table_images)
 	{
 		$this->db = $db;
@@ -383,7 +383,7 @@ 
 				* @since 1.2.0
 				*/
 				$vars = array('mode', 'tpl');
-				extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars)));//@todo: Correctly identify the event
+				extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars))); //@todo: Correctly identify the event
 			break;
 		}
 
@@ -406,7 +406,7 @@ 
 
 		$num_images = $num_comments = 0;
 		$sql = 'SELECT SUM(image_comments) as comments
-			FROM ' . $this->table_images .'
+			FROM ' . $this->table_images . '
 			WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . '
 			GROUP BY image_user_id';
@@ -415,7 +415,7 @@ 
 		$this->db->sql_freeresult($result);
 
 		$sql = 'SELECT COUNT(image_id) images, image_user_id
-			FROM ' . $this->table_images .' 
+			FROM ' . $this->table_images . ' 
 			WHERE image_status ' . (($readd) ? '=' : '<>') . ' ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary) . '
 			GROUP BY image_user_id';
@@ -455,7 +455,7 @@ 
 			return;
 		}
 
-		$sql = 'SELECT * FROM ' . $this->table_images .' WHERE image_id = ' . (int) $image_id;
+		$sql = 'SELECT * FROM ' . $this->table_images . ' WHERE image_id = ' . (int) $image_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -515,14 +515,14 @@ 
 	{
 		self::handle_counter($image_id_ary, false);
 
-		$sql = 'UPDATE ' . $this->table_images .' 
+		$sql = 'UPDATE ' . $this->table_images . ' 
 			SET image_status = ' . \phpbbgallery\core\block::STATUS_UNAPPROVED . '
 			WHERE image_status <> ' . \phpbbgallery\core\block::STATUS_ORPHAN . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary);
 		$this->db->sql_query($sql);
 
 		$sql = 'SELECT image_id, image_name
-			FROM ' . $this->table_images .' 
+			FROM ' . $this->table_images . ' 
 			WHERE image_status <> ' . \phpbbgallery\core\block::STATUS_ORPHAN . '
 				AND ' . $this->db->sql_in_set('image_id', $image_id_ary);
 		$result = $this->db->sql_query($sql);
@@ -704,14 +704,14 @@ 
 			'U_USER_IP'		=> $show_ip && $this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) ? $image_data['image_user_ip'] : false,
 
 			'S_IMAGE_REPORTED'		=> $image_data['image_reported'],
-			'U_IMAGE_REPORTED'		=> '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported']) : '',
+			'U_IMAGE_REPORTED'		=> '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported']) : '',
 			'S_STATUS_APPROVED'		=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED),
 			'S_STATUS_UNAPPROVED'	=> ($this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false,
 			'S_STATUS_UNAPPROVED_ACTION'	=> ($this->gallery_auth->acl_check('m_status', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => (int) $image_data['image_id'])) : '',
 			'S_STATUS_LOCKED'		=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_LOCKED),
 
 			'U_REPORT'	=> ($this->gallery_auth->acl_check('m_report', $image_data['image_album_id'], $image_data['album_user_id']) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_reported'])*/ : '',
-			'U_STATUS'	=> '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_id']) : '',
+			'U_STATUS'	=> '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&amp;album_id={$image_data['image_album_id']}&amp;option_id=" . $image_data['image_id']) : '',
 			'L_STATUS'	=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')),
 		));
 	}

core/block.php

Spacing +8 added lines, -8 removed lines

@@ -23,13 +23,13 @@ 
 	 *
 	 * Constants defining some album properties
 	 */
-	const PUBLIC_ALBUM		= 0;
+	const PUBLIC_ALBUM = 0;
 
-	const TYPE_CAT			= 0;
-	const TYPE_UPLOAD		= 1;
+	const TYPE_CAT = 0;
+	const TYPE_UPLOAD = 1;
 	const TYPE_CONTEST		= 2;
 
-	const ALBUM_OPEN		= 0;
+	const ALBUM_OPEN = 0;
 	const ALBUM_LOCKED		= 1;
 
 	/**
@@ -58,22 +58,22 @@ 
 	/**
 	 * Only visible for moderators.
 	 */
-	const STATUS_UNAPPROVED	= 0;
+	const STATUS_UNAPPROVED = 0;
 
 	/**
 	 * Visible for everyone with the i_view-permissions
 	 */
-	const STATUS_APPROVED	= 1;
+	const STATUS_APPROVED = 1;
 
 	/**
 	 * Visible for everyone with the i_view-permissions, but only moderators can comment.
 	 */
-	const STATUS_LOCKED		= 2;
+	const STATUS_LOCKED = 2;
 
 	/**
 	 * Orphan files are only visible for their author, because they're not yet ready uploaded.
 	 */
-	const STATUS_ORPHAN		= 3;
+	const STATUS_ORPHAN = 3;
 
 	/**
 	 * Constants regarding the image contest relation

core/controller/file.php

Spacing +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 
 	public function generate_image_src()
 	{
-		$this->image_src = $this->path  . $this->data['image_filename'];
+		$this->image_src = $this->path . $this->data['image_filename'];
 
 		if ($this->data['image_filemissing'] || !file_exists($this->path_source . $this->data['image_filename']))
 		{

core/controller/moderate.php

Spacing +9 added lines, -9 removed lines

@@ -193,7 +193,7 @@ 
 		$approve_ary = $this->request->variable('approval', array('' => array(0)));
 		$action_ary = $this->request->variable('action', array('' => 0));
 		$back_link = $this->request->variable('back_link', $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_queue_approve_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_queue_approve'));
-		list($action, ) = each($action_ary);
+		list($action,) = each($action_ary);
 
 		$this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core');
 		$this->language->add_lang('mcp');
@@ -256,7 +256,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($approve_ary as $id => $var)
 				{
@@ -338,7 +338,7 @@ 
 		$report_ary = $this->request->variable('report', array(0));
 		$action_ary = $this->request->variable('action', array('' => 0));
 		$back_link = $this->request->variable('back_link', $album_id > 0 ? $this->helper->route('phpbbgallery_core_moderate_reports_album', array('album_id' => $album_id)) : $this->helper->route('phpbbgallery_core_moderate_reports'));
-		list($action, ) = each($action_ary);
+		list($action,) = each($action_ary);
 
 		$this->language->add_lang(array('gallery_mcp', 'gallery'), 'phpbbgallery/core');
 		$this->language->add_lang('mcp');
@@ -354,7 +354,7 @@ 
 			}
 			else
 			{
-				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
+				$s_hidden_fields = '<input type="hidden" name="action[' . $action . ']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
 				foreach ($report_ary as $var)
 				{
@@ -576,7 +576,7 @@ 
 			case 'reports_close':
 				if (confirm_box(true))
 				{
-					$back_link =  $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
+					$back_link = $this->helper->route('phpbbgallery_core_moderate_image', array('image_id' => $image_id));
 					$this->report->close_reports_by_image($image_id);
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
@@ -672,7 +672,7 @@ 
 				'REPORT_TIME'	=> $this->user->format_date($var['report_time']),
 				'REPORT_NOTE'	=> $var['report_note'],
 				'STATUS'		=> $var['report_status'],
-				'MANAGER'		=> $var['report_manager'] != 0 ?  $this->user_loader->get_username($var['report_manager'], 'full') : false,
+				'MANAGER'		=> $var['report_manager'] != 0 ? $this->user_loader->get_username($var['report_manager'], 'full') : false,
 			));
 		}
 		return $this->helper->render('gallery/moderate_image_overview.html', $this->language->lang('GALLERY'));
@@ -797,7 +797,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -845,7 +845,7 @@ 
 		$image_data = $this->image->get_image_data($image_id);
 		$album_id = $image_data['image_album_id'];
 		//$user_id = $image_data['image_user_id'];
-		$album_data =  $this->album->get_info($album_id);
+		$album_data = $this->album->get_info($album_id);
 		$album_backlink = $this->helper->route('phpbbgallery_core_album', array('album_id' => $album_id));
 		$image_backlink = $this->helper->route('phpbbgallery_core_image', array('image_id' => $image_id));
 		$album_loginlink = append_sid($this->root_path . 'ucp.' . $this->php_ext . '?mode=login');
@@ -861,7 +861,7 @@ 
 			$image_id_ary = array($image_id);
 			$this->image->lock_images($image_id_ary, $album_data['album_id']);
 			// To DO - add notification
-			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
+			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
 		}

core/controller/album.php

Spacing +6 added lines, -6 removed lines

@@ -72,11 +72,11 @@ 
 	 * @param string                                                    $images_table Gallery image table
 	 */
 	public function __construct(\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\template\template $template, \phpbb\user $user, \phpbb\language\language $language,
 								\phpbbgallery\core\album\display $display, \phpbbgallery\core\album\loader $loader,
 								\phpbbgallery\core\auth\auth $auth, \phpbbgallery\core\auth\level $auth_level,
-								\phpbbgallery\core\config $gallery_config,\phpbbgallery\core\notification\helper $notifications_helper,
+								\phpbbgallery\core\config $gallery_config, \phpbbgallery\core\notification\helper $notifications_helper,
 								\phpbbgallery\core\url $url, \phpbbgallery\core\image\image $image, \phpbb\request\request $request,
 								\phpbbgallery\core\contest $contest,
 								$images_table)
@@ -221,7 +221,7 @@ 
 	 */
 	protected function display_images($album_id, $album_data, $start, $limit)
 	{
-		$sort_days	= $this->request->variable('st', 0);
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key	= $this->request->variable('sk', ($album_data['album_sort_key']) ? $album_data['album_sort_key'] : $this->config['phpbb_gallery_default_sort_key']);
 		$sort_dir	= $this->request->variable('sd', ($album_data['album_sort_dir']) ? $album_data['album_sort_dir'] : $this->config['phpbb_gallery_default_sort_dir']);
 
@@ -344,7 +344,7 @@ 
 			$album_user_id = $image_data['album_user_id'];
 
 			//@todo: $rating = new phpbb_gallery_image_rating($image_data['image_id'], $image_data, $image_data);
-			$image_data['rating'] = '0';//@todo: $rating->get_image_rating(false, false);
+			$image_data['rating'] = '0'; //@todo: $rating->get_image_rating(false, false);
 			//@todo: unset($rating);
 
 			$s_user_allowed = (($image_data['image_user_id'] == $this->user->data['user_id']) && ($album_status != \phpbbgallery\core\block::ALBUM_LOCKED));
@@ -402,14 +402,14 @@ 
 
 				'U_USER_IP'		=> $show_ip && $this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) ? $image_data['image_user_ip'] : false,
 				'S_IMAGE_REPORTED'		=> $image_data['image_reported'],
-				'U_IMAGE_REPORTED'		=> '',//($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
+				'U_IMAGE_REPORTED'		=> '', //($image_data['image_reported']) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported']) : '',
 				'S_STATUS_APPROVED'		=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED),
 				'S_STATUS_UNAPPROVED'	=> ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? true : false,
 				'S_STATUS_UNAPPROVED_ACTION'	=> ($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id) && $image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->helper->route('phpbbgallery_core_moderate_image_approve', array('image_id' => $image_data['image_id'])) : '',
 				'S_STATUS_LOCKED'		=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_LOCKED),
 
 				'U_REPORT'	=> ($this->auth->acl_check('m_report', $image_data['image_album_id'], $album_user_id) && $image_data['image_reported']) ? '123'/*$this->url->append_sid('mcp', "mode=report_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_reported'])*/ : '',
-				'U_STATUS'	=> '',//($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
+				'U_STATUS'	=> '', //($this->auth->acl_check('m_status', $image_data['image_album_id'], $album_user_id)) ? $phpbb_ext_gallery->url->append_sid('mcp', "mode=queue_details&album_id={$image_data['image_album_id']}&option_id=" . $image_data['image_id']) : '',
 				'L_STATUS'	=> ($image_data['image_status'] == \phpbbgallery\core\block::STATUS_UNAPPROVED) ? $this->language->lang('APPROVE_IMAGE') : (($image_data['image_status'] == \phpbbgallery\core\block::STATUS_APPROVED) ? $this->language->lang('CHANGE_IMAGE_STATUS') : $this->language->lang('UNLOCK_IMAGE')),
 
 				'S_CONTEST_RANK'	=> $image_data['image_contest_rank'],

core/controller/index.php

Spacing +5 added lines, -5 removed lines

@@ -159,7 +159,7 @@ 
 				'U_IMAGENAME'	=> ($last_image['image_id'] > 0) ? $last_image['image_name'] : false,
 				'U_IMAGE_ACTION'	=> $action_image,
 				'U_IMAGENAME_ACTION'	=> $this->helper->route('phpbbgallery_core_image', array('image_id' => $last_image['image_id'])),
-				'U_TIME'	=> ($last_image['image_id'] > 0) ?  $this->user->format_date($last_image['image_time']) : false,
+				'U_TIME'	=> ($last_image['image_id'] > 0) ? $this->user->format_date($last_image['image_time']) : false,
 				'U_UPLOADER'	=> ($last_image['image_id'] > 0) ? get_username_string('full', $last_image['image_user_id'], $last_image['image_username'], $last_image['image_user_colour']) : false,
 			));
 			$this->gallery_user->set_user_id($this->user->data['user_id']);
@@ -318,7 +318,7 @@ 
 			'TOTAL_IMAGES'		=> ($this->gallery_config->get('disp_statistic')) ? $this->language->lang('TOTAL_IMAGES_SPRINTF', $this->gallery_config->get('num_images')) : '',
 			'TOTAL_COMMENTS'	=> ($this->gallery_config->get('allow_comments')) ? $this->language->lang('TOTAL_COMMENTS_SPRINTF', $this->gallery_config->get('num_comments')) : '',
 			'TOTAL_PGALLERIES'	=> ($this->gallery_auth->acl_check('a_list', \phpbbgallery\core\auth\auth::PERSONAL_ALBUM)) ? $this->language->lang('TOTAL_PEGAS_SPRINTF', $this->gallery_config->get('num_pegas')) : '',
-			'NEWEST_PGALLERIES'	=> ($this->gallery_config->get('num_pegas')) ? sprintf($this->language->lang('NEWEST_PGALLERY'), '<a href="' . $this->helper->route('phpbbgallery_core_album', array('album_id' => $this->gallery_config->get('newest_pega_album_id'))) . '" '. ($this->gallery_config->get('newest_pega_user_colour') ? 'class="username-coloured" style="color: #' . $this->gallery_config->get('newest_pega_user_colour') . ';"' : 'class="username"') . '>' . $this->gallery_config->get('newest_pega_username') . '</a>') : '',
+			'NEWEST_PGALLERIES'	=> ($this->gallery_config->get('num_pegas')) ? sprintf($this->language->lang('NEWEST_PGALLERY'), '<a href="' . $this->helper->route('phpbbgallery_core_album', array('album_id' => $this->gallery_config->get('newest_pega_album_id'))) . '" ' . ($this->gallery_config->get('newest_pega_user_colour') ? 'class="username-coloured" style="color: #' . $this->gallery_config->get('newest_pega_user_colour') . ';"' : 'class="username"') . '>' . $this->gallery_config->get('newest_pega_username') . '</a>') : '',
 		));
 
 		$this->template->assign_vars(array(
@@ -416,9 +416,9 @@ 
 
 			while ($row = $this->db->sql_fetchrow($result))
 			{
-				$birthday_username	= get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-				$birthday_year		= (int) substr($row['user_birthday'], -4);
-				$birthday_age		= ($birthday_year) ? max(0, $now['year'] - $birthday_year) : '';
+				$birthday_username = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
+				$birthday_year = (int) substr($row['user_birthday'], -4);
+				$birthday_age = ($birthday_year) ? max(0, $now['year'] - $birthday_year) : '';
 
 				$this->template->assign_block_vars('birthdays', array(
 					'USERNAME'	=> $birthday_username,

core/controller/comment.php

Spacing +10 added lines, -10 removed lines

@@ -197,8 +197,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
 		}
 
-		$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;
@@ -305,7 +305,7 @@ 
 			}
 
 			$message_parser = new \parse_message();
-			$message_parser->message	= utf8_normalize_nfc($comment_plain);
+			$message_parser->message = utf8_normalize_nfc($comment_plain);
 			if ($message_parser->message)
 			{
 				$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -464,8 +464,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$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;
@@ -678,8 +678,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$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;
@@ -759,7 +759,7 @@ 
 			'IMAGE_NAME'			=> $image_data['image_name'],
 
 			'S_SIGNATURE_CHECKED'	=> (isset($sig_checked) && $sig_checked) ? ' checked="checked"' : '',
-			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/'. (int) $comment_id),
+			'S_ALBUM_ACTION'		=> append_sid($this->url->path('full') . 'comment/' . (int) $image_id . '/edit/' . (int) $comment_id),
 		));
 
 		if ($submit && !$error)
@@ -808,8 +808,8 @@ 
 			include_once($this->phpbb_root_path . 'includes/functions_posting.' . $this->php_ext);
 		}
 
-		$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;

core/moderate.php

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);

core/album/album.php

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(