Completed
Pull Request — master (#16)
by Jakub
07:46
created
controller/admin_controller.php 1 patch
Indentation   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -55,19 +55,19 @@  discard block
 block discarded – undo
55 55
 	protected $errors = array();
56 56
 
57 57
 	/**
58
-	* Constructor
59
-	*
60
-	* @param \phpbb\template\template				$template			Template object
61
-	* @param \phpbb\user							$user				User object
62
-	* @param \phpbb\request\request					$request			Request object
63
-	* @param \phpbb\admanagement\ad\manager			$manager			Advertisement manager object
64
-	* @param \phpbb\admanagement\location\manager	$location_manager	Template location manager object
65
-	* @param \phpbb\log\log							$log				The phpBB log system
66
-	* @param \phpbb\config\db_text					$config_text		Config text object
67
-	* @param \phpbb\cache\driver\driver_interface	$cache				Cache object
68
-	* @param string									$php_ext			PHP extension
69
-	* @param string									$ext_path			Path to this extension
70
-	*/
58
+	 * Constructor
59
+	 *
60
+	 * @param \phpbb\template\template				$template			Template object
61
+	 * @param \phpbb\user							$user				User object
62
+	 * @param \phpbb\request\request					$request			Request object
63
+	 * @param \phpbb\admanagement\ad\manager			$manager			Advertisement manager object
64
+	 * @param \phpbb\admanagement\location\manager	$location_manager	Template location manager object
65
+	 * @param \phpbb\log\log							$log				The phpBB log system
66
+	 * @param \phpbb\config\db_text					$config_text		Config text object
67
+	 * @param \phpbb\cache\driver\driver_interface	$cache				Cache object
68
+	 * @param string									$php_ext			PHP extension
69
+	 * @param string									$ext_path			Path to this extension
70
+	 */
71 71
 	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\request\request $request, \phpbb\admanagement\ad\manager $manager, \phpbb\admanagement\location\manager $location_manager, \phpbb\log\log $log, \phpbb\config\db_text $config_text, \phpbb\cache\driver\driver_interface $cache, $php_ext, $ext_path)
72 72
 	{
73 73
 		$this->template = $template;
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 	}
84 84
 
85 85
 	/**
86
-	* Process user request for manage mode
87
-	*
88
-	* @return void
89
-	*/
86
+	 * Process user request for manage mode
87
+	 *
88
+	 * @return void
89
+	 */
90 90
 	public function mode_manage()
91 91
 	{
92 92
 		$this->setup();
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	}
104 104
 
105 105
 	/**
106
-	* Process user request for settings mode
107
-	*
108
-	* @return void
109
-	*/
106
+	 * Process user request for settings mode
107
+	 *
108
+	 * @return void
109
+	 */
110 110
 	public function mode_settings()
111 111
 	{
112 112
 		$this->setup();
@@ -142,31 +142,31 @@  discard block
 block discarded – undo
142 142
 	}
143 143
 
144 144
 	/**
145
-	* Set page url
146
-	*
147
-	* @param string $u_action Custom form action
148
-	* @return void
149
-	*/
145
+	 * Set page url
146
+	 *
147
+	 * @param string $u_action Custom form action
148
+	 * @return void
149
+	 */
150 150
 	public function set_page_url($u_action)
151 151
 	{
152 152
 		$this->u_action = $u_action;
153 153
 	}
154 154
 
155 155
 	/**
156
-	* Get ACP page title for Ads module
157
-	*
158
-	* @return string	Language string for Ads ACP module
159
-	*/
156
+	 * Get ACP page title for Ads module
157
+	 *
158
+	 * @return string	Language string for Ads ACP module
159
+	 */
160 160
 	public function get_page_title()
161 161
 	{
162 162
 		return $this->user->lang('ACP_ADMANAGEMENT_TITLE');
163 163
 	}
164 164
 
165 165
 	/**
166
-	* Add an advertisement
167
-	*
168
-	* @return void
169
-	*/
166
+	 * Add an advertisement
167
+	 *
168
+	 * @return void
169
+	 */
170 170
 	public function action_add()
171 171
 	{
172 172
 		$preview = $this->request->is_set_post('preview');
@@ -208,10 +208,10 @@  discard block
 block discarded – undo
208 208
 	}
209 209
 
210 210
 	/**
211
-	* Edit an advertisement
212
-	*
213
-	* @return void
214
-	*/
211
+	 * Edit an advertisement
212
+	 *
213
+	 * @return void
214
+	 */
215 215
 	public function action_edit()
216 216
 	{
217 217
 		$ad_id = $this->request->variable('id', 0);
@@ -269,30 +269,30 @@  discard block
 block discarded – undo
269 269
 	}
270 270
 
271 271
 	/**
272
-	* Enable an advertisement
273
-	*
274
-	* @return void
275
-	*/
272
+	 * Enable an advertisement
273
+	 *
274
+	 * @return void
275
+	 */
276 276
 	public function action_enable()
277 277
 	{
278 278
 		$this->ad_enable(true);
279 279
 	}
280 280
 
281 281
 	/**
282
-	* Disable an advertisement
283
-	*
284
-	* @return void
285
-	*/
282
+	 * Disable an advertisement
283
+	 *
284
+	 * @return void
285
+	 */
286 286
 	public function action_disable()
287 287
 	{
288 288
 		$this->ad_enable(false);
289 289
 	}
290 290
 
291 291
 	/**
292
-	* Delete an advertisement
293
-	*
294
-	* @return void
295
-	*/
292
+	 * Delete an advertisement
293
+	 *
294
+	 * @return void
295
+	 */
296 296
 	public function action_delete()
297 297
 	{
298 298
 		$ad_id = $this->request->variable('id', 0);
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
 	}
336 336
 
337 337
 	/**
338
-	* Display the ads
339
-	*
340
-	* @return void
341
-	*/
338
+	 * Display the ads
339
+	 *
340
+	 * @return void
341
+	 */
342 342
 	public function list_ads()
343 343
 	{
344 344
 		foreach ($this->manager->get_all_ads() as $row)
@@ -368,10 +368,10 @@  discard block
 block discarded – undo
368 368
 	}
369 369
 
370 370
 	/**
371
-	* Perform general tasks
372
-	*
373
-	* @return void
374
-	*/
371
+	 * Perform general tasks
372
+	 *
373
+	 * @return void
374
+	 */
375 375
 	protected function setup()
376 376
 	{
377 377
 		$this->user->add_lang_ext('phpbb/admanagement', 'acp');
@@ -380,11 +380,11 @@  discard block
 block discarded – undo
380 380
 	}
381 381
 
382 382
 	/**
383
-	* Enable/disable an advertisement
384
-	*
385
-	* @param	bool	$enable	Enable or disable the advertisement?
386
-	* @return void
387
-	*/
383
+	 * Enable/disable an advertisement
384
+	 *
385
+	 * @param	bool	$enable	Enable or disable the advertisement?
386
+	 * @return void
387
+	 */
388 388
 	protected function ad_enable($enable)
389 389
 	{
390 390
 		$ad_id = $this->request->variable('id', 0);
@@ -415,11 +415,11 @@  discard block
 block discarded – undo
415 415
 	}
416 416
 
417 417
 	/**
418
-	* Get admin form data.
419
-	*
420
-	* @param	string	$form_name	The form name.
421
-	* @return	array	Form data
422
-	*/
418
+	 * Get admin form data.
419
+	 *
420
+	 * @param	string	$form_name	The form name.
421
+	 * @return	array	Form data
422
+	 */
423 423
 	protected function get_form_data($form_name)
424 424
 	{
425 425
 		$data = array(
@@ -470,11 +470,11 @@  discard block
 block discarded – undo
470 470
 	}
471 471
 
472 472
 	/**
473
-	* Assign form data to the template.
474
-	*
475
-	* @param	array	$data	The form data.
476
-	* @return void
477
-	*/
473
+	 * Assign form data to the template.
474
+	 *
475
+	 * @param	array	$data	The form data.
476
+	 * @return void
477
+	 */
478 478
 	protected function assign_form_data($data)
479 479
 	{
480 480
 		$this->template->assign_vars(array(
@@ -489,11 +489,11 @@  discard block
 block discarded – undo
489 489
 		));
490 490
 	}
491 491
 	/**
492
-	* Prepare end date for display
493
-	*
494
-	* @param	mixed	$end_date	End date.
495
-	* @return	string	End date prepared for display.
496
-	*/
492
+	 * Prepare end date for display
493
+	 *
494
+	 * @param	mixed	$end_date	End date.
495
+	 * @return	string	End date prepared for display.
496
+	 */
497 497
 	protected function prepare_end_date($end_date)
498 498
 	{
499 499
 		if (empty($end_date))
@@ -509,11 +509,11 @@  discard block
 block discarded – undo
509 509
 	}
510 510
 
511 511
 	/**
512
-	* Assign template locations data to the template.
513
-	*
514
-	* @param	mixed	$data	The form data or nothing.
515
-	* @return	void
516
-	*/
512
+	 * Assign template locations data to the template.
513
+	 *
514
+	 * @param	mixed	$data	The form data or nothing.
515
+	 * @return	void
516
+	 */
517 517
 	protected function assign_locations($data = false)
518 518
 	{
519 519
 		foreach ($this->location_manager->get_all_locations() as $location_id => $location_data)
@@ -528,43 +528,43 @@  discard block
 block discarded – undo
528 528
 	}
529 529
 
530 530
 	/**
531
-	* Prepare advertisement preview
532
-	*
533
-	* @param	string	$code	Ad code to preview
534
-	* @return	void
535
-	*/
531
+	 * Prepare advertisement preview
532
+	 *
533
+	 * @param	string	$code	Ad code to preview
534
+	 * @return	void
535
+	 */
536 536
 	protected function ad_preview($code)
537 537
 	{
538 538
 		$this->template->assign_var('PREVIEW', htmlspecialchars_decode($code));
539 539
 	}
540 540
 
541 541
 	/**
542
-	* Print success message.
543
-	*
544
-	* It takes arguments in the form of a language key, followed by language substitution values.
545
-	*/
542
+	 * Print success message.
543
+	 *
544
+	 * It takes arguments in the form of a language key, followed by language substitution values.
545
+	 */
546 546
 	protected function success()
547 547
 	{
548 548
 		trigger_error(call_user_func_array(array($this->user, 'lang'), func_get_args()) . adm_back_link($this->u_action));
549 549
 	}
550 550
 
551 551
 	/**
552
-	* Print error message.
553
-	*
554
-	* It takes arguments in the form of a language key, followed by language substitution values.
555
-	*/
552
+	 * Print error message.
553
+	 *
554
+	 * It takes arguments in the form of a language key, followed by language substitution values.
555
+	 */
556 556
 	protected function error()
557 557
 	{
558 558
 		trigger_error(call_user_func_array(array($this->user, 'lang'), func_get_args()) . adm_back_link($this->u_action), E_USER_WARNING);
559 559
 	}
560 560
 
561 561
 	/**
562
-	* Log action
563
-	*
564
-	* @param	string	$action		Performed action in uppercase
565
-	* @param	string	$ad_name	Advertisement name
566
-	* @return	void
567
-	*/
562
+	 * Log action
563
+	 *
564
+	 * @param	string	$action		Performed action in uppercase
565
+	 * @param	string	$ad_name	Advertisement name
566
+	 * @return	void
567
+	 */
568 568
 	protected function log($action, $ad_name)
569 569
 	{
570 570
 		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_ADMANAGEMENT_' . $action . '_LOG', time(), array($ad_name));
Please login to merge, or discard this patch.
ad/manager.php 1 patch
Indentation   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 	protected $ad_locations_table;
23 23
 
24 24
 	/**
25
-	* Constructor
26
-	*
27
-	* @param	\phpbb\db\driver\driver_interface	$db					DB driver interface
28
-	* @param	string								$ads_table			Ads table
29
-	* @param	string								$ad_locations_table	Ad locations table
30
-	*/
25
+	 * Constructor
26
+	 *
27
+	 * @param	\phpbb\db\driver\driver_interface	$db					DB driver interface
28
+	 * @param	string								$ads_table			Ads table
29
+	 * @param	string								$ad_locations_table	Ad locations table
30
+	 */
31 31
 	public function __construct(\phpbb\db\driver\driver_interface $db, $ads_table, $ad_locations_table)
32 32
 	{
33 33
 		$this->db = $db;
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	/**
39
-	* Get specific ad
40
-	*
41
-	* @param	int		$ad_id	Advertisement ID
42
-	* @return	mixed	Array with advertisement data, false if ad doesn't exist
43
-	*/
39
+	 * Get specific ad
40
+	 *
41
+	 * @param	int		$ad_id	Advertisement ID
42
+	 * @return	mixed	Array with advertisement data, false if ad doesn't exist
43
+	 */
44 44
 	public function get_ad($ad_id)
45 45
 	{
46 46
 		$sql = 'SELECT *
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
54 54
 	}
55 55
 
56 56
 	/**
57
-	* Get one ad per every location
58
-	*
59
-	* @param	array	$ad_locations	List of ad locations to fetch ads for
60
-	* @return	array	List of ad codes for each location
61
-	*/
57
+	 * Get one ad per every location
58
+	 *
59
+	 * @param	array	$ad_locations	List of ad locations to fetch ads for
60
+	 * @return	array	List of ad codes for each location
61
+	 */
62 62
 	public function get_ads($ad_locations)
63 63
 	{
64 64
 		$sql = 'SELECT location_id, ad_code
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
 	}
83 83
 
84 84
 	/**
85
-	* Get all advertisements
86
-	*
87
-	* @return	array	List of all ads
88
-	*/
85
+	 * Get all advertisements
86
+	 *
87
+	 * @return	array	List of all ads
88
+	 */
89 89
 	public function get_all_ads()
90 90
 	{
91 91
 		$sql = 'SELECT ad_id, ad_name, ad_enabled, ad_end_date
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 
100 100
 	/**
101
-	* Insert new advertisement to the database
102
-	*
103
-	* @param	array	$data	New ad data
104
-	* @return	int		New advertisement ID
105
-	*/
101
+	 * Insert new advertisement to the database
102
+	 *
103
+	 * @param	array	$data	New ad data
104
+	 * @return	int		New advertisement ID
105
+	 */
106 106
 	public function insert_ad($data)
107 107
 	{
108 108
 		$data = $this->intersect_ad_data($data);
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 	}
115 115
 
116 116
 	/**
117
-	* Update advertisement
118
-	*
119
-	* @param	int		$ad_id	Advertisement ID
120
-	* @param	array	$data	List of data to update in the database
121
-	* @return	int		Number of affected rows. Can be used to determine if any ad has been updated.
122
-	*/
117
+	 * Update advertisement
118
+	 *
119
+	 * @param	int		$ad_id	Advertisement ID
120
+	 * @param	array	$data	List of data to update in the database
121
+	 * @return	int		Number of affected rows. Can be used to determine if any ad has been updated.
122
+	 */
123 123
 	public function update_ad($ad_id, $data)
124 124
 	{
125 125
 		$data = $this->intersect_ad_data($data);
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 	}
134 134
 
135 135
 	/**
136
-	* Delete advertisement
137
-	*
138
-	* @param	int		$ad_id	Advertisement ID
139
-	* @return	int		Number of affected rows. Can be used to determine if any ad has been deleted.
140
-	*/
136
+	 * Delete advertisement
137
+	 *
138
+	 * @param	int		$ad_id	Advertisement ID
139
+	 * @return	int		Number of affected rows. Can be used to determine if any ad has been deleted.
140
+	 */
141 141
 	public function delete_ad($ad_id)
142 142
 	{
143 143
 		$sql = 'DELETE FROM ' . $this->ads_table . '
@@ -148,11 +148,11 @@  discard block
 block discarded – undo
148 148
 	}
149 149
 
150 150
 	/**
151
-	* Get all locations for specified advertisement
152
-	*
153
-	* @param	int		$ad_id	Advertisement ID
154
-	* @return	array	List of template locations for specified ad
155
-	*/
151
+	 * Get all locations for specified advertisement
152
+	 *
153
+	 * @param	int		$ad_id	Advertisement ID
154
+	 * @return	array	List of template locations for specified ad
155
+	 */
156 156
 	public function get_ad_locations($ad_id)
157 157
 	{
158 158
 		$ad_locations = array();
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
171 171
 	}
172 172
 
173 173
 	/**
174
-	* Insert advertisement locations
175
-	*
176
-	* @param	int		$ad_id			Advertisement ID
177
-	* @param	array	$ad_locations	List of template locations for this ad
178
-	* @return	void
179
-	*/
174
+	 * Insert advertisement locations
175
+	 *
176
+	 * @param	int		$ad_id			Advertisement ID
177
+	 * @param	array	$ad_locations	List of template locations for this ad
178
+	 * @return	void
179
+	 */
180 180
 	public function insert_ad_locations($ad_id, $ad_locations)
181 181
 	{
182 182
 		$sql_ary = array();
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
 	}
192 192
 
193 193
 	/**
194
-	* Delete advertisement locations
195
-	*
196
-	* @param	int		$ad_id	Advertisement ID
197
-	* @return	void
198
-	*/
194
+	 * Delete advertisement locations
195
+	 *
196
+	 * @param	int		$ad_id	Advertisement ID
197
+	 * @return	void
198
+	 */
199 199
 	public function delete_ad_locations($ad_id)
200 200
 	{
201 201
 		$sql = 'DELETE FROM ' . $this->ad_locations_table . '
@@ -204,11 +204,11 @@  discard block
 block discarded – undo
204 204
 	}
205 205
 
206 206
 	/**
207
-	* Load memberships of the user
208
-	*
209
-	* @param	int		$user_id	User ID to load memberships
210
-	* @return	array	List of group IDs user is member of
211
-	*/
207
+	 * Load memberships of the user
208
+	 *
209
+	 * @param	int		$user_id	User ID to load memberships
210
+	 * @return	array	List of group IDs user is member of
211
+	 */
212 212
 	public function load_memberships($user_id)
213 213
 	{
214 214
 		$memberships = array();
@@ -226,10 +226,10 @@  discard block
 block discarded – undo
226 226
 	}
227 227
 
228 228
 	/**
229
-	* Load all board groups
230
-	*
231
-	* @return	array	List of groups
232
-	*/
229
+	 * Load all board groups
230
+	 *
231
+	 * @return	array	List of groups
232
+	 */
233 233
 	public function load_groups()
234 234
 	{
235 235
 		$sql = 'SELECT group_id, group_name
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
 	}
243 243
 
244 244
 	/**
245
-	* Make sure only necessary data make their way to SQL query
246
-	*
247
-	* @param	array	$data	List of data to query the database
248
-	* @return	array	Cleaned data that contain only valid keys
249
-	*/
245
+	 * Make sure only necessary data make their way to SQL query
246
+	 *
247
+	 * @param	array	$data	List of data to query the database
248
+	 * @return	array	Cleaned data that contain only valid keys
249
+	 */
250 250
 	protected function intersect_ad_data($data)
251 251
 	{
252 252
 		return array_intersect_key($data, array(
@@ -259,10 +259,10 @@  discard block
 block discarded – undo
259 259
 	}
260 260
 
261 261
 	/**
262
-	* Get the random statement for this database layer
263
-	*
264
-	* @return	string	Random statement for current database layer
265
-	*/
262
+	 * Get the random statement for this database layer
263
+	 *
264
+	 * @return	string	Random statement for current database layer
265
+	 */
266 266
 	protected function sql_random()
267 267
 	{
268 268
 		switch ($this->db->get_sql_layer())
Please login to merge, or discard this patch.
event/main_listener.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 	protected $location_manager;
37 37
 
38 38
 	/**
39
-	* {@inheritdoc}
40
-	*/
39
+	 * {@inheritdoc}
40
+	 */
41 41
 	static public function getSubscribedEvents()
42 42
 	{
43 43
 		return array(
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	/**
49
-	* Constructor
50
-	*
51
-	* @param \phpbb\template\template				$template			Template object
52
-	* @param \phpbb\user							$user				User object
53
-	* @param \phpbb\config\db_text					$config_text		Config text object
54
-	* @param \phpbb\admanagement\ad\manager			$manager			Advertisement manager object
55
-	* @param \phpbb\admanagement\location\manager	$location_manager	Template location manager object
56
-	*/
49
+	 * Constructor
50
+	 *
51
+	 * @param \phpbb\template\template				$template			Template object
52
+	 * @param \phpbb\user							$user				User object
53
+	 * @param \phpbb\config\db_text					$config_text		Config text object
54
+	 * @param \phpbb\admanagement\ad\manager			$manager			Advertisement manager object
55
+	 * @param \phpbb\admanagement\location\manager	$location_manager	Template location manager object
56
+	 */
57 57
 	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\db_text $config_text, \phpbb\admanagement\ad\manager $manager, \phpbb\admanagement\location\manager $location_manager)
58 58
 	{
59 59
 		$this->template = $template;
Please login to merge, or discard this patch.
migrations/v10x/m6_hide_for_group.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
 class m6_hide_for_group extends \phpbb\db\migration\migration
14 14
 {
15 15
 	/**
16
-	* {@inheritDoc}
17
-	*/
16
+	 * {@inheritDoc}
17
+	 */
18 18
 	public function effectively_installed()
19 19
 	{
20 20
 		$text_config = new \phpbb\config\db_text($this->db, $this->table_prefix . 'config_text');
@@ -23,18 +23,18 @@  discard block
 block discarded – undo
23 23
 	}
24 24
 
25 25
 	/**
26
-	* {@inheritDoc}
27
-	*/
26
+	 * {@inheritDoc}
27
+	 */
28 28
 	static public function depends_on()
29 29
 	{
30 30
 		return array('\phpbb\admanagement\migrations\v10x\m5_end_date');
31 31
 	}
32 32
 
33 33
 	/**
34
-	* Add the ACP settings module
35
-	*
36
-	* @return array Array of data update instructions
37
-	*/
34
+	 * Add the ACP settings module
35
+	 *
36
+	 * @return array Array of data update instructions
37
+	 */
38 38
 	public function update_data()
39 39
 	{
40 40
 		return array(
Please login to merge, or discard this patch.