Passed
Push — master ( b0e9b2...87988d )
by Stanislav
18:47 queued 03:50
created
core/acp/albums_module.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 
66 66
 		$action		= $request->variable('action', '');
67 67
 		$update		= (isset($_POST['update'])) ? true : false;
68
-		$album_id	= $request->variable('a', 0);
68
+		$album_id = $request->variable('a', 0);
69 69
 
70
-		$this->parent_id	= $request->variable('parent_id', 0);
70
+		$this->parent_id = $request->variable('parent_id', 0);
71 71
 		$album_data = $errors = array();
72 72
 		if ($update && !check_form_key($form_key))
73 73
 		{
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
 			switch ($action)
82 82
 			{
83 83
 				case 'delete':
84
-					$action_subalbums	= $request->variable('action_subalbums', '');
85
-					$subalbums_to_id	= $request->variable('subalbums_to_id', 0);
86
-					$action_images		= $request->variable('action_images', '');
87
-					$images_to_id		= $request->variable('images_to_id', 0);
84
+					$action_subalbums = $request->variable('action_subalbums', '');
85
+					$subalbums_to_id = $request->variable('subalbums_to_id', 0);
86
+					$action_images = $request->variable('action_images', '');
87
+					$images_to_id = $request->variable('images_to_id', 0);
88 88
 
89 89
 					$errors = $manage_albums->delete_album($album_id, $action_images, $action_subalbums, $images_to_id, $subalbums_to_id);
90 90
 
@@ -232,12 +232,12 @@  discard block
 block discarded – undo
232 232
 						$acl_url = '&mode=manage&action=v_mask&album_id[]=' . $album_data['album_id'];
233 233
 
234 234
 						$message = ($action == 'add') ? $this->language->lang('ALBUM_CREATED') : $this->language->lang('ALBUM_UPDATED');
235
-						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
235
+						$message .= '<br /><br />' . sprintf($this->language->lang('REDIRECT_ACL'), '<a href="' . $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url) . '">', '</a>');
236 236
 
237 237
 						// Redirect directly to permission settings screen
238 238
 						if ($action == 'add' && !$album_perm_from)
239 239
 						{
240
-							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin' , 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
240
+							meta_refresh(5, $phpbb_ext_gallery_core_url->append_sid('admin', 'index', 'i=-phpbbgallery-core-acp-permissions_module' . $acl_url));
241 241
 						}
242 242
 
243 243
 						trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
Please login to merge, or discard this patch.
core/acp/permissions_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 			'misc'	=> array('a_list', 'i_count', 'i_unlimited', 'a_count', 'a_unlimited', 'a_restrict'),
71 71
 		);
72 72
 		$permissions->p_masks[$gallery_auth::OWN_ALBUM] = array_merge($permissions->cats[$gallery_auth::OWN_ALBUM]['i'], $permissions->cats[$gallery_auth::OWN_ALBUM]['c'], $permissions->cats[$gallery_auth::OWN_ALBUM]['m'], $permissions->cats[$gallery_auth::OWN_ALBUM]['misc']);
73
-		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array();// Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
73
+		$permissions->p_masks_anti[$gallery_auth::OWN_ALBUM] = array(); // Note: we set i_view to 1 as default, so it's not needed on anti array('i_view');
74 74
 
75 75
 		// Permissions for personal albums of other users
76 76
 		// Note: Do !NOT! hide the i_upload. It's used for the moving-permissions
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
 	{
1245 1245
 		global $user, $phpbb_container;
1246 1246
 
1247
-		$phpbb_ext_gallery_core_auth =  $phpbb_container->get('phpbbgallery.core.auth');
1247
+		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
1248 1248
 
1249 1249
 		$disabled = false;
1250 1250
 		// We submit a "wrong" array on the check (to make it more easy) so we convert it here
Please login to merge, or discard this patch.
core/acp/gallery_logs_module.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 		add_form_key('acp_logs');
30 30
 		$page = $request->variable('page', 0);
31 31
 		$filter_log = $request->variable('lf', 'all');
32
-		$sort_days	= $request->variable('st', 0);
32
+		$sort_days = $request->variable('st', 0);
33 33
 		$sort_key	= $request->variable('sk', 't');
34 34
 		$sort_dir	= $request->variable('sd', 'd');
35 35
 		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
36
-		$marked		= $request->variable('mark', array(0));
36
+		$marked = $request->variable('mark', array(0));
37 37
 		$log = $phpbb_container->get('phpbbgallery.core.log');
38 38
 
39 39
 		// Delete entries if requested and able
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 				{
124 124
 					$additional['sort_dir'] = $sort_dir;
125 125
 				}
126
-				$log->build_list($filter_log, 25, ($page/25) + 1, -1, 0, $additional);
126
+				$log->build_list($filter_log, 25, ($page / 25) + 1, -1, 0, $additional);
127 127
 			break;
128 128
 
129 129
 			default:
Please login to merge, or discard this patch.
core/misc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 			$sql = 'SELECT album_id
134 134
 				FROM ' . $this->track_table . '
135
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
135
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
136 136
 					AND ' . $this->db->sql_in_set('album_id', $album_id);
137 137
 			$result = $this->db->sql_query($sql);
138 138
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			{
148 148
 				$sql = 'UPDATE ' . $this->track_table . '
149 149
 					SET mark_time = ' . time() . '
150
-					WHERE user_id = '. (int) $this->user->data['user_id'] .'
150
+					WHERE user_id = '. (int) $this->user->data['user_id'] . '
151 151
 						AND ' . $this->db->sql_in_set('album_id', $sql_update);
152 152
 				$this->db->sql_query($sql);
153 153
 			}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
 			$sql = 'UPDATE ' . $this->track_table . '
180 180
 				SET mark_time = ' . time() . '
181
-				WHERE user_id = ' . (int) $this->user->data['user_id'] .'
181
+				WHERE user_id = ' . (int) $this->user->data['user_id'] . '
182 182
 					AND album_id = ' . (int) $album_id;
183 183
 			$this->db->sql_query($sql);
184 184
 
Please login to merge, or discard this patch.
core/log.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 				),
274 274
 				'params' => array(
275 275
 				),
276
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
276
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
277 277
 		}
278 278
 		else if ($album == -1)
279 279
 		{
@@ -293,9 +293,9 @@  discard block
 block discarded – undo
293 293
 			{
294 294
 				$url_array['sd'] = $additional['sort_dir'];
295 295
 			}
296
-			$url = http_build_query($url_array,'','&');
296
+			$url = http_build_query($url_array, '', '&');
297 297
 
298
-			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
298
+			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
299 299
 		}
300 300
 		else
301 301
 		{
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 				'params' => array(
308 308
 					'album_id'	=> $album,
309 309
 				),
310
-			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
310
+			), 'pagination', 'page', $count, $limit, ($page - 1) * $limit);
311 311
 		}
312 312
 	}
313 313
 }
Please login to merge, or discard this patch.
core/cache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 		if (($albums = $this->phpbb_cache->get('_albums')) === false)
56 56
 		{
57 57
 			$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
58
-				FROM ' . $this->table_albums. ' a
58
+				FROM ' . $this->table_albums . ' a
59 59
 				LEFT JOIN ' . USERS_TABLE . ' u
60 60
 					ON (u.user_id = a.album_user_id)
61 61
 				ORDER BY u.username_clean, a.album_user_id, a.left_id ASC';
Please login to merge, or discard this patch.
core/ucp/main_module.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		$phpbb_gallery_url = $phpbb_container->get('phpbbgallery.core.url');
28 28
 		$phpbb_gallery_url->_include('functions_display', 'phpbb');
29 29
 
30
-		$phpbb_ext_gallery_core_album =$phpbb_container->get('phpbbgallery.core.album');
30
+		$phpbb_ext_gallery_core_album = $phpbb_container->get('phpbbgallery.core.album');
31 31
 
32 32
 		$phpbb_ext_gallery_core_auth = $phpbb_container->get('phpbbgallery.core.auth');
33 33
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
 	function initialise_album()
153 153
 	{
154
-		global $cache, $db,  $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
154
+		global $cache, $db, $user, $phpbb_ext_gallery_core_auth, $phpbb_ext_gallery_core_album, $phpbb_ext_gallery_config, $albums_table, $phpbb_ext_gallery_user;
155 155
 		global $request, $users_table, $phpbb_container;
156 156
 
157 157
 		// we will have to initialse $phpbb_ext_gallery_user
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 
446 446
 		$this->language = $phpbb_container->get('language');
447 447
 
448
-		$phpbb_gallery_url->_include(array('bbcode','message_parser'), 'phpbb');
448
+		$phpbb_gallery_url->_include(array('bbcode', 'message_parser'), 'phpbb');
449 449
 
450 450
 		$album_id = $request->variable('album_id', 0);
451 451
 		$phpbb_ext_gallery_core_album->check_user($album_id);
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 				$sql = 'UPDATE ' . $albums_table . "
829 829
 					SET right_id = right_id - $delete_id
830 830
 					WHERE right_id > $right_id
831
-						AND album_user_id = ". (int) $user->data['user_id'];
831
+						AND album_user_id = " . (int) $user->data['user_id'];
832 832
 				$db->sql_query($sql);
833 833
 			}
834 834
 
@@ -1012,9 +1012,9 @@  discard block
 block discarded – undo
1012 1012
 		$db->sql_freeresult($result);
1013 1013
 
1014 1014
 		// Subscribed images
1015
-		$start				= $request->variable('start', 0);
1016
-		$images_per_page	= $phpbb_ext_gallery_config->get('items_per_page');
1017
-		$total_images		= 0;
1015
+		$start = $request->variable('start', 0);
1016
+		$images_per_page = $phpbb_ext_gallery_config->get('items_per_page');
1017
+		$total_images = 0;
1018 1018
 
1019 1019
 		$sql = 'SELECT COUNT(image_id) as images
1020 1020
 			FROM ' . $watch_table . '
Please login to merge, or discard this patch.
core/url.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,12 +129,12 @@
 block discarded – undo
129 129
 
130 130
 		if (isset($args[1]))
131 131
 		{
132
-			$args[1] .= '';//@todo: phpbb_gallery::$display_popup;
132
+			$args[1] .= ''; //@todo: phpbb_gallery::$display_popup;
133 133
 		}
134 134
 
135 135
 		$params = $args + array(
136 136
 			0	=> '',
137
-			1	=> '',//@todo: phpbb_gallery::$display_popup,
137
+			1	=> '', //@todo: phpbb_gallery::$display_popup,
138 138
 			2	=> true,
139 139
 			3	=> false,
140 140
 		);
Please login to merge, or discard this patch.
acpimport/acp/main_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 	function import()
34 34
 	{
35
-		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix ,$gallery_config, $gallery_album, $request;
35
+		global $db, $template, $user, $phpbb_dispatcher, $phpbb_container, $gallery_url, $request, $table_prefix, $gallery_config, $gallery_album, $request;
36 36
 
37 37
 		$import_schema = $request->variable('import_schema', '');
38 38
 		$images = $request->variable('images', array(''), true);
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 			$album_id = $request->variable('album_id', 0);
303 303
 			if (isset($_POST['users_pega']))
304 304
 			{
305
-				$image_user =  $phpbb_container->get('phpbbgallery.core.user');
305
+				$image_user = $phpbb_container->get('phpbbgallery.core.user');
306 306
 				$image_user->set_user_id($user_row['user_id']);
307 307
 				if ($user->data['user_id'] != $user_row['user_id'])
308 308
 				{
Please login to merge, or discard this patch.