satanasov / phpbbgallery

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']))
 		{

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
 			$this->data['album_user_id'] = 1;
 			$this->data['image_filemissing'] = 0;
 			$this->data['album_watermark'] = 0;
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT *
 				FROM ' . $this->table_images . ' i
@@ -394,8 +393,7 @@ 
 			{
 				$response->headers->set('expires', '-1');
 			}
-		}
-		else
+		} else
 		{
 			$response->headers->set('Content-Disposition', 'inline; ' . $this->tool->header_filename(htmlspecialchars_decode($this->tool->image_name)) . '.' . ($this->tool->image_type == 'jpeg' ? 'jpg' : $this->tool->image_type));
 			if ($this->tool->is_ie_greater7($this->user->browser))

Indentation +23 added lines, -23 removed lines

@@ -104,12 +104,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/source
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/source
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function source($image_id)
 	{
 		$this->auth->load_user_permissions($this->user->data['user_id']);
@@ -160,12 +160,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/medium
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/medium
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function medium($image_id)
 	{
 
@@ -195,12 +195,12 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/mini
-	*
-	* @param	int		$image_id
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/mini
+	 *
+	 * @param	int		$image_id
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function mini($image_id)
 	{
 		$this->path = $this->path_mini;
@@ -356,11 +356,11 @@ 
 	}
 
 	/**
-	* Image File Controller
-	*	Route: gallery/image/{image_id}/x
-	*
-	* @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
-	*/
+	 * Image File Controller
+	 *	Route: gallery/image/{image_id}/x
+	 *
+	 * @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
+	 */
 	public function display()
 	{
 		$this->tool->set_last_modified($this->gallery_user->get_data('user_permissions_changed'));

core/controller/upload.php

Braces +6 added lines, -12 removed lines

@@ -249,8 +249,7 @@ 
 					'last_image'	=> end($process->images),
 				);
 				$this->notification_helper->new_image($data);
-			}
-			else
+			} else
 			{
 				$target = array(
 					'album_id'	=>	$album_id,
@@ -355,8 +354,7 @@ 
 					{
 						$this->language->add_lang('ucp');
 						$error_array[] = $this->language->lang($result . '_USERNAME');
-					}
-					else
+					} else
 					{
 						$process->set_username($username);
 					}
@@ -375,8 +373,7 @@ 
 				if (!$process->uploaded_files)
 				{
 					$process->new_error($this->language->lang('UPLOAD_NO_FILE'));
-				}
-				else
+				} else
 				{
 					$mode = 'upload_edit';
 					// Remove submit, so we get the first screen of step 2.
@@ -422,8 +419,7 @@ 
 						if ($VAR == 'zip')
 						{
 							continue;
-						}
-						else
+						} else
 						{
 							$filetypes[] = $VAR;
 						}
@@ -523,8 +519,7 @@ 
 						'last_image'	=> end($process->images),
 					);
 					$this->notification_helper->new_image($data);
-				}
-				else
+				} else
 				{
 					$target = array(
 						'album_id'	=>	(int) $album_id,
@@ -591,8 +586,7 @@ 
 		if (file_exists($phpbbgallery_core_file) && is_writable($phpbbgallery_core_file) && file_exists($phpbbgallery_core_file_source) && is_writable($phpbbgallery_core_file_source) && file_exists($phpbbgallery_core_file_medium) && is_writable($phpbbgallery_core_file_medium) && file_exists($phpbbgallery_core_file_mini) && is_writable($phpbbgallery_core_file_mini))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

core/controller/moderate.php

Braces +16 added lines, -32 removed lines

@@ -148,8 +148,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -207,8 +206,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_status', $album['album_id'], $album['album_user_id']))
@@ -253,8 +251,7 @@ 
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -303,8 +300,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -351,8 +347,7 @@ 
 				$message = $this->language->lang('WAITING_REPORTED_DONE', count($report_ary));
 				$this->url->meta_refresh(3, $back_link);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="action['.$action.']" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -372,8 +367,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id']))
@@ -468,8 +462,7 @@ 
 						trigger_error($message);
 					break;
 				}
-			}
-			else
+			} else
 			{
 				$s_hidden_fields = '<input type="hidden" name="select_action" value="' . $action . '" />';
 				$s_hidden_fields .= '<input type="hidden" name="back_link" value="' . $back_link . '" />';
@@ -490,8 +483,7 @@ 
 						'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 					));
 					return $this->helper->render('gallery/mcp_body.html', $this->language->lang('GALLERY'));
-				}
-				else
+				} else
 				{
 					confirm_box(false, $this->language->lang('QUEUES_A_' . strtoupper($action) . '2_CONFIRM'), $s_hidden_fields);
 				}
@@ -506,8 +498,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else
+		} else
 		{
 			$album = $this->album->get_info($album_id);
 			if (!$this->gallery_auth->acl_check('m_', $album['album_id'], $album['album_user_id']))
@@ -581,8 +572,7 @@ 
 					$message = $this->language->lang('WAITING_REPORTED_DONE', 1);
 					$this->url->meta_refresh(3, $back_link);
 					trigger_error($message);
-				}
-				else
+				} else
 				{
 					$s_hidden_fields = '<input type="hidden" name="action" value="reports_close" />';
 					confirm_box(false, $this->language->lang('REPORT_A_CLOSE2_CONFIRM'), $s_hidden_fields);
@@ -624,8 +614,7 @@ 
 			{
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
 				$select_select .= '<option value="images_lock">' . $this->language->lang('QUEUE_A_LOCK') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="images_approve">' . $this->language->lang('QUEUE_A_APPROVE') . '</option>';
 				$select_select .= '<option value="images_unapprove">' . $this->language->lang('QUEUE_A_UNAPPROVE') . '</option>';
@@ -644,8 +633,7 @@ 
 			if ($open_report)
 			{
 				$select_select .= '<option value="reports_close">' . $this->language->lang('REPORT_A_CLOSE') . '</option>';
-			}
-			else
+			} else
 			{
 				$select_select .= '<option value="reports_open">' . $this->language->lang('REPORT_A_OPEN') . '</option>';
 			}
@@ -727,8 +715,7 @@ 
 			));
 			return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
 			//trigger_error($message);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'S_NOTIFY_POSTER'			=> $show_notify,
@@ -777,8 +764,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_UNAPPROVED_IMAGE', 1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_UNAPPROVE2', $s_hidden_fields);
@@ -819,8 +805,7 @@ 
 			$this->album->update_info($moving_target);
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$category_select = $this->album->get_albumbox(false, 'moving_target', $album_id, 'm_move', $album_id);
 			$this->template->assign_vars(array(
@@ -864,8 +849,7 @@ 
 			$message = sprintf($this->language->lang('WAITING_LOCKED_IMAGE',1));
 			meta_refresh($meta_refresh_time, $image_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			$s_hidden_fields = '';
 			confirm_box(false, 'QUEUE_A_LOCK2', $s_hidden_fields);

Spacing +7 added lines, -7 removed lines

@@ -260,7 +260,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)
 				{
@@ -361,7 +361,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)
 				{
@@ -583,7 +583,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);
@@ -679,7 +679,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'));
@@ -804,7 +804,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');
@@ -852,7 +852,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');
@@ -868,7 +868,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/search.php

Indentation +7 added lines, -7 removed lines

@@ -165,8 +165,8 @@ 
 		$this->language->add_lang(array('gallery'), 'phpbbgallery/core');
 		$this->language->add_lang('search');
 		/**
-		* Build the sort options
-		*/
+		 * Build the sort options
+		 */
 		$limit_days = array(0 => $this->language->lang('ALL_IMAGES'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR'));
 		$sort_by_text = array('t' => $this->language->lang('TIME'), 'n' => $this->language->lang('IMAGE_NAME'), 'u' => $this->language->lang('SORT_USERNAME'), 'vc' => $this->language->lang('GALLERY_VIEWS'));
 		$sort_by_sql = array('t' => 'image_time', 'n' => 'image_name_clean', 'u' => 'image_username_clean', 'vc' => 'image_view_count');
@@ -369,11 +369,11 @@ 
 	}
 
 	/**
-	* Index Controller
-	*	Route: gallery/search/random
-	*
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Index Controller
+	 *	Route: gallery/search/random
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function random()
 	{
 		$this->language->add_lang(array('gallery'), 'phpbbgallery/core');

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
 				if ($search_terms == 'all')
 				{
 					$keywords .= ' ' . $add_keywords;
-				}
-				else
+				} else
 				{
 					$search_terms = 'all';
 					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' .$add_keywords;
@@ -271,8 +270,7 @@ 
 			if (empty($search_album))
 			{
 				$sql_where[] = $this->db->sql_in_set('i.image_album_id', $this->gallery_auth->acl_album_ids('i_view'));
-			}
-			else
+			} else
 			{
 				$sql_where[] = $this->db->sql_in_set('i.image_album_id', $search_album);
 			}

Spacing +14 added lines, -14 removed lines

@@ -141,24 +141,24 @@ 
 
 	public function base($page = 1)
 	{
-		$search_id		= $this->request->variable('search_id', '');
+		$search_id = $this->request->variable('search_id', '');
 		$image_id		= $this->request->variable('image_id', 0);
 
-		$submit			= $this->request->variable('submit', false);
+		$submit = $this->request->variable('submit', false);
 		$keywords		= utf8_normalize_nfc($this->request->variable('keywords', '', true));
 		$add_keywords	= utf8_normalize_nfc($this->request->variable('add_keywords', '', true));
 		$username		= $this->request->variable('username', '', true);
-		$user_id		= $this->request->variable('user_id', array(0));
+		$user_id = $this->request->variable('user_id', array(0));
 		$search_terms	= $this->request->variable('terms', 'all');
 		$search_album	= $this->request->variable('aid', array(0));
 		$search_child	= $this->request->variable('sc', true);
-		$search_fields	= $this->request->variable('sf', 'all');
-		$sort_days		= $this->request->variable('st', 0);
+		$search_fields = $this->request->variable('sf', 'all');
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key		= $this->request->variable('sk', 't');
 		$sort_dir		= $this->request->variable('sd', 'd');
 
-		$start 			= ($page - 1) * $this->gallery_config->get('items_per_page');
-		if ($keywords != '' && $add_keywords ='' )
+		$start = ($page - 1) * $this->gallery_config->get('items_per_page');
+		if ($keywords != '' && $add_keywords = '')
 		{
 			$submit = true;
 		}
@@ -174,7 +174,7 @@ 
 		if ($this->gallery_config->get('allow_rates'))
 		{
 			$sort_by_text['ra'] = $this->language->lang('RATING');
-			$sort_by_sql['ra'] = 'image_rate_points';//@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg';
+			$sort_by_sql['ra'] = 'image_rate_points'; //@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg';
 			$sort_by_text['r'] = $this->language->lang('RATES_COUNT');
 			$sort_by_sql['r'] = 'image_rates';
 		}
@@ -205,7 +205,7 @@ 
 				{
 					trigger_error(sprintf($this->language->lang('TOO_FEW_AUTHOR_CHARS'), $this->config['min_search_author_chars']));
 				}
-				$username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) .'\'';
+				$username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) . '\'';
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . '
 					WHERE ' . $username_parsed . '
@@ -223,7 +223,7 @@ 
 
 			if (!empty($user_id))
 			{
-				$sql_where[] =  $this->db->sql_in_set('i.image_user_id', $user_id);
+				$sql_where[] = $this->db->sql_in_set('i.image_user_id', $user_id);
 			}
 			// if we search in an existing search result just add the additional keywords. But we need to use "all search terms"-mode
 			// so we can keep the old keywords in their old mode, but add the new ones as required words
@@ -236,7 +236,7 @@ 
 				else
 				{
 					$search_terms = 'all';
-					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' .$add_keywords;
+					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' . $add_keywords;
 				}
 			}
 			$keywords_ary = ($keywords) ? explode(' ', $keywords) : array();
@@ -261,7 +261,7 @@ 
 				$match_search_query = '';
 				foreach ($matches as $match)
 				{
-					$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') ';
+					$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER(' . $match . ') ';
 					$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . mb_strtolower($word) . $this->db->get_any_char()));
 				}
 				$search_query .= ((!$search_query) ? '' : (($search_terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')';
@@ -290,7 +290,7 @@ 
 				trigger_error('NO_SEARCH_RESULTS');
 			}
 			$sql_array['SELECT'] = '*, a.album_name, a.album_status, a.album_user_id, a.album_id';
-			$sql_array['LEFT_JOIN']	= array(
+			$sql_array['LEFT_JOIN'] = array(
 				array(
 					'FROM'		=> array($this->albums_table => 'a'),
 					'ON'		=> 'a.album_id = i.image_album_id',
@@ -318,7 +318,7 @@ 
 			{
 				$this->image->assign_block('imageblock.image', $row, $show_options, $thumbnail_link, $imagename_link);
 			}
-			$current_page = $page*$this->gallery_config->get('items_per_page');
+			$current_page = $page * $this->gallery_config->get('items_per_page');
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(
 					'phpbbgallery_core_search',

core/controller/index.php

Indentation +5 added lines, -5 removed lines

@@ -111,11 +111,11 @@
 	}
 
 	/**
-	* Index Controller
-	*	Route: gallery
-	*
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-	*/
+	 * Index Controller
+	 *	Route: gallery
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
 	public function base()
 	{
 		// Display login box for guests and an error for users

Braces +3 added lines, -6 removed lines

@@ -131,8 +131,7 @@ 
 		if ($this->gallery_config->get('pegas_index_album'))
 		{
 			$this->display->display_albums('personal', $this->config['load_moderators']);
-		}
-		else
+		} else
 		{
 			$last_image = $this->image->get_last_image();
 			if (empty($last_image))
@@ -347,8 +346,7 @@ 
 				FROM ' . GROUPS_TABLE . '
 				WHERE group_legend > 0
 				ORDER BY ' . $order_legend . ' ASC';
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, g.group_legend
 				FROM ' . GROUPS_TABLE . ' g
@@ -373,8 +371,7 @@ 
 			if ($row['group_name'] == 'BOTS' || ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile')))
 			{
 				$legend[] = '<span' . $colour_text . '>' . $group_name . '</span>';
-			}
-			else
+			} else
 			{
 				$legend[] = '<a' . $colour_text . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 			}

Spacing +5 added lines, -5 removed lines

@@ -167,7 +167,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,
 				'ALPHABET_NAVIGATION' => implode(' ', $alpha_links),
 			));
@@ -327,7 +327,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(
@@ -425,9 +425,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

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'))
 		{

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;

Braces +11 added lines, -22 removed lines

@@ -213,8 +213,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;
 		}
@@ -338,14 +337,12 @@ 
 				$this->notification_helper->notify('new_comment', $data);
 				//$phpbb_gallery_notification->send_notification('image', $image_id, $image_data['image_name']);
 				$message .= $this->language->lang('COMMENT_STORED') . '<br />';
-			}
-			else if ($this->misc->display_captcha('comment'))
+			} else if ($this->misc->display_captcha('comment'))
 			{
 				$s_captcha_hidden_fields = ($captcha->is_solved()) ? build_hidden_fields($captcha->get_hidden_fields()) : '';
 			}
 			$sig_checked = ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig']));
-		}
-		else
+		} else
 		{
 			if ($comment_id != 0)
 			{
@@ -439,8 +436,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -451,8 +447,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -485,8 +480,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;
 		}
@@ -578,8 +572,7 @@ 
 					$this->gallery_log->add_log('moderator', 'c_edit', $image_data['image_album_id'], $image_data['image_id'], array('LOG_GALLERY_COMMENT_EDITED', $image_data['image_name']));
 				}
 			}
-		}
-		else
+		} else
 		{
 			$sig_checked = (bool) $comment_data['comment_signature'];
 
@@ -653,8 +646,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -665,8 +657,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -731,15 +722,13 @@ 
 
 			$message = $this->language->lang('DELETED_COMMENT') . '<br />';
 			$submit = true;
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
 				$message = $this->language->lang('DELETED_COMMENT_NOT') . '<br />';
 				$submit = true;
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_COMMENT2', $s_hidden_fields);
 			}

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