Completed
Pull Request — master (#24)
by Jakub
15:23 queued 13:00
created
location/type/base.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,40 +16,40 @@
 block discarded – undo
16 16
 abstract class base implements \phpbb\ads\location\type\type_interface
17 17
 {
18 18
 	/**
19
-	* User object
20
-	* @var \phpbb\user
21
-	*/
19
+	 * User object
20
+	 * @var \phpbb\user
21
+	 */
22 22
 	protected $user;
23 23
 
24 24
 	/**
25
-	* Construct an after_profile template location object
26
-	*
27
-	* @param	\phpbb\user	$user	User object
28
-	*/
25
+	 * Construct an after_profile template location object
26
+	 *
27
+	 * @param	\phpbb\user	$user	User object
28
+	 */
29 29
 	public function __construct(\phpbb\user $user)
30 30
 	{
31 31
 		$this->user = $user;
32 32
 	}
33 33
 
34 34
 	/**
35
-	* {@inheritDoc}
36
-	*/
35
+	 * {@inheritDoc}
36
+	 */
37 37
 	public function get_name()
38 38
 	{
39 39
 		return $this->user->lang('AD_' . strtoupper($this->get_id()));
40 40
 	}
41 41
 
42 42
 	/**
43
-	* {@inheritDoc}
44
-	*/
43
+	 * {@inheritDoc}
44
+	 */
45 45
 	public function get_desc()
46 46
 	{
47 47
 		return $this->user->lang('AD_' . strtoupper($this->get_id()) . '_DESC');
48 48
 	}
49 49
 
50 50
 	/**
51
-	* {@inheritDoc}
52
-	*/
51
+	 * {@inheritDoc}
52
+	 */
53 53
 	public function will_display()
54 54
 	{
55 55
 		return true;
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\container_aware_migration
14 14
 {
15 15
 	/**
16
-	* {@inheritDoc}
17
-	*/
16
+	 * {@inheritDoc}
17
+	 */
18 18
 	public function effectively_installed()
19 19
 	{
20 20
 		$config_text = $this->container->get('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\ads\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.
migrations/v10x/m2_acp_module.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 m2_acp_module 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
 		$sql = 'SELECT module_id
@@ -29,18 +29,18 @@  discard block
 block discarded – undo
29 29
 	}
30 30
 
31 31
 	/**
32
-	* {@inheritDoc}
33
-	*/
32
+	 * {@inheritDoc}
33
+	 */
34 34
 	static public function depends_on()
35 35
 	{
36 36
 		return array('\phpbb\ads\migrations\v10x\m1_initial_schema');
37 37
 	}
38 38
 
39 39
 	/**
40
-	* Add the ACP module
41
-	*
42
-	* @return array Array of data update instructions
43
-	*/
40
+	 * Add the ACP module
41
+	 *
42
+	 * @return array Array of data update instructions
43
+	 */
44 44
 	public function update_data()
45 45
 	{
46 46
 		return array(
Please login to merge, or discard this patch.
migrations/v10x/m3_template_locations_schema.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -13,30 +13,30 @@  discard block
 block discarded – undo
13 13
 class m3_template_locations_schema 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
 		return $this->db_tools->sql_table_exists($this->table_prefix . 'ad_locations');
21 21
 	}
22 22
 
23 23
 	/**
24
-	* {@inheritDoc}
25
-	*/
24
+	 * {@inheritDoc}
25
+	 */
26 26
 	static public function depends_on()
27 27
 	{
28 28
 		return array('\phpbb\ads\migrations\v10x\m2_acp_module');
29 29
 	}
30 30
 
31 31
 	/**
32
-	* Add the ad_locations table schema to the database:
33
-	*	ad_locations:
34
-	*		ad_id
35
-	*		location_id
36
-	*
37
-	* @return array Array of table schema
38
-	* @access public
39
-	*/
32
+	 * Add the ad_locations table schema to the database:
33
+	 *	ad_locations:
34
+	 *		ad_id
35
+	 *		location_id
36
+	 *
37
+	 * @return array Array of table schema
38
+	 * @access public
39
+	 */
40 40
 	public function update_schema()
41 41
 	{
42 42
 		return array(
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	}
54 54
 
55 55
 	/**
56
-	* Drop the ad_locations table schema from the database
57
-	*
58
-	* @return array Array of table schema
59
-	* @access public
60
-	*/
56
+	 * Drop the ad_locations table schema from the database
57
+	 *
58
+	 * @return array Array of table schema
59
+	 * @access public
60
+	 */
61 61
 	public function revert_schema()
62 62
 	{
63 63
 		return array(
Please login to merge, or discard this patch.
migrations/v10x/m5_end_date.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,27 +13,27 @@  discard block
 block discarded – undo
13 13
 class m5_end_date 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
 		return $this->db_tools->sql_column_exists($this->table_prefix . 'ads', 'ad_end_date');
21 21
 	}
22 22
 
23 23
 	/**
24
-	* {@inheritDoc}
25
-	*/
24
+	 * {@inheritDoc}
25
+	 */
26 26
 	static public function depends_on()
27 27
 	{
28 28
 		return array('\phpbb\ads\migrations\v10x\m4_indexes');
29 29
 	}
30 30
 
31 31
 	/**
32
-	* Add the end date to ads table
33
-	*
34
-	* @return array Array of table schema
35
-	* @access public
36
-	*/
32
+	 * Add the end date to ads table
33
+	 *
34
+	 * @return array Array of table schema
35
+	 * @access public
36
+	 */
37 37
 	public function update_schema()
38 38
 	{
39 39
 		return array(
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	/**
49
-	* Drop the end date from ads table
50
-	*
51
-	* @return array Array of table schema
52
-	* @access public
53
-	*/
49
+	 * Drop the end date from ads table
50
+	 *
51
+	 * @return array Array of table schema
52
+	 * @access public
53
+	 */
54 54
 	public function revert_schema()
55 55
 	{
56 56
 		return array(
Please login to merge, or discard this patch.
migrations/v10x/m4_indexes.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,27 +13,27 @@  discard block
 block discarded – undo
13 13
 class m4_indexes 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
 		return $this->db_tools->sql_index_exists($this->table_prefix . 'ads', 'ad_enabled');
21 21
 	}
22 22
 
23 23
 	/**
24
-	* {@inheritDoc}
25
-	*/
24
+	 * {@inheritDoc}
25
+	 */
26 26
 	static public function depends_on()
27 27
 	{
28 28
 		return array('\phpbb\ads\migrations\v10x\m3_template_locations_schema');
29 29
 	}
30 30
 
31 31
 	/**
32
-	* Add the indexes
33
-	*
34
-	* @return array Array of altered table schema
35
-	* @access public
36
-	*/
32
+	 * Add the indexes
33
+	 *
34
+	 * @return array Array of altered table schema
35
+	 * @access public
36
+	 */
37 37
 	public function update_schema()
38 38
 	{
39 39
 		return array(
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	/**
52
-	* Drop the indexes
53
-	*
54
-	* @return array Array of altered table schema
55
-	* @access public
56
-	*/
52
+	 * Drop the indexes
53
+	 *
54
+	 * @return array Array of altered table schema
55
+	 * @access public
56
+	 */
57 57
 	public function revert_schema()
58 58
 	{
59 59
 		return array(
Please login to merge, or discard this patch.
controller/admin_controller.php 1 patch
Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -52,18 +52,18 @@  discard block
 block discarded – undo
52 52
 	protected $errors = array();
53 53
 
54 54
 	/**
55
-	* Constructor
56
-	*
57
-	* @param \phpbb\template\template				$template			Template object
58
-	* @param \phpbb\user							$user				User object
59
-	* @param \phpbb\request\request					$request			Request object
60
-	* @param \phpbb\ads\ad\manager			$manager			Advertisement manager object
61
-	* @param \phpbb\ads\location\manager	$location_manager	Template location manager object
62
-	* @param \phpbb\log\log							$log				The phpBB log system
63
-	* @param \phpbb\config\db_text					$config_text		Config text object
64
-	* @param string									$php_ext			PHP extension
65
-	* @param string									$ext_path			Path to this extension
66
-	*/
55
+	 * Constructor
56
+	 *
57
+	 * @param \phpbb\template\template				$template			Template object
58
+	 * @param \phpbb\user							$user				User object
59
+	 * @param \phpbb\request\request					$request			Request object
60
+	 * @param \phpbb\ads\ad\manager			$manager			Advertisement manager object
61
+	 * @param \phpbb\ads\location\manager	$location_manager	Template location manager object
62
+	 * @param \phpbb\log\log							$log				The phpBB log system
63
+	 * @param \phpbb\config\db_text					$config_text		Config text object
64
+	 * @param string									$php_ext			PHP extension
65
+	 * @param string									$ext_path			Path to this extension
66
+	 */
67 67
 	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\request\request $request, \phpbb\ads\ad\manager $manager, \phpbb\ads\location\manager $location_manager, \phpbb\log\log $log, \phpbb\config\db_text $config_text, $php_ext, $ext_path)
68 68
 	{
69 69
 		$this->template = $template;
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 	}
79 79
 
80 80
 	/**
81
-	* Process user request for manage mode
82
-	*
83
-	* @return void
84
-	*/
81
+	 * Process user request for manage mode
82
+	 *
83
+	 * @return void
84
+	 */
85 85
 	public function mode_manage()
86 86
 	{
87 87
 		$this->setup();
@@ -98,10 +98,10 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 
100 100
 	/**
101
-	* Process user request for settings mode
102
-	*
103
-	* @return void
104
-	*/
101
+	 * Process user request for settings mode
102
+	 *
103
+	 * @return void
104
+	 */
105 105
 	public function mode_settings()
106 106
 	{
107 107
 		$this->setup();
@@ -143,31 +143,31 @@  discard block
 block discarded – undo
143 143
 	}
144 144
 
145 145
 	/**
146
-	* Set page url
147
-	*
148
-	* @param string $u_action Custom form action
149
-	* @return void
150
-	*/
146
+	 * Set page url
147
+	 *
148
+	 * @param string $u_action Custom form action
149
+	 * @return void
150
+	 */
151 151
 	public function set_page_url($u_action)
152 152
 	{
153 153
 		$this->u_action = $u_action;
154 154
 	}
155 155
 
156 156
 	/**
157
-	* Get ACP page title for Ads module
158
-	*
159
-	* @return string	Language string for Ads ACP module
160
-	*/
157
+	 * Get ACP page title for Ads module
158
+	 *
159
+	 * @return string	Language string for Ads ACP module
160
+	 */
161 161
 	public function get_page_title()
162 162
 	{
163 163
 		return $this->user->lang('ACP_ADMANAGEMENT_TITLE');
164 164
 	}
165 165
 
166 166
 	/**
167
-	* Add an advertisement
168
-	*
169
-	* @return void
170
-	*/
167
+	 * Add an advertisement
168
+	 *
169
+	 * @return void
170
+	 */
171 171
 	public function action_add()
172 172
 	{
173 173
 		$preview = $this->request->is_set_post('preview');
@@ -209,10 +209,10 @@  discard block
 block discarded – undo
209 209
 	}
210 210
 
211 211
 	/**
212
-	* Edit an advertisement
213
-	*
214
-	* @return void
215
-	*/
212
+	 * Edit an advertisement
213
+	 *
214
+	 * @return void
215
+	 */
216 216
 	public function action_edit()
217 217
 	{
218 218
 		$ad_id = $this->request->variable('id', 0);
@@ -270,30 +270,30 @@  discard block
 block discarded – undo
270 270
 	}
271 271
 
272 272
 	/**
273
-	* Enable an advertisement
274
-	*
275
-	* @return void
276
-	*/
273
+	 * Enable an advertisement
274
+	 *
275
+	 * @return void
276
+	 */
277 277
 	public function action_enable()
278 278
 	{
279 279
 		$this->ad_enable(true);
280 280
 	}
281 281
 
282 282
 	/**
283
-	* Disable an advertisement
284
-	*
285
-	* @return void
286
-	*/
283
+	 * Disable an advertisement
284
+	 *
285
+	 * @return void
286
+	 */
287 287
 	public function action_disable()
288 288
 	{
289 289
 		$this->ad_enable(false);
290 290
 	}
291 291
 
292 292
 	/**
293
-	* Delete an advertisement
294
-	*
295
-	* @return void
296
-	*/
293
+	 * Delete an advertisement
294
+	 *
295
+	 * @return void
296
+	 */
297 297
 	public function action_delete()
298 298
 	{
299 299
 		$ad_id = $this->request->variable('id', 0);
@@ -336,10 +336,10 @@  discard block
 block discarded – undo
336 336
 	}
337 337
 
338 338
 	/**
339
-	* Display the ads
340
-	*
341
-	* @return void
342
-	*/
339
+	 * Display the ads
340
+	 *
341
+	 * @return void
342
+	 */
343 343
 	public function list_ads()
344 344
 	{
345 345
 		foreach ($this->manager->get_all_ads() as $row)
@@ -369,10 +369,10 @@  discard block
 block discarded – undo
369 369
 	}
370 370
 
371 371
 	/**
372
-	* Perform general tasks
373
-	*
374
-	* @return void
375
-	*/
372
+	 * Perform general tasks
373
+	 *
374
+	 * @return void
375
+	 */
376 376
 	protected function setup()
377 377
 	{
378 378
 		$this->user->add_lang_ext('phpbb/ads', 'acp');
@@ -381,11 +381,11 @@  discard block
 block discarded – undo
381 381
 	}
382 382
 
383 383
 	/**
384
-	* Enable/disable an advertisement
385
-	*
386
-	* @param	bool	$enable	Enable or disable the advertisement?
387
-	* @return void
388
-	*/
384
+	 * Enable/disable an advertisement
385
+	 *
386
+	 * @param	bool	$enable	Enable or disable the advertisement?
387
+	 * @return void
388
+	 */
389 389
 	protected function ad_enable($enable)
390 390
 	{
391 391
 		$ad_id = $this->request->variable('id', 0);
@@ -416,11 +416,11 @@  discard block
 block discarded – undo
416 416
 	}
417 417
 
418 418
 	/**
419
-	* Get admin form data.
420
-	*
421
-	* @param	string	$form_name	The form name.
422
-	* @return	array	Form data
423
-	*/
419
+	 * Get admin form data.
420
+	 *
421
+	 * @param	string	$form_name	The form name.
422
+	 * @return	array	Form data
423
+	 */
424 424
 	protected function get_form_data($form_name)
425 425
 	{
426 426
 		$data = array(
@@ -471,11 +471,11 @@  discard block
 block discarded – undo
471 471
 	}
472 472
 
473 473
 	/**
474
-	* Assign form data to the template.
475
-	*
476
-	* @param	array	$data	The form data.
477
-	* @return void
478
-	*/
474
+	 * Assign form data to the template.
475
+	 *
476
+	 * @param	array	$data	The form data.
477
+	 * @return void
478
+	 */
479 479
 	protected function assign_form_data($data)
480 480
 	{
481 481
 		$this->template->assign_vars(array(
@@ -490,11 +490,11 @@  discard block
 block discarded – undo
490 490
 		));
491 491
 	}
492 492
 	/**
493
-	* Prepare end date for display
494
-	*
495
-	* @param	mixed	$end_date	End date.
496
-	* @return	string	End date prepared for display.
497
-	*/
493
+	 * Prepare end date for display
494
+	 *
495
+	 * @param	mixed	$end_date	End date.
496
+	 * @return	string	End date prepared for display.
497
+	 */
498 498
 	protected function prepare_end_date($end_date)
499 499
 	{
500 500
 		if (empty($end_date))
@@ -511,11 +511,11 @@  discard block
 block discarded – undo
511 511
 	}
512 512
 
513 513
 	/**
514
-	* Assign template locations data to the template.
515
-	*
516
-	* @param	mixed	$data	The form data or nothing.
517
-	* @return	void
518
-	*/
514
+	 * Assign template locations data to the template.
515
+	 *
516
+	 * @param	mixed	$data	The form data or nothing.
517
+	 * @return	void
518
+	 */
519 519
 	protected function assign_locations($data = false)
520 520
 	{
521 521
 		foreach ($this->location_manager->get_all_locations() as $location_id => $location_data)
@@ -530,43 +530,43 @@  discard block
 block discarded – undo
530 530
 	}
531 531
 
532 532
 	/**
533
-	* Prepare advertisement preview
534
-	*
535
-	* @param	string	$code	Ad code to preview
536
-	* @return	void
537
-	*/
533
+	 * Prepare advertisement preview
534
+	 *
535
+	 * @param	string	$code	Ad code to preview
536
+	 * @return	void
537
+	 */
538 538
 	protected function ad_preview($code)
539 539
 	{
540 540
 		$this->template->assign_var('PREVIEW', htmlspecialchars_decode($code));
541 541
 	}
542 542
 
543 543
 	/**
544
-	* Print success message.
545
-	*
546
-	* It takes arguments in the form of a language key, followed by language substitution values.
547
-	*/
544
+	 * Print success message.
545
+	 *
546
+	 * It takes arguments in the form of a language key, followed by language substitution values.
547
+	 */
548 548
 	protected function success()
549 549
 	{
550 550
 		trigger_error(call_user_func_array(array($this->user, 'lang'), func_get_args()) . adm_back_link($this->u_action));
551 551
 	}
552 552
 
553 553
 	/**
554
-	* Print error message.
555
-	*
556
-	* It takes arguments in the form of a language key, followed by language substitution values.
557
-	*/
554
+	 * Print error message.
555
+	 *
556
+	 * It takes arguments in the form of a language key, followed by language substitution values.
557
+	 */
558 558
 	protected function error()
559 559
 	{
560 560
 		trigger_error(call_user_func_array(array($this->user, 'lang'), func_get_args()) . adm_back_link($this->u_action), E_USER_WARNING);
561 561
 	}
562 562
 
563 563
 	/**
564
-	* Log action
565
-	*
566
-	* @param	string	$action		Performed action in uppercase
567
-	* @param	string	$ad_name	Advertisement name
568
-	* @return	void
569
-	*/
564
+	 * Log action
565
+	 *
566
+	 * @param	string	$action		Performed action in uppercase
567
+	 * @param	string	$ad_name	Advertisement name
568
+	 * @return	void
569
+	 */
570 570
 	protected function log($action, $ad_name)
571 571
 	{
572 572
 		$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.
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\ads\ad\manager			$manager			Advertisement manager object
55
-	* @param \phpbb\ads\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\ads\ad\manager			$manager			Advertisement manager object
55
+	 * @param \phpbb\ads\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\ads\ad\manager $manager, \phpbb\ads\location\manager $location_manager)
58 58
 	{
59 59
 		$this->template = $template;
Please login to merge, or discard this patch.