satanasov / phpbbgallery

core/misc.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 
 			$sql = 'SELECT album_id
 				FROM ' . $this->track_table . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND ' . $this->db->sql_in_set('album_id', $album_id);
 			$result = $this->db->sql_query($sql);
 
@@ -147,7 +147,7 @@ 
 			{
 				$sql = 'UPDATE ' . $this->track_table . '
 					SET mark_time = ' . time() . '
-					WHERE user_id = '. (int) $this->user->data['user_id'] .'
+					WHERE user_id = '. (int) $this->user->data['user_id'] . '
 						AND ' . $this->db->sql_in_set('album_id', $sql_update);
 				$this->db->sql_query($sql);
 			}
@@ -178,7 +178,7 @@ 
 
 			$sql = 'UPDATE ' . $this->track_table . '
 				SET mark_time = ' . time() . '
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
 					AND album_id = ' . (int) $album_id;
 			$this->db->sql_query($sql);
 

core/log.php

Spacing +4 added lines, -4 removed lines

@@ -273,7 +273,7 @@ 
 				),
 				'params' => array(
 				),
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 		else if ($album == -1)
 		{
@@ -293,9 +293,9 @@ 
 			{
 				$url_array['sd'] = $additional['sort_dir'];
 			}
-			$url = http_build_query($url_array,'','&');
+			$url = http_build_query($url_array, '', '&');
 
-			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 		else
 		{
@@ -307,7 +307,7 @@ 
 				'params' => array(
 					'album_id'	=> $album,
 				),
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
 		}
 	}
 }

core/cache.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if (($albums = $this->phpbb_cache->get('_albums')) === false)
 		{
 			$sql = 'SELECT a.album_id, a.parent_id, a.album_name, a.album_type, a.left_id, a.right_id, a.album_user_id, a.display_in_rrc, a.album_auth_access
-				FROM ' . $this->table_albums. ' a
+				FROM ' . $this->table_albums . ' a
 				LEFT JOIN ' . USERS_TABLE . ' u
 					ON (u.user_id = a.album_user_id)
 				ORDER BY u.username_clean, a.album_user_id, a.left_id ASC';

core/ucp/main_module.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 		$phpbb_gallery_url = $phpbb_container->get('phpbbgallery.core.url');
 		$phpbb_gallery_url->_include('functions_display', 'phpbb');
 
-		$phpbb_ext_gallery_core_album =$phpbb_container->get('phpbbgallery.core.album');
+		$phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album');
 
 		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
 
@@ -151,7 +151,7 @@ 
 
 	function initialise_album()
 	{
-		global $cache, $db,  $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
+		global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
 		global $request, $users_table, $phpbb_container;
 
 		// we will have to initialse $phpbb_ext_gallery_user
@@ -445,7 +445,7 @@ 
 
 		$this->language = $phpbb_container->get('language');
 
-		$phpbb_gallery_url->_include(array('bbcode','message_parser'), 'phpbb');
+		$phpbb_gallery_url->_include(array('bbcode', 'message_parser'), 'phpbb');
 
 		$album_id = $request->variable('album_id', 0);
 		$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -828,7 +828,7 @@ 
 				$sql = 'UPDATE ' . $albums_table . "
 					SET right_id = right_id - $delete_id
 					WHERE right_id > $right_id
-						AND album_user_id = ". (int) $user->data['user_id'];
+						AND album_user_id = " . (int) $user->data['user_id'];
 				$db->sql_query($sql);
 			}
 
@@ -1012,9 +1012,9 @@ 
 		$db->sql_freeresult($result);
 
 		// Subscribed images
-		$start				= $request->variable('start', 0);
-		$images_per_page	= $phpbb_ext_gallery_config->get('items_per_page');
-		$total_images		= 0;
+		$start = $request->variable('start', 0);
+		$images_per_page = $phpbb_ext_gallery_config->get('items_per_page');
+		$total_images = 0;
 
 		$sql = 'SELECT COUNT(image_id) as images
 			FROM ' . $watch_table . '

core/url.php

Spacing +2 added lines, -2 removed lines

@@ -129,12 +129,12 @@
 
 		if (isset($args[1]))
 		{
-			$args[1] .= '';//@todo: phpbb_gallery::$display_popup;
+			$args[1] .= ''; //@todo: phpbb_gallery::$display_popup;
 		}
 
 		$params = $args + array(
 			0	=> '',
-			1	=> '',//@todo: phpbb_gallery::$display_popup,
+			1	=> '', //@todo: phpbb_gallery::$display_popup,
 			2	=> true,
 			3	=> false,
 		);

acpimport/acp/main_module.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 	function import()
 	{
-		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request;
+		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request;
 
 		$import_schema = $request->variable('import_schema', '');
 		$images = $request->variable('images', array(''), true);
@@ -302,7 +302,7 @@ 
 			$album_id = $request->variable('album_id', 0);
 			if (isset($_POST['users_pega']))
 			{
-				$image_user =  $phpbb_container->get('phpbbgallery.core.user');
+				$image_user = $phpbb_container->get('phpbbgallery.core.user');
 				$image_user->set_user_id($user_row['user_id']);
 				if ($user->data['user_id'] != $user_row['user_id'])
 				{

exif/language/bg/exif.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
 	'EXIF_CAM_MODEL'			=> 'Camera-model',
 	'EXIF_DATE'					=> 'Image taken on',
 	'EXIF_EXPOSURE'				=> 'Shutter speed',
-	'EXIF_EXPOSURE_EXP'			=> '%s Sec',// 'EXIF_EXPOSURE' unit
+	'EXIF_EXPOSURE_EXP'			=> '%s Sec', // 'EXIF_EXPOSURE' unit
 	'EXIF_EXPOSURE_BIAS'		=> 'Exposure bias',
-	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV',// 'EXIF_EXPOSURE_BIAS' unit
+	'EXIF_EXPOSURE_BIAS_EXP'	=> '%s EV', // 'EXIF_EXPOSURE_BIAS' unit
 	'EXIF_EXPOSURE_PROG'		=> 'Exposure program',
 	'EXIF_EXPOSURE_PROG_0'		=> 'Not defined',
 	'EXIF_EXPOSURE_PROG_1'		=> 'Manual',
@@ -72,7 +72,7 @@ 
 	'EXIF_FLASH_CASE_93'		=> 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
 	'EXIF_FLASH_CASE_95'		=> 'Flash fired, auto mode, return light detected, red-eye reduction mode',
 	'EXIF_FOCAL'				=> 'Focus length',
-	'EXIF_FOCAL_EXP'			=> '%s mm',// 'EXIF_FOCAL' unit
+	'EXIF_FOCAL_EXP'			=> '%s mm', // 'EXIF_FOCAL' unit
 	'EXIF_ISO'					=> 'ISO speed rating',
 	'EXIF_METERING_MODE'		=> 'Metering mode',
 	'EXIF_METERING_MODE_0'		=> 'Unknown',

core/controller/search.php

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

Spacing +8 added lines, -8 removed lines

@@ -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')),
 		));
 	}