Passed
Push — master ( 45da19...9278c7 )
by Stanislav
41:52 queued 26:52
created
core/url.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -22,28 +22,28 @@  discard block
 block discarded – undo
22 22
 	private $config;
23 23
 
24 24
 	/**
25
-	* Path from the gallery root, back to phpbb's root
26
-	*/
25
+	 * Path from the gallery root, back to phpbb's root
26
+	 */
27 27
 	private $phpbb_root_path = '../';
28 28
 
29 29
 	/**
30
-	* Path from the phpbb root, into admin's root
31
-	*/
30
+	 * Path from the phpbb root, into admin's root
31
+	 */
32 32
 	private $phpbb_admin_path = 'adm/';
33 33
 
34 34
 	/**
35
-	* Path from the phpbb root, into gallery's file root
36
-	*/
35
+	 * Path from the phpbb root, into gallery's file root
36
+	 */
37 37
 	private $phpbb_gallery_file_path = 'files/phpbbgallery/';
38 38
 
39 39
 	/**
40
-	* Path from the phpbb root, into gallery's root
41
-	*/
40
+	 * Path from the phpbb root, into gallery's root
41
+	 */
42 42
 	private $phpbb_gallery_path = 'gallery/';
43 43
 
44 44
 	/**
45
-	* PHP file extension (e.g. .php)
46
-	*/
45
+	 * PHP file extension (e.g. .php)
46
+	 */
47 47
 	private $php_ext;
48 48
 
49 49
 	const IMAGE_PATH = 'images/';
@@ -237,16 +237,16 @@  discard block
 block discarded – undo
237 237
 	}
238 238
 
239 239
 	/**
240
-	* Creates beautiful relative path from ugly relative path
241
-	* Resolves .. (up directory)
242
-	*
243
-	* @author	bantu		based on phpbb_own_realpath() by Chris Smith
244
-	* @license	http://opensource.org/licenses/gpl-license.php GNU Public License
245
-	*
246
-	* @param	string		ugly path e.g. "../community/../gallery/"
247
-	* @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
248
-	* @return	string		beautiful path e.g. "../gallery/"
249
-	*/
240
+	 * Creates beautiful relative path from ugly relative path
241
+	 * Resolves .. (up directory)
242
+	 *
243
+	 * @author	bantu		based on phpbb_own_realpath() by Chris Smith
244
+	 * @license	http://opensource.org/licenses/gpl-license.php GNU Public License
245
+	 *
246
+	 * @param	string		ugly path e.g. "../community/../gallery/"
247
+	 * @param	bool		is it a full url, so we need to fix teh http:// at the beginning?
248
+	 * @return	string		beautiful path e.g. "../gallery/"
249
+	 */
250 250
 	static public function beautiful_path($path, $is_full_url = false)
251 251
 	{
252 252
 		// Remove any repeated slashes
@@ -288,10 +288,10 @@  discard block
 block discarded – undo
288 288
 	}
289 289
 
290 290
 	/**
291
-	* Custom meta_refresh implementation
292
-	* @param	int		$time	Time in seconds.
293
-	* @param	string	$route	Route generated by $helper->route
294
-	*/
291
+	 * Custom meta_refresh implementation
292
+	 * @param	int		$time	Time in seconds.
293
+	 * @param	string	$route	Route generated by $helper->route
294
+	 */
295 295
 	public function meta_refresh($time, $route)
296 296
 	{
297 297
 		// For XHTML compatibility we change back & to &
Please login to merge, or discard this patch.
core/upload.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -13,94 +13,94 @@  discard block
 block discarded – undo
13 13
 class upload
14 14
 {
15 15
 	/**
16
-	* @var \phpbb\user
17
-	*/
16
+	 * @var \phpbb\user
17
+	 */
18 18
 	protected $user;
19 19
 
20 20
 	/**
21
-	* @var \phpbb\language\language
22
-	*/
21
+	 * @var \phpbb\language\language
22
+	 */
23 23
 	protected $language;
24 24
 
25 25
 	/**
26
-	* @var \phpbb\db\driver\driver_interface
27
-	*/
26
+	 * @var \phpbb\db\driver\driver_interface
27
+	 */
28 28
 	protected $db;
29 29
 
30 30
 	/**
31
-	* @var \phpbb\event\dispatcher_interface
32
-	*/
31
+	 * @var \phpbb\event\dispatcher_interface
32
+	 */
33 33
 	protected $phpbb_dispatcher;
34 34
 
35 35
 	/**
36
-	* @var \phpbb\request\request
37
-	*/
36
+	 * @var \phpbb\request\request
37
+	 */
38 38
 	protected $request;
39 39
 
40 40
 	/**
41
-	* @var \phpbb\files\upload
42
-	*/
41
+	 * @var \phpbb\files\upload
42
+	 */
43 43
 	protected $file_upload;
44 44
 
45 45
 	/**
46
-	* @var \phpbbgallery\core\image\image
47
-	*/
46
+	 * @var \phpbbgallery\core\image\image
47
+	 */
48 48
 	protected $gallery_image;
49 49
 
50 50
 	/**
51
-	* @var \phpbbgallery\core\config
52
-	*/
51
+	 * @var \phpbbgallery\core\config
52
+	 */
53 53
 	protected $gallery_config;
54 54
 
55 55
 	/**
56
-	* @var \phpbbgallery\core\url
57
-	*/
56
+	 * @var \phpbbgallery\core\url
57
+	 */
58 58
 	protected $gallery_url;
59 59
 
60 60
 	/**
61
-	* @var \phpbbgallery\core\block
62
-	*/
61
+	 * @var \phpbbgallery\core\block
62
+	 */
63 63
 	protected $block;
64 64
 
65 65
 	/**
66
-	* @var \phpbbgallery\core\file\file
67
-	*/
66
+	 * @var \phpbbgallery\core\file\file
67
+	 */
68 68
 	protected $tools;
69 69
 
70 70
 	/**
71
-	* @var string
72
-	*/
71
+	 * @var string
72
+	 */
73 73
 	protected $images_table;
74 74
 
75 75
 	/**
76
-	* @var string
77
-	*/
76
+	 * @var string
77
+	 */
78 78
 	protected $root_path;
79 79
 
80 80
 	/**
81
-	* @var string
82
-	*/
81
+	 * @var string
82
+	 */
83 83
 	protected $php_ext;
84 84
 
85 85
 	/**
86
-	* Number of Files per Directory
87
-	*
88
-	* If this constant is set to a value >0 the gallery will create a new directory,
89
-	* when the current directory has more files in it than set here.
90
-	*/
86
+	 * Number of Files per Directory
87
+	 *
88
+	 * If this constant is set to a value >0 the gallery will create a new directory,
89
+	 * when the current directory has more files in it than set here.
90
+	 */
91 91
 	const NUM_FILES_PER_DIR = 0;
92 92
 
93 93
 	/**
94
-	* Objects: phpBB Upload, 2 Files and Image-Functions
95
-	*/
94
+	 * Objects: phpBB Upload, 2 Files and Image-Functions
95
+	 */
96 96
 	private $upload = null;
97 97
 	private $file = null;
98 98
 	private $zip_file = null;
99 99
 	//private $tools = null;
100 100
 
101 101
 	/**
102
-	* Basic variables...
103
-	*/
102
+	 * Basic variables...
103
+	 */
104 104
 	public $loaded_files = 0;
105 105
 	public $uploaded_files = 0;
106 106
 	public $errors = array();
@@ -228,8 +228,8 @@  discard block
 block discarded – undo
228 228
 	}
229 229
 
230 230
 	/**
231
-	* Upload a zip file and save the images into the import/ directory.
232
-	*/
231
+	 * Upload a zip file and save the images into the import/ directory.
232
+	 */
233 233
 	public function upload_zip()
234 234
 	{
235 235
 		if (!class_exists('compress_zip'))
@@ -377,14 +377,14 @@  discard block
 block discarded – undo
377 377
 		$file_link = $this->gallery_url->path('upload') . $this->image_data[$image_id]['image_filename'];
378 378
 
379 379
 		/**
380
-		* Event upload image before
381
-		*
382
-		* @event phpbbgallery.core.upload.update_image_before
383
-		* @var	array	additional_sql_data		array of additional settings
384
-		* @var	array	image_data				array of image_data
385
-		* @var	string	file_link				link to file
386
-		* @since 1.2.0
387
-		*/
380
+		 * Event upload image before
381
+		 *
382
+		 * @event phpbbgallery.core.upload.update_image_before
383
+		 * @var	array	additional_sql_data		array of additional settings
384
+		 * @var	array	image_data				array of image_data
385
+		 * @var	string	file_link				link to file
386
+		 * @since 1.2.0
387
+		 */
388 388
 		$vars = array('additional_sql_data', 'image_data', 'file_link');
389 389
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.update_image_before', compact($vars)));
390 390
 
@@ -392,12 +392,12 @@  discard block
 block discarded – undo
392 392
 		if (!$this->prepare_file_update($image_id))
393 393
 		{
394 394
 			/**
395
-			* Event upload image update
396
-			*
397
-			* @event phpbbgallery.core.upload.update_image_nofilechange
398
-			* @var	array	additional_sql_data		array of additional settings
399
-			* @since 1.2.0
400
-			*/
395
+			 * Event upload image update
396
+			 *
397
+			 * @event phpbbgallery.core.upload.update_image_nofilechange
398
+			 * @var	array	additional_sql_data		array of additional settings
399
+			 * @since 1.2.0
400
+			 */
401 401
 			$vars = array('additional_sql_data');
402 402
 			extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.update_image_nofilechange', compact($vars)));
403 403
 		}
@@ -415,8 +415,8 @@  discard block
 block discarded – undo
415 415
 	}
416 416
 
417 417
 	/**
418
-	* Prepare file on upload: rotate and resize
419
-	*/
418
+	 * Prepare file on upload: rotate and resize
419
+	 */
420 420
 	public function prepare_file()
421 421
 	{
422 422
 		$upload_dir = $this->get_current_upload_dir();
@@ -446,13 +446,13 @@  discard block
 block discarded – undo
446 446
 		$file = $this->file;
447 447
 
448 448
 		/**
449
-		* Event upload image update
450
-		*
451
-		* @event phpbbgallery.core.upload.prepare_file_before
452
-		* @var	array	additional_sql_data		array of additional settings
453
-		* @var	array	file					File object
454
-		* @since 1.2.0
455
-		*/
449
+		 * Event upload image update
450
+		 *
451
+		 * @event phpbbgallery.core.upload.prepare_file_before
452
+		 * @var	array	additional_sql_data		array of additional settings
453
+		 * @var	array	file					File object
454
+		 * @since 1.2.0
455
+		 */
456 456
 		$vars = array('additional_sql_data', 'file');
457 457
 		extract($this->phpbb_dispatcher->trigger_event('phpbbgallery.core.upload.prepare_file_before', compact($vars)));
458 458
 
@@ -804,8 +804,8 @@  discard block
 block discarded – undo
804 804
 	}
805 805
 
806 806
 	/**
807
-	* Generate some kind of check so users only complete the uplaod for their images
808
-	*/
807
+	 * Generate some kind of check so users only complete the uplaod for their images
808
+	 */
809 809
 	public function generate_hidden_fields()
810 810
 	{
811 811
 		$checks = array();
Please login to merge, or discard this patch.
core/auth/auth.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -41,57 +41,57 @@  discard block
 block discarded – undo
41 41
 	protected $acl_cache = array();
42 42
 
43 43
 	/**
44
-	* Cache object
45
-	* @var \phpbbgallery\core\cache
46
-	*/
44
+	 * Cache object
45
+	 * @var \phpbbgallery\core\cache
46
+	 */
47 47
 	protected $cache;
48 48
 
49 49
 	/**
50
-	* Database object
51
-	* @var \phpbb\db\driver\driver
52
-	*/
50
+	 * Database object
51
+	 * @var \phpbb\db\driver\driver
52
+	 */
53 53
 	protected $db;
54 54
 
55 55
 	/**
56
-	* Gallery user object
57
-	* @var \phpbbgallery\core\user
58
-	*/
56
+	 * Gallery user object
57
+	 * @var \phpbbgallery\core\user
58
+	 */
59 59
 	protected $user;
60 60
 
61 61
 	/**
62
-	* phpBB user object
63
-	* @var \phpbb\user
64
-	*/
62
+	 * phpBB user object
63
+	 * @var \phpbb\user
64
+	 */
65 65
 	protected $phpbb_user;
66 66
 
67 67
 	/**
68
-	* phpBB auth object
69
-	* @var \phpbb\auth\auth
70
-	*/
68
+	 * phpBB auth object
69
+	 * @var \phpbb\auth\auth
70
+	 */
71 71
 	protected $auth;
72 72
 
73 73
 	/**
74
-	* Gallery permissions table
75
-	* @var string
76
-	*/
74
+	 * Gallery permissions table
75
+	 * @var string
76
+	 */
77 77
 	protected $table_permissions;
78 78
 
79 79
 	/**
80
-	* Gallery permission roles table
81
-	* @var string
82
-	*/
80
+	 * Gallery permission roles table
81
+	 * @var string
82
+	 */
83 83
 	protected $table_roles;
84 84
 
85 85
 	/**
86
-	* Gallery users table
87
-	* @var string
88
-	*/
86
+	 * Gallery users table
87
+	 * @var string
88
+	 */
89 89
 	protected $table_users;
90 90
 
91 91
 	/**
92
-	* Gallery albums table
93
-	* @var string
94
-	*/
92
+	 * Gallery albums table
93
+	 * @var string
94
+	 */
95 95
 	protected $table_albums;
96 96
 
97 97
 	/**
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
 	}
340 340
 
341 341
 	/**
342
-	* Merge the NEVER-options into the YES-options by removing the YES, if it is set.
343
-	*/
342
+	 * Merge the NEVER-options into the YES-options by removing the YES, if it is set.
343
+	 */
344 344
 	protected function merge_acl_row()
345 345
 	{
346 346
 		foreach ($this->_auth_data as $album_id => $obj)
@@ -585,14 +585,14 @@  discard block
 block discarded – undo
585 585
 	}
586 586
 
587 587
 	/**
588
-	* Get permission
589
-	*
590
-	* @param	string	$acl	One of the permissions, Exp: i_view
591
-	* @param	int		$a_id	The album_id, from which we want to have the permissions
592
-	* @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
593
-	*
594
-	* @return	bool			Is the user allowed to do the $acl?
595
-	*/
588
+	 * Get permission
589
+	 *
590
+	 * @param	string	$acl	One of the permissions, Exp: i_view
591
+	 * @param	int		$a_id	The album_id, from which we want to have the permissions
592
+	 * @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
593
+	 *
594
+	 * @return	bool			Is the user allowed to do the $acl?
595
+	 */
596 596
 	public function acl_check($acl, $a_id, $u_id = -1)
597 597
 	{
598 598
 		$bit = self::$_permissions_flipped[$acl];
@@ -655,12 +655,12 @@  discard block
 block discarded – undo
655 655
 	}
656 656
 
657 657
 	/**
658
-	* Does the user have the permission for any album?
659
-	*
660
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
661
-	*
662
-	* @return	bool			Is the user allowed to do the $acl?
663
-	*/
658
+	 * Does the user have the permission for any album?
659
+	 *
660
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
661
+	 *
662
+	 * @return	bool			Is the user allowed to do the $acl?
663
+	 */
664 664
 	public function acl_check_global($acl)
665 665
 	{
666 666
 		$bit = self::$_permissions_flipped[$acl];
@@ -692,16 +692,16 @@  discard block
 block discarded – undo
692 692
 	}
693 693
 
694 694
 	/**
695
-	* Get albums by permission
696
-	*
697
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
698
-	* @param	string	$return			Type of the return value. array returns an array, else it's a string.
699
-	*									bool means it only checks whether the user has the permission anywhere.
700
-	* @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
701
-	* @param	bool	$display_pegas	Include personal galleries in the list.
702
-	*
703
-	* @return	mixed					$album_ids, either as list or array.
704
-	*/
695
+	 * Get albums by permission
696
+	 *
697
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
698
+	 * @param	string	$return			Type of the return value. array returns an array, else it's a string.
699
+	 *									bool means it only checks whether the user has the permission anywhere.
700
+	 * @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
701
+	 * @param	bool	$display_pegas	Include personal galleries in the list.
702
+	 *
703
+	 * @return	mixed					$album_ids, either as list or array.
704
+	 */
705 705
 	public function acl_album_ids($acl, $return = 'array', $display_in_rrc = false, $display_pegas = true)
706 706
 	{
707 707
 		$bit = self::$_permissions_flipped[$acl];
Please login to merge, or discard this patch.
core/album/manage.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -817,8 +817,8 @@  discard block
 block discarded – undo
817 817
 		$log_action = implode('_', array($log_action_images, $log_action_albums));
818 818
 
819 819
 		/**
820
-		* Log what we did
821
-		*/
820
+		 * Log what we did
821
+		 */
822 822
 		switch ($log_action)
823 823
 		{
824 824
 			case 'MOVE_IMAGES_MOVE_ALBUMS':
@@ -908,14 +908,14 @@  discard block
 block discarded – undo
908 908
 		$this->gallery_notification->delete_albums($from_id);
909 909
 
910 910
 		/**
911
-		* Event related to moving album content
912
-		*
913
-		* @event phpbbgallery.core.album.manage.move_album_content
914
-		* @var	int	from_id		Album we are moving from
915
-		* @var	int	to_id		Album we are moving to
916
-		* @var	bool	sync	Should we sync the albums data
917
-		* @since 1.2.0
918
-		*/
911
+		 * Event related to moving album content
912
+		 *
913
+		 * @event phpbbgallery.core.album.manage.move_album_content
914
+		 * @var	int	from_id		Album we are moving from
915
+		 * @var	int	to_id		Album we are moving to
916
+		 * @var	bool	sync	Should we sync the albums data
917
+		 * @since 1.2.0
918
+		 */
919 919
 		$vars = array('from_id', 'to_id', 'sync');
920 920
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.move_album_content', compact($vars)));
921 921
 
@@ -1017,12 +1017,12 @@  discard block
 block discarded – undo
1017 1017
 		$this->gallery_config->set('num_comments', (int) $row['num_comments']);
1018 1018
 
1019 1019
 		/**
1020
-		* Event delete album content
1021
-		*
1022
-		* @event phpbbgallery.core.album.manage.delete_album_content
1023
-		* @var	int	album_id		Album we are deleting
1024
-		* @since 1.2.0
1025
-		*/
1020
+		 * Event delete album content
1021
+		 *
1022
+		 * @event phpbbgallery.core.album.manage.delete_album_content
1023
+		 * @var	int	album_id		Album we are deleting
1024
+		 * @since 1.2.0
1025
+		 */
1026 1026
 		$vars = array('album_id');
1027 1027
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.delete_album_content', compact($vars)));
1028 1028
 
@@ -1045,11 +1045,11 @@  discard block
 block discarded – undo
1045 1045
 	public function move_album_by($album_row, $action = 'move_up', $steps = 1)
1046 1046
 	{
1047 1047
 		/**
1048
-		* Fetch all the siblings between the module's current spot
1049
-		* and where we want to move it to. If there are less than $steps
1050
-		* siblings between the current spot and the target then the
1051
-		* module will move as far as possible
1052
-		*/
1048
+		 * Fetch all the siblings between the module's current spot
1049
+		 * and where we want to move it to. If there are less than $steps
1050
+		 * siblings between the current spot and the target then the
1051
+		 * module will move as far as possible
1052
+		 */
1053 1053
 		$sql = 'SELECT album_id, album_name, left_id, right_id
1054 1054
 			FROM ' . $this->albums_table . ' 
1055 1055
 			WHERE parent_id = ' . (int) $album_row['parent_id'] . '
@@ -1071,12 +1071,12 @@  discard block
 block discarded – undo
1071 1071
 		}
1072 1072
 
1073 1073
 		/**
1074
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
1075
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
1076
-		* and right_id in order to move them up or down.
1077
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
1078
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
1079
-		*/
1074
+		 * $left_id and $right_id define the scope of the nodes that are affected by the move.
1075
+		 * $diff_up and $diff_down are the values to substract or add to each node's left_id
1076
+		 * and right_id in order to move them up or down.
1077
+		 * $move_up_left and $move_up_right define the scope of the nodes that are moving
1078
+		 * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
1079
+		 */
1080 1080
 		if ($action == 'move_up')
1081 1081
 		{
1082 1082
 			$left_id = $target['left_id'];
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 outputed
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 outputed
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/controller/file.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
104 104
 	}
105 105
 
106 106
 	/**
107
-	* Image File Controller
108
-	*	Route: gallery/image/{image_id}/source
109
-	*
110
-	* @param	int		$image_id
111
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
112
-	*/
107
+	 * Image File Controller
108
+	 *	Route: gallery/image/{image_id}/source
109
+	 *
110
+	 * @param	int		$image_id
111
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
112
+	 */
113 113
 	public function source($image_id)
114 114
 	{
115 115
 		$this->auth->load_user_permissions($this->user->data['user_id']);
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	* Image File Controller
164
-	*	Route: gallery/image/{image_id}/medium
165
-	*
166
-	* @param	int		$image_id
167
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
168
-	*/
163
+	 * Image File Controller
164
+	 *	Route: gallery/image/{image_id}/medium
165
+	 *
166
+	 * @param	int		$image_id
167
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
168
+	 */
169 169
 	public function medium($image_id)
170 170
 	{
171 171
 
@@ -195,12 +195,12 @@  discard block
 block discarded – undo
195 195
 	}
196 196
 
197 197
 	/**
198
-	* Image File Controller
199
-	*	Route: gallery/image/{image_id}/mini
200
-	*
201
-	* @param	int		$image_id
202
-	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
203
-	*/
198
+	 * Image File Controller
199
+	 *	Route: gallery/image/{image_id}/mini
200
+	 *
201
+	 * @param	int		$image_id
202
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
203
+	 */
204 204
 	public function mini($image_id)
205 205
 	{
206 206
 		$this->path = $this->path_mini;
@@ -356,11 +356,11 @@  discard block
 block discarded – undo
356 356
 	}
357 357
 
358 358
 	/**
359
-	* Image File Controller
360
-	*	Route: gallery/image/{image_id}/x
361
-	*
362
-	* @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
363
-	*/
359
+	 * Image File Controller
360
+	 *	Route: gallery/image/{image_id}/x
361
+	 *
362
+	 * @return \Symfony\Component\HttpFoundation\BinaryFileResponseResponse A Symfony Response object
363
+	 */
364 364
 	public function display()
365 365
 	{
366 366
 		$this->tool->set_last_modified($this->gallery_user->get_data('user_permissions_changed'));
Please login to merge, or discard this patch.
core/search.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -243,9 +243,9 @@
 block discarded – undo
243 243
 	}
244 244
 
245 245
 	/**
246
-	* Get all recent images the user has access to
247
-	* return (int) $images_count
248
-	*/
246
+	 * Get all recent images the user has access to
247
+	 * return (int) $images_count
248
+	 */
249 249
 	public function recent_count()
250 250
 	{
251 251
 		$this->gallery_auth->load_user_permissions($this->user->data['user_id']);
Please login to merge, or discard this patch.