satanasov / phpbbgallery

exif/event/exif_listener.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 
 			$event['additional_sql_data'] = $additional_sql_data;
 			unset($exif);
-		}
-		else
+		} else
 		{
 			$additional_sql_data = $event['additional_sql_data'];
 			$additional_sql_data['image_exif_data'] = '';

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		$this->user = $user;
 		$this->gallery_config = $gallery_config;
 		$this->gallery_auth = $gallery_auth;
-		$this->gallery_url	= $gallery_url;
+		$this->gallery_url = $gallery_url;
 		$this->gallery_user = $gallery_user;
 	}
 
@@ -83,7 +83,7 @@ 
 			{
 				$this->user->add_lang_ext('phpbbgallery/exif', 'info_exif');
 
-				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA',		'validate' => 'bool',	'type' => 'radio:yes_no');
+				$return_ary['vars']['IMAGE_SETTINGS']['disp_exifdata'] = array('lang' => 'DISP_EXIF_DATA', 'validate' => 'bool', 'type' => 'radio:yes_no');
 				$event['return_ary'] = $return_ary;
 			}
 		}

core/report.php

Braces +3 added lines, -6 removed lines

@@ -249,8 +249,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -340,8 +339,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES'				=> $this->language->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(
@@ -396,8 +394,7 @@ 
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	protected $reports_table;
 
 	public function __construct(\phpbbgallery\core\log $gallery_log, \phpbbgallery\core\auth\auth $gallery_auth, \phpbb\user $user,
-		\phpbb\language\language $language, \phpbb\db\driver\driver_interface $db,	\phpbb\user_loader $user_loader,
+		\phpbb\language\language $language, \phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader,
 		\phpbbgallery\core\album\album $album, \phpbb\template\template $template, \phpbb\controller\helper $helper,
 		\phpbbgallery\core\config $gallery_config, \phpbb\pagination $pagination, \phpbbgallery\core\notification\helper $notification_helper,
 		$images_table, $reports_table)
@@ -363,7 +363,7 @@ 
 				'REPORT_TIME'	=> $this->user->format_date($VAR['report_time']),
 			));
 			unset($album_tmp);
-			$reported_images_count ++;
+			$reported_images_count++;
 		}
 		$this->template->assign_vars(array(
 			'TOTAL_IMAGES_REPORTED' => $status == 1 ? $this->language->lang('WAITING_REPORTED_IMAGE', (int) $count) : $this->language->lang('WAITING_REPORTED_DONE', (int) $count),

core/upload.php

Spacing +3 added lines, -3 removed lines

@@ -279,7 +279,7 @@ 
 			include_once($this->root_path . 'includes/message_parser.' . $this->php_ext);
 		}
 		$message_parser = new \parse_message();
-		$message_parser->message	= utf8_normalize_nfc($this->get_description());
+		$message_parser->message = utf8_normalize_nfc($this->get_description());
 		if ($message_parser->message)
 		{
 			$message_parser->parse(true, true, true, true, false, true, true, true);
@@ -334,7 +334,7 @@ 
 
 		$sql_ary = array_merge($sql_ary, $additional_sql_data);
 
-		$sql = 'UPDATE ' . $this->images_table. ' 
+		$sql = 'UPDATE ' . $this->images_table . ' 
 			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 			WHERE image_id = ' . (int) $image_id;
 		$this->db->sql_query($sql);
@@ -452,7 +452,7 @@ 
 		// Rotate the image
 		if ($this->gallery_config->get('allow_rotate') && $this->get_rotating())
 		{
-			$this->tools->rotate_image($this->get_rotating(),$this->gallery_config->get('allow_resize'));
+			$this->tools->rotate_image($this->get_rotating(), $this->gallery_config->get('allow_resize'));
 			if ($this->tools->rotated)
 			{
 				$this->tools->write_image($this->tools->image_source, $this->gallery_config->get('jpg_quality'), true);

Braces +7 added lines, -14 removed lines

@@ -144,8 +144,7 @@ 
 			{
 				$this->zip_file = $this->file;
 				$this->upload_zip();
-			}
-			else
+			} else
 			{
 				$image_id = $this->prepare_file();
 				if ($image_id)
@@ -210,8 +209,7 @@ 
 			if (is_dir($current_dir . $file))
 			{
 				$this->read_zip_folder($current_dir . $file . '/');
-			}
-			else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
+			} else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
 			{
 				if (!$this->file_limit || ($this->uploaded_files < $this->file_limit))
 				{
@@ -231,23 +229,20 @@ 
 					{
 						$this->uploaded_files++;
 						$this->images[] = (int) $image_id;
-					}
-					else
+					} else
 					{
 						if ($this->file->error)
 						{
 							$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), implode('<br />&raquo; ', $this->file->error)));
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->quota_error();
 					@unlink($current_dir . $file);
 				}
 
-			}
-			else
+			} else
 			{
 				@unlink($current_dir . $file);
 			}
@@ -356,8 +351,7 @@ 
 		{
 			$this->file->clean_filename('unique_ext');
 			$this->file->move_file(substr($this->gallery_url->path('upload'), 0, -1), false, false, CHMOD_ALL);
-		}
-		else
+		} else
 		{
 			// Okay, this looks hacky, but what we do here is, we store the directory name in the filename.
 			// However phpBB strips directories form the filename, when moving, so we need to specify that again.
@@ -411,8 +405,7 @@ 
 					//$this->file->height = $this->tools->image_size['height'];
 					//$this->file->width = $this->tools->image_size['width'];
 				}
-			}
-			else
+			} else
 			{
 				$this->file->remove();
 				$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), $this->language->lang('UPLOAD_IMAGE_SIZE_TOO_BIG')));

core/contest.php

Spacing +3 added lines, -3 removed lines

@@ -190,9 +190,9 @@
 		$this->db->sql_freeresult($result);
 
 		$sql = 'UPDATE ' . $this->contest_table . '
-			SET contest_first = ' . (int) $first .',
-				contest_second = ' . (int) $second .',
-				contest_third = ' . (int) $third .'
+			SET contest_first = ' . (int) $first . ',
+				contest_second = ' . (int) $second . ',
+				contest_third = ' . (int) $third . '
 			WHERE contest_album_id = ' . (int) $album_id;
 		$this->db->sql_query($sql);
 

Braces +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
 			{
 				$this->resync($album_id);
 			}
-		}
-		else
+		} else
 		{
 			$this->resync((int) $album_ids);
 		}

core/rating.php

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 	*/
 	public function display_box()
 	{
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
 
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
 		{
@@ -201,7 +201,7 @@ 
 	 */
 	public function get_image_rating($user_rating = false, $display_contest_end = true)
 	{
-		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT);//@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
+		$this->template->assign_var('GALLERY_RATING', self::MODE_SELECT); //@todo: phpbb_ext_gallery_core_config::get('rating_mode'));
 
 		switch (self::MODE_SELECT)//@todo: phpbb_ext_gallery_core_config::get('rating_mode'))
 		{

Braces +3 added lines, -6 removed lines

@@ -216,8 +216,7 @@ 
 						return $this->language->lang('CONTEST_RATING_HIDDEN');
 					}
 					return $this->language->lang('CONTEST_RESULT_HIDDEN', $this->user->format_date(($this->album_data('contest_start') + $this->album_data('contest_end')), false, true));
-				}
-				else
+				} else
 				{
 					if ($user_rating)
 					{
@@ -364,8 +363,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}
@@ -399,8 +397,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}

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

@@ -238,8 +238,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
@@ -409,8 +408,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));
 			if ($this->tool->is_ie_greater7($this->user->browser))

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/search.php

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 +12 added lines, -12 removed lines

@@ -141,10 +141,10 @@ 
 
 	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);
@@ -152,13 +152,13 @@ 
 		$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');
 		$filtered		= $this->request->variable('filtered', false);
 
-		$start 			= ($page - 1) * $this->gallery_config->get('items_per_page');
+		$start = ($page - 1) * $this->gallery_config->get('items_per_page');
 		if ($filtered)
 		{
 			$submit = true;
@@ -175,7 +175,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';
 		}
@@ -206,7 +206,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 . '
@@ -224,7 +224,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
@@ -237,7 +237,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();
@@ -262,7 +262,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 . ')';
@@ -291,7 +291,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',
@@ -319,7 +319,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',