Passed
Pull Request — master (#340)
by
unknown
02:42
created
exif/exif.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -15,74 +15,74 @@  discard block
 block discarded – undo
15 15
 class exif
16 16
 {
17 17
 	/**
18
-	* Default value for new users
19
-	*/
18
+	 * Default value for new users
19
+	 */
20 20
 	const DEFAULT_DISPLAY	= true;
21 21
 
22 22
 	/**
23
-	* phpBB will treat the time from the Exif data like UTC.
24
-	* If your images were taken with an other timezone, you can insert an offset here.
25
-	* The offset is than added to the timestamp before it is converted into the users time.
26
-	*
27
-	* Offset must be set in seconds.
28
-	*/
23
+	 * phpBB will treat the time from the Exif data like UTC.
24
+	 * If your images were taken with an other timezone, you can insert an offset here.
25
+	 * The offset is than added to the timestamp before it is converted into the users time.
26
+	 *
27
+	 * Offset must be set in seconds.
28
+	 */
29 29
 	const TIME_OFFSET	= 0;
30 30
 
31 31
 	/**
32
-	* Constants for the status of the Exif data.
33
-	*/
32
+	 * Constants for the status of the Exif data.
33
+	 */
34 34
 	const UNAVAILABLE	= 0;
35 35
 	const AVAILABLE		= 1;
36 36
 	const UNKNOWN		= 2;
37 37
 	const DBSAVED		= 3;
38 38
 
39 39
 	/**
40
-	* Is the function available?
41
-	*/
40
+	 * Is the function available?
41
+	 */
42 42
 	static public $function_exists = null;
43 43
 
44 44
 	/**
45
-	* Exif data array with all allowed groups and keys.
46
-	*/
45
+	 * Exif data array with all allowed groups and keys.
46
+	 */
47 47
 	public $data		= array();
48 48
 
49 49
 	/**
50
-	* Filtered data array. We don't have empty or invalid values here.
51
-	*/
50
+	 * Filtered data array. We don't have empty or invalid values here.
51
+	 */
52 52
 	public $prepared_data	= array();
53 53
 
54 54
 	/**
55
-	* Does the image have exif data?
56
-	* Values see constant declaration at the beginning of the class.
57
-	*/
55
+	 * Does the image have exif data?
56
+	 * Values see constant declaration at the beginning of the class.
57
+	 */
58 58
 	public $status		= 2;
59 59
 
60 60
 	/**
61
-	* Full data array, but serialized to a string
62
-	*/
61
+	 * Full data array, but serialized to a string
62
+	 */
63 63
 	public $serialized	= '';
64 64
 
65 65
 	/**
66
-	* Full link to the image-file
67
-	*/
66
+	 * Full link to the image-file
67
+	 */
68 68
 	public $file		= '';
69 69
 
70 70
 	/**
71
-	* Original status of the Exif data.
72
-	*/
71
+	 * Original status of the Exif data.
72
+	 */
73 73
 	public $orig_status = null;
74 74
 
75 75
 	/**
76
-	* Image-ID, just needed to update the Exif status
77
-	*/
76
+	 * Image-ID, just needed to update the Exif status
77
+	 */
78 78
 	public $image_id	= false;
79 79
 
80 80
 	/**
81
-	* Constructor
82
-	*
83
-	* @param	string	$file		Full link to the image-file
84
-	* @param	mixed	$image_id	False or integer
85
-	*/
81
+	 * Constructor
82
+	 *
83
+	 * @param	string	$file		Full link to the image-file
84
+	 * @param	mixed	$image_id	False or integer
85
+	 */
86 86
 	public function __construct($file, $image_id = false)
87 87
 	{
88 88
 		if (self::$function_exists === null)
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 
100 100
 	/**
101
-	* Interpret the values from the database, and read the data if we don't have it.
102
-	*
103
-	* @param	int		$status		Value of a status constant (see beginning of the class)
104
-	* @param	mixed	$data		Either an empty string or the serialized array of the Exif from the database
105
-	*/
101
+	 * Interpret the values from the database, and read the data if we don't have it.
102
+	 *
103
+	 * @param	int		$status		Value of a status constant (see beginning of the class)
104
+	 * @param	mixed	$data		Either an empty string or the serialized array of the Exif from the database
105
+	 */
106 106
 	public function interpret($status, $data)
107 107
 	{
108 108
 		$this->orig_status = $status;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 	}
119 119
 
120 120
 	/**
121
-	* Read Exif data from the image
122
-	*/
121
+	 * Read Exif data from the image
122
+	 */
123 123
 	public function read()
124 124
 	{
125 125
 		if (!self::$function_exists || !$this->file || !file_exists($this->file))
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 	}
166 166
 
167 167
 	/**
168
-	* Validate and prepare the data, so we can send it into the template.
169
-	*/
168
+	 * Validate and prepare the data, so we can send it into the template.
169
+	 */
170 170
 	private function prepare_data()
171 171
 	{
172 172
 		global $user;
@@ -273,11 +273,11 @@  discard block
 block discarded – undo
273 273
 	}
274 274
 
275 275
 	/**
276
-	* Sends the Exif into the template
277
-	*
278
-	* @param	bool	$expand_view	Shall we expand the Exif data on page view or collapse?
279
-	* @param	string	$block			Name of the template loop the Exif's are displayed in.
280
-	*/
276
+	 * Sends the Exif into the template
277
+	 *
278
+	 * @param	bool	$expand_view	Shall we expand the Exif data on page view or collapse?
279
+	 * @param	string	$block			Name of the template loop the Exif's are displayed in.
280
+	 */
281 281
 	public function send_to_template($expand_view = true, $block = 'exif_value')
282 282
 	{
283 283
 		$this->prepare_data();
@@ -301,8 +301,8 @@  discard block
 block discarded – undo
301 301
 	}
302 302
 
303 303
 	/**
304
-	* Save the new Exif status in the database
305
-	*/
304
+	 * Save the new Exif status in the database
305
+	 */
306 306
 	public function set_status()
307 307
 	{
308 308
 		if (!$this->image_id || ($this->orig_status == $this->status))
@@ -320,9 +320,9 @@  discard block
 block discarded – undo
320 320
 	}
321 321
 
322 322
 	/**
323
-	* There are lots of possible Exif Groups and Values.
324
-	* But you will never heard of the missing ones. so we just allow the most common ones.
325
-	*/
323
+	 * There are lots of possible Exif Groups and Values.
324
+	 * But you will never heard of the missing ones. so we just allow the most common ones.
325
+	 */
326 326
 	static private $allowed_groups		= array(
327 327
 		'EXIF',
328 328
 		'IFD0',
Please login to merge, or discard this patch.
core/image/image.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -190,13 +190,13 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 
192 192
 		/**
193
-		* Event delete images
194
-		*
195
-		* @event phpbbgallery.core.image.delete_images
196
-		* @var	array	images			array of the image ids we are deleting
197
-		* @var	array	filenames		array of the image filenames
198
-		* @since 1.2.0
199
-		*/
193
+		 * Event delete images
194
+		 *
195
+		 * @event phpbbgallery.core.image.delete_images
196
+		 * @var	array	images			array of the image ids we are deleting
197
+		 * @var	array	filenames		array of the image filenames
198
+		 * @since 1.2.0
199
+		 */
200 200
 		$vars = array('images', 'filenames');
201 201
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.delete_images', compact($vars)));
202 202
 
@@ -256,11 +256,11 @@  discard block
 block discarded – undo
256 256
 	}
257 257
 
258 258
 	/**
259
-	* Get the real filenames, so we can load/delete/edit the image-file.
260
-	*
261
-	* @param	mixed		$images		Array or integer with the image_id(s)
262
-	* @return	array		Format: $image_id => $filename
263
-	*/
259
+	 * Get the real filenames, so we can load/delete/edit the image-file.
260
+	 *
261
+	 * @param	mixed		$images		Array or integer with the image_id(s)
262
+	 * @return	array		Format: $image_id => $filename
263
+	 */
264 264
 	public function get_filenames($images)
265 265
 	{
266 266
 		if (empty($images))
@@ -375,13 +375,13 @@  discard block
 block discarded – undo
375 375
 				$tpl = '{CONTENT}';
376 376
 
377 377
 				/**
378
-				* Event generate link
379
-				*
380
-				* @event phpbbgallery.core.image.generate_link
381
-				* @var	string	mode	type of link
382
-				* @var	string	tpl		html to be outputted
383
-				* @since 1.2.0
384
-				*/
378
+				 * Event generate link
379
+				 *
380
+				 * @event phpbbgallery.core.image.generate_link
381
+				 * @var	string	mode	type of link
382
+				 * @var	string	tpl		html to be outputted
383
+				 * @since 1.2.0
384
+				 */
385 385
 				$vars = array('mode', 'tpl');
386 386
 				extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.image.generate_link', compact($vars)));//@todo: Correctly identify the event
387 387
 			break;
@@ -391,12 +391,12 @@  discard block
 block discarded – undo
391 391
 	}
392 392
 
393 393
 	/**
394
-	* Handle user- & total image_counter
395
-	*
396
-	* @param	array	$image_id_ary	array with the image_ids which changed their status
397
-	* @param	bool	$add			are we adding or removing the images
398
-	* @param	bool	$readd			is it possible that there are images which aren't really changed
399
-	*/
394
+	 * Handle user- & total image_counter
395
+	 *
396
+	 * @param	array	$image_id_ary	array with the image_ids which changed their status
397
+	 * @param	bool	$add			are we adding or removing the images
398
+	 * @param	bool	$readd			is it possible that there are images which aren't really changed
399
+	 */
400 400
 	public function handle_counter($image_id_ary, $add, $readd = false)
401 401
 	{
402 402
 		if (empty($image_id_ary))
@@ -467,11 +467,11 @@  discard block
 block discarded – undo
467 467
 	}
468 468
 
469 469
 	/**
470
-	* Approve image
471
-	* @param (array)	$image_id_ary	The image ID array to be approved
472
-	* @param (int)		$album_id	The album image is approved to (just save some queries for log)
473
-	* return 0 on success
474
-	*/
470
+	 * Approve image
471
+	 * @param (array)	$image_id_ary	The image ID array to be approved
472
+	 * @param (int)		$album_id	The album image is approved to (just save some queries for log)
473
+	 * return 0 on success
474
+	 */
475 475
 	public function approve_images($image_id_ary, $album_id)
476 476
 	{
477 477
 		$sql = 'SELECT image_id, image_name, image_user_id
@@ -507,10 +507,10 @@  discard block
 block discarded – undo
507 507
 	}
508 508
 
509 509
 	/**
510
-	* UnApprove image
511
-	* @param (array)	$image_id_ary	The image ID array to be unapproved
512
-	* @param (int)		$album_id	The album image is approved to (just save some queries for log)
513
-	*/
510
+	 * UnApprove image
511
+	 * @param (array)	$image_id_ary	The image ID array to be unapproved
512
+	 * @param (int)		$album_id	The album image is approved to (just save some queries for log)
513
+	 */
514 514
 	public function unapprove_images($image_id_ary, $album_id)
515 515
 	{
516 516
 		self::handle_counter($image_id_ary, false);
@@ -563,10 +563,10 @@  discard block
 block discarded – undo
563 563
 	}
564 564
 
565 565
 	/**
566
-	* Lock images
567
-	* @param (array)	$image_id_ary	Array of images we want to lock
568
-	* @param (int)		$album_id		Album id, so we can log the action
569
-	*/
566
+	 * Lock images
567
+	 * @param (array)	$image_id_ary	Array of images we want to lock
568
+	 * @param (int)		$album_id		Album id, so we can log the action
569
+	 */
570 570
 	public function lock_images($image_id_ary, $album_id)
571 571
 	{
572 572
 		self::handle_counter($image_id_ary, false);
@@ -590,9 +590,9 @@  discard block
 block discarded – undo
590 590
 	}
591 591
 
592 592
 	/**
593
-	* Get last image id
594
-	* Return (int) image_id
595
-	**/
593
+	 * Get last image id
594
+	 * Return (int) image_id
595
+	 **/
596 596
 	public function get_last_image()
597 597
 	{
598 598
 		$this->gallery_auth->load_user_permissions($this->user->data['user_id']);
Please login to merge, or discard this patch.
core/cache.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
 	protected $table_images;
20 20
 
21 21
 	/**
22
-	* cache constructor.
23
-	* @param \phpbb\cache\service $cache
24
-	* @param \phpbb\db\driver\driver_interface $db
25
-	* @param $albums_table
26
-	* @param $images_table
27
-	*/
22
+	 * cache constructor.
23
+	 * @param \phpbb\cache\service $cache
24
+	 * @param \phpbb\db\driver\driver_interface $db
25
+	 * @param $albums_table
26
+	 * @param $images_table
27
+	 */
28 28
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db,
29 29
 								$albums_table, $images_table)
30 30
 	{
@@ -155,18 +155,18 @@  discard block
 block discarded – undo
155 155
 	}
156 156
 
157 157
 	/**
158
-	* Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
159
-	*/
158
+	 * Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache
159
+	 */
160 160
 	public function destroy_images()
161 161
 	{
162 162
 		$this->phpbb_cache->destroy('_images');
163 163
 	}
164 164
 
165 165
 	/**
166
-	* Destroy album cache
167
-	* Basically some tests fail due album cache not destroyed ...
168
-	* So lets try it now?
169
-	*/
166
+	 * Destroy album cache
167
+	 * Basically some tests fail due album cache not destroyed ...
168
+	 * So lets try it now?
169
+	 */
170 170
 	public function destroy_albums()
171 171
 	{
172 172
 		$this->phpbb_cache->destroy('_albums');
Please login to merge, or discard this patch.
core/acp/albums_module.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -138,13 +138,13 @@  discard block
 block discarded – undo
138 138
 					);
139 139
 
140 140
 					/**
141
-					* Event to send requested data
142
-					* @event phpbbgallery.core.acp.albums.request_data
143
-					* @var	string	action		Action we are taking
144
-					* @var	int		album_id	Album we are doing it to
145
-					* @var	array	album_data	Album data for the album
146
-					* @since 1.2.0
147
-					*/
141
+					 * Event to send requested data
142
+					 * @event phpbbgallery.core.acp.albums.request_data
143
+					 * @var	string	action		Action we are taking
144
+					 * @var	int		album_id	Album we are doing it to
145
+					 * @var	array	album_data	Album data for the album
146
+					 * @since 1.2.0
147
+					 */
148 148
 					$vars = array('action', 'album_id', 'album_data');
149 149
 					extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.request_data', compact($vars)));
150 150
 
@@ -387,13 +387,13 @@  discard block
 block discarded – undo
387 387
 						);
388 388
 
389 389
 						/**
390
-						* Event to send default data
391
-						*
392
-						* @event phpbbgallery.core.acp.albums.default_data
393
-						* @var	action	action		Action taken
394
-						* @var	array	album_data	Album data array
395
-						* @since 1.2.0
396
-						*/
390
+						 * Event to send default data
391
+						 *
392
+						 * @event phpbbgallery.core.acp.albums.default_data
393
+						 * @var	action	action		Action taken
394
+						 * @var	array	album_data	Album data array
395
+						 * @since 1.2.0
396
+						 */
397 397
 						$vars = array('action', 'album_data');
398 398
 						extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.default_data', compact($vars)));
399 399
 
@@ -564,13 +564,13 @@  discard block
 block discarded – undo
564 564
 				));
565 565
 
566 566
 				/**
567
-				* Event after assigning data to template
568
-				*
569
-				* @event phpbbgallery.core.acp.albums.send_to_template
570
-				* @var	action	action		Action taken
571
-				* @var	array	album_data	Album data array
572
-				* @since 1.2.0
573
-				*/
567
+				 * Event after assigning data to template
568
+				 *
569
+				 * @event phpbbgallery.core.acp.albums.send_to_template
570
+				 * @var	action	action		Action taken
571
+				 * @var	array	album_data	Album data array
572
+				 * @since 1.2.0
573
+				 */
574 574
 				$vars = array('action', 'album_data');
575 575
 				extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.acp.albums.send_to_template', compact($vars)));
576 576
 
Please login to merge, or discard this patch.
exif/event/exif_listener.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -54,16 +54,16 @@
 block discarded – undo
54 54
 	}
55 55
 
56 56
 	/**
57
-	* Constructor
58
-	* NOTE: The parameters of this method must match in order and type with
59
-	* the dependencies defined in the services.yml file for this service.
60
-	*
61
-	* @param \phpbb\user					$user			User object
62
-	* @param \phpbbgallery\core\config		$gallery_config	Core gallery config object
63
-	* @param \phpbbgallery\core\auth\auth	$gallery_auth	Core gallery auth object
64
-	* @param \phpbbgallery\core\url			$gallery_url	Core gallery url object
65
-	* @param \phpbbgallery\core\user		$gallery_user	Core gallery user wrapper
66
-	*/
57
+	 * Constructor
58
+	 * NOTE: The parameters of this method must match in order and type with
59
+	 * the dependencies defined in the services.yml file for this service.
60
+	 *
61
+	 * @param \phpbb\user					$user			User object
62
+	 * @param \phpbbgallery\core\config		$gallery_config	Core gallery config object
63
+	 * @param \phpbbgallery\core\auth\auth	$gallery_auth	Core gallery auth object
64
+	 * @param \phpbbgallery\core\url			$gallery_url	Core gallery url object
65
+	 * @param \phpbbgallery\core\user		$gallery_user	Core gallery user wrapper
66
+	 */
67 67
 
68 68
 	public function __construct(\phpbb\user $user, \phpbbgallery\core\config $gallery_config, \phpbbgallery\core\auth\auth $gallery_auth, \phpbbgallery\core\url $gallery_url, \phpbbgallery\core\user $gallery_user)
69 69
 	{
Please login to merge, or discard this patch.
core/language/de/gallery_ucp.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@
 block discarded – undo
11 11
  */
12 12
 
13 13
  /**
14
- * DO NOT CHANGE
15
- */
14
+  * DO NOT CHANGE
15
+  */
16 16
 if (!defined('IN_PHPBB'))
17 17
 {
18 18
 	exit;
Please login to merge, or discard this patch.
core/ext.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -24,11 +24,11 @@  discard block
 block discarded – undo
24 24
 	];
25 25
 
26 26
 	/**
27
-	* Single enable step that installs any included migrations
28
-	*
29
-	* @param mixed $old_state State returned by previous call of this method
30
-	* @return mixed Returns false after last step, otherwise temporary state
31
-	*/
27
+	 * Single enable step that installs any included migrations
28
+	 *
29
+	 * @param mixed $old_state State returned by previous call of this method
30
+	 * @return mixed Returns false after last step, otherwise temporary state
31
+	 */
32 32
 	function enable_step($old_state)
33 33
 	{
34 34
 		switch ($old_state)
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	/**
65
-	* Single disable step that does nothing
66
-	*
67
-	* @param mixed $old_state State returned by previous call of this method
68
-	* @return mixed Returns false after last step, otherwise temporary state
69
-	*/
65
+	 * Single disable step that does nothing
66
+	 *
67
+	 * @param mixed $old_state State returned by previous call of this method
68
+	 * @return mixed Returns false after last step, otherwise temporary state
69
+	 */
70 70
 	function disable_step($old_state)
71 71
 	{
72 72
 		switch ($old_state)
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
 	}
98 98
 
99 99
 	/**
100
-	* Single purge step that reverts any included and installed migrations
101
-	*
102
-	* @param mixed $old_state State returned by previous call of this method
103
-	* @return mixed Returns false after last step, otherwise temporary state
104
-	*/
100
+	 * Single purge step that reverts any included and installed migrations
101
+	 *
102
+	 * @param mixed $old_state State returned by previous call of this method
103
+	 * @return mixed Returns false after last step, otherwise temporary state
104
+	 */
105 105
 	function purge_step($old_state)
106 106
 	{
107 107
 		$extensions = $this->container->get('ext.manager');
@@ -124,10 +124,10 @@  discard block
 block discarded – undo
124 124
 		{
125 125
 			case '': // Empty means nothing has run yet
126 126
 				/**
127
-				* @todo Remove this try/catch condition once purge_notifications is fixed
128
-				* in the core to work with disabled extensions without fatal errors.
129
-				* https://tracker.phpbb.com/browse/PHPBB3-12435
130
-				*/
127
+				 * @todo Remove this try/catch condition once purge_notifications is fixed
128
+				 * in the core to work with disabled extensions without fatal errors.
129
+				 * https://tracker.phpbb.com/browse/PHPBB3-12435
130
+				 */
131 131
 				try
132 132
 				{
133 133
 					// Purge board rules notifications
Please login to merge, or discard this patch.
acpimport/ext.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -48,11 +48,11 @@
 block discarded – undo
48 48
 	}
49 49
 
50 50
 	/**
51
-	* Perform additional tasks on extension enable
52
-	*
53
-	* @param mixed $old_state State returned by previous call of this method
54
-	* @return mixed Returns false after last step, otherwise temporary state
55
-	*/
51
+	 * Perform additional tasks on extension enable
52
+	 *
53
+	 * @param mixed $old_state State returned by previous call of this method
54
+	 * @return mixed Returns false after last step, otherwise temporary state
55
+	 */
56 56
 	public function enable_step($old_state)
57 57
 	{
58 58
 		if (empty($old_state))
Please login to merge, or discard this patch.
acpimport/language/en/info_acp_gallery_import.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
  * @author    Leinad4Mind
9 9
  * @copyright 2007-2012 nickvergessen, 2014- satanasov, 2018- Leinad4Mind
10 10
  * @license   GPL-2.0-only
11
-  */
11
+ */
12 12
 
13 13
 /**
14 14
 * DO NOT CHANGE
Please login to merge, or discard this patch.