ErnadoO / ext-phpbb-directory

ext.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
 	* @license GNU General Public License, version 2 (GPL-2.0)
 	* @param string $step The step (enable, disable, purge)
-	* @param array $notification_types The notification type names
+	* @param string[] $notification_types The notification type names
 	* @return string Return notifications as temporary state
 	* @access protected
 	*/

Indentation +30 added lines, -30 removed lines

@@ -17,11 +17,11 @@ 
 class ext extends \phpbb\extension\base
 {
 	/**
-	* Enable extension if requirements are met
-	*
-	* @return bool
-	* @aceess public
-	*/
+	 * Enable extension if requirements are met
+	 *
+	 * @return bool
+	 * @aceess public
+	 */
 	public function is_enableable()
 	{
 		$php_ini = $this->container->get('php_ini');
@@ -42,11 +42,11 @@ 
 	}
 
 	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single enable step that installs any included migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function enable_step($old_state)
 	{
 		switch ($old_state)
@@ -80,11 +80,11 @@ 
 	}
 
 	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single disable step that does nothing
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function disable_step($old_state)
 	{
 		switch ($old_state)
@@ -112,11 +112,11 @@ 
 	}
 
 	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single purge step that reverts any included and installed migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function purge_step($old_state)
 	{
 		switch ($old_state)
@@ -144,16 +144,16 @@ 
 	}
 
 	/**
-	* Notification handler to call notification enable/disable/purge steps
-	*
-	* @author VSEphpbb (Matt Friedman)
-	* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
-	* @license GNU General Public License, version 2 (GPL-2.0)
-	* @param string $step The step (enable, disable, purge)
-	* @param array $notification_types The notification type names
-	* @return string Return notifications as temporary state
-	* @access protected
-	*/
+	 * Notification handler to call notification enable/disable/purge steps
+	 *
+	 * @author VSEphpbb (Matt Friedman)
+	 * @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 * @param string $step The step (enable, disable, purge)
+	 * @param array $notification_types The notification type names
+	 * @return string Return notifications as temporary state
+	 * @access protected
+	 */
 	protected function notification_handler($step, $notification_types)
 	{
 		$phpbb_notifications = $this->container->get('notification_manager');

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 			return false;
 		}
 
-		if (!file_exists($this->extension_path. 'vendor/autoload.php'))
+		if (!file_exists($this->extension_path.'vendor/autoload.php'))
 		{
 			return false;
 		}
@@ -69,7 +69,7 @@ 
 				if (!class_exists('\E1379\SpeakingUrl\SpeakingUrl'))
 				{
 					// When migration is executed, phpBB doesn't know yet extension dependencies, so we need to manually include autoload file
-					require($this->extension_path. 'vendor/autoload.php');
+					require($this->extension_path.'vendor/autoload.php');
 				}
 
 				// Run parent enable step method
@@ -160,7 +160,7 @@ 
 
 		foreach ($notification_types as $notification_type)
 		{
-			call_user_func(array($phpbb_notifications, $step . '_notifications'), $notification_type);
+			call_user_func(array($phpbb_notifications, $step.'_notifications'), $notification_type);
 		}
 
 		return 'notifications';

acp/phpbbdirectory_info.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@
 			'filename'		=> '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module',
 			'title'			=> 'ACP_DIRECTORY',
 			'modes'			=> array(
-				''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
-				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS',	'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'val'			=> array('title' => 'ACP_DIRECTORY_VAL',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				''				=> array('title' => 'ACP_DIRECTORY', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
+				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'val'			=> array('title' => 'ACP_DIRECTORY_VAL', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
 			),
 		);
 	}

controller/acp/settings.php

Indentation +27 added lines, -27 removed lines

@@ -40,15 +40,15 @@ 
 	private $display_vars;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\config\config		$config		Config object
-	* @param \phpbb\language\language	$language	Language object
-	* @param \phpbb\log\log				$log		Log object
-	* @param \phpbb\request\request		$request	Request object
-	* @param \phpbb\template\template	$template	Template object
-	* @param \phpbb\user				$user		User object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config		$config		Config object
+	 * @param \phpbb\language\language	$language	Language object
+	 * @param \phpbb\log\log				$log		Log object
+	 * @param \phpbb\request\request		$request	Request object
+	 * @param \phpbb\template\template	$template	Template object
+	 * @param \phpbb\user				$user		User object
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->config	= $config;
@@ -62,10 +62,10 @@ 
 	}
 
 	/**
-	* Display config page
-	*
-	* @return null
-	*/
+	 * Display config page
+	 *
+	 * @return null
+	 */
 	public function display_config()
 	{
 		// Output relevant page
@@ -111,10 +111,10 @@ 
 	}
 
 	/**
-	* Validate config vars and update config table if needed
-	*
-	* @return null
-	*/
+	 * Validate config vars and update config table if needed
+	 *
+	 * @return null
+	 */
 	public function process()
 	{
 		$submit	= ($this->request->is_set_post('submit')) ? true : false;
@@ -167,22 +167,22 @@ 
 	}
 
 	/**
-	* Set page url
-	*
-	* @param	string $u_action Custom form action
-	* @return	null
-	* @access	public
-	*/
+	 * Set page url
+	 *
+	 * @param	string $u_action Custom form action
+	 * @return	null
+	 * @access	public
+	 */
 	public function set_page_url($u_action)
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
-	* Build config matrice
-	*
-	* @return null
-	*/
+	 * Build config matrice
+	 *
+	 * @return null
+	 */
 	private function _generate_config()
 	{
 		$this->display_vars = array(

Spacing +36 added lines, -36 removed lines

@@ -51,12 +51,12 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
-		$this->config	= $config;
+		$this->config = $config;
 		$this->language	= $language;
-		$this->log		= $log;
+		$this->log = $log;
 		$this->template	= $template;
-		$this->user		= $user;
-		$this->request	= $request;
+		$this->user = $user;
+		$this->request = $request;
 
 		$this->_generate_config();
 	}
@@ -95,7 +95,7 @@ 
 			}
 			else if ($vars['explain'])
 			{
-				$l_explain = $this->language->lang($vars['lang'] . '_EXPLAIN');
+				$l_explain = $this->language->lang($vars['lang'].'_EXPLAIN');
 			}
 
 			$this->template->assign_block_vars('options', array(
@@ -117,7 +117,7 @@ 
 	*/
 	public function process()
 	{
-		$submit	= ($this->request->is_set_post('submit')) ? true : false;
+		$submit = ($this->request->is_set_post('submit')) ? true : false;
 
 		$this->new_config = $this->config;
 		$cfg_array = ($this->request->is_set('config')) ? $this->request->variable('config', array('' => ''), true) : $this->new_config;
@@ -158,12 +158,12 @@ 
 		{
 			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS');
 
-			trigger_error($this->language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
+			trigger_error($this->language->lang('CONFIG_UPDATED').adm_back_link($this->u_action));
 		}
 
 		$this->template->assign_vars(array(
 			'L_TITLE'			=> $this->language->lang($this->display_vars['title']),
-			'L_TITLE_EXPLAIN'	=> $this->language->lang($this->display_vars['title'] . '_EXPLAIN'),
+			'L_TITLE_EXPLAIN'	=> $this->language->lang($this->display_vars['title'].'_EXPLAIN'),
 
 			'S_ERROR'			=> (count($error)) ? true : false,
 			'ERROR_MSG'			=> implode('<br />', $error),
@@ -199,44 +199,44 @@ 
 				'dir_banner_width'					=> '',
 				'dir_banner_height'					=> '',
 
-				'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS',			'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_show'							=> array('lang' => 'DIR_SHOW',				'validate' => 'int:1:9999', 'type' => 'number:1:9999',	'explain' => false),
-				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC',			'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME',			'validate' => 'int:1:999', 	'type' => 'number:1:999',	'explain' => true),
-				'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER',		'validate' => 'string', 	'type' => 'select',			'explain' => false, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
+				'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_show'							=> array('lang' => 'DIR_SHOW', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false),
+				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true),
+				'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => false, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
 
 				'legend2'							=> 'DIR_RECENT_GUEST',
-				'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS',		'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS',	'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE',	'validate' => 'string',		'type' => 'text:6:99',		'explain' => true),
+				'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true),
 
 				'legend3'							=> 'DIR_ADD_GUEST',
-				'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS',	'validate' => 'int:0:9999',	'type' => 'number:0:9999',	'explain' => true),
+				'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true),
 
 				'legend4'							=> 'DIR_THUMB_PARAM',
-				'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-				'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE',			'validate' => 'string', 'type' => 'select',			'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
-				'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+				'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
+				'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 
 				'legend5'							=> 'DIR_COMM_PARAM',
-				'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_flash'					=> array('lang' => 'DIR_ALLOW_FLASH',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS',	'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => true),
-				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE',		'validate' => 'int:1:9999',	'type' => 'number:1:9999',	'explain' => false),
+				'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_flash'					=> array('lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true),
+				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false),
 
 				'legend6'							=> 'DIR_BANN_PARAM',
-				'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-				'dir_banner'						=> array('lang' => 'DIR_MAX_BANN',			'validate' => 'int:0',	'type' => 'dimension:0',	'explain' => true, 'append' => ' ' . $this->user->lang['PIXEL']),
-				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-				'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+				'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_banner'						=> array('lang' => 'DIR_MAX_BANN', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']),
+				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
+				'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 			)
 		);
 	}

controller/comments.php

Indentation +64 added lines, -64 removed lines

@@ -59,23 +59,23 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db					Database object
-	* @param \phpbb\config\config								$config				Config object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \phpbb\controller\helper							$helper				Controller helper object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\auth\auth									$auth				Auth object
-	* @param \phpbb\pagination									$pagination			Pagination object
-	* @param \phpbb\captcha\factory								$captcha_factory	Captcha object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\comment				$comment			PhpBB Directory extension comment object
-	* @param string												$root_path			phpBB root path
-	* @param string												$php_ext			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface					$db					Database object
+	 * @param \phpbb\config\config								$config				Config object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \phpbb\controller\helper							$helper				Controller helper object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\auth\auth									$auth				Auth object
+	 * @param \phpbb\pagination									$pagination			Pagination object
+	 * @param \phpbb\captcha\factory								$captcha_factory	Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\comment				$comment			PhpBB Directory extension comment object
+	 * @param string												$root_path			phpBB root path
+	 * @param string												$php_ext			phpEx
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\comment $comment, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -111,13 +111,13 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$link_id		The link ID
-	* @param	int		$comment_id		The comment ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	int		$comment_id		The comment ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function delete_comment($link_id, $comment_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -156,13 +156,13 @@ 
 	}
 
 	/**
-	* Edit a comment
-	*
-	* @param	int		$link_id		The category ID
-	* @param	int		$comment_id		The comment ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Edit a comment
+	 *
+	 * @param	int		$link_id		The category ID
+	 * @param	int		$comment_id		The comment ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function edit_comment($link_id, $comment_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -193,12 +193,12 @@ 
 	}
 
 	/**
-	* Post a new comment
-	*
-	* @param	int	$link_id		The category ID
-	* @return	null
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Post a new comment
+	 *
+	 * @param	int	$link_id		The category ID
+	 * @return	null
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function new_comment($link_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -224,14 +224,14 @@ 
 	}
 
 	/**
-	* Display popup comment
-	*
-	* @param	int		$link_id		The category ID
-	* @param	int		$page			Page number taken from the URL
-	* @param	string	$mode			add|edit
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Display popup comment
+	 *
+	 * @param	int		$link_id		The category ID
+	 * @param	int		$page			Page number taken from the URL
+	 * @param	string	$mode			add|edit
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($link_id, $page, $mode = 'new')
 	{
 		$this->_check_comments_enable($link_id);
@@ -324,13 +324,13 @@ 
 	}
 
 	/**
-	* Routine
-	*
-	* @param	int		$link_id		The link ID
-	* @param	int		$comment_id		The comment ID
-	* @param	string	$mode			new|edit
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Routine
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	int		$comment_id		The comment ID
+	 * @param	string	$mode			new|edit
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	private function _data_processing($link_id, $comment_id = 0, $mode = 'new')
 	{
 		if (!check_form_key('dir_form_comment'))
@@ -418,12 +418,12 @@ 
 	}
 
 	/**
-	* Check if comments are enable in a category
-	*
-	* @param	int		$link_id		The link ID
-	* @return	null					Retun null if comments are allowed, http_exception if not
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Check if comments are enable in a category
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @return	null					Retun null if comments are allowed, http_exception if not
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	private function _check_comments_enable($link_id)
 	{
 		$sql = 'SELECT link_cat
@@ -449,12 +449,12 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$link_id		The link ID
-	* @param	string	$mode			add|edit
-	* @return	null
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	string	$mode			add|edit
+	 * @return	null
+	 */
 	private function _populate_form($link_id, $mode)
 	{
 		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode != 'edit')

Doc Comments +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 	* Post a new comment
 	*
 	* @param	int	$link_id		The category ID
-	* @return	null
+	* @return	\Symfony\Component\HttpFoundation\Response|null
 	* @throws	\phpbb\exception\http_exception
 	*/
 	public function new_comment($link_id)

Spacing +28 added lines, -28 removed lines

@@ -80,16 +80,16 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\comment $comment, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language			= $language;
 		$this->template			= $template;
 		$this->user				= $user;
-		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->pagination		= $pagination;
-		$this->captcha_factory 	= $captcha_factory;
+		$this->pagination = $pagination;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->comment			= $comment;
 		$this->root_path		= $root_path;
@@ -130,7 +130,7 @@ 
 		}
 
 		$sql = 'SELECT *
-			FROM ' . $this->comments_table . '
+			FROM ' . $this->comments_table.'
 			WHERE comment_id = ' . (int) $comment_id;
 		$result = $this->db->sql_query($sql);
 		$value = $this->db->sql_fetchrow($result);
@@ -147,7 +147,7 @@ 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id));
 			meta_refresh(3, $meta_info);
 			$message = $this->language->lang('DIR_COMMENT_DELETE_OK');
-			$message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
+			$message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -169,7 +169,7 @@ 
 		$this->_check_comments_enable($link_id);
 
 		$sql = 'SELECT *
-			FROM ' . $this->comments_table . '
+			FROM ' . $this->comments_table.'
 			WHERE comment_id = ' . (int) $comment_id;
 		$result = $this->db->sql_query($sql);
 		$value = $this->db->sql_fetchrow($result);
@@ -182,7 +182,7 @@ 
 		$comment_text = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']);
 		$this->s_comment = $comment_text['text'];
 
-		$submit	= $this->request->is_set_post('update_comment') ? true : false;
+		$submit = $this->request->is_set_post('update_comment') ? true : false;
 
 		// If form is done
 		if ($submit)
@@ -238,15 +238,15 @@ 
 		$this->_check_comments_enable($link_id);
 
 		$comment_id = $this->request->variable('c', 0);
-		$view 		= $this->request->variable('view', '');
-		$start 		= ($page - 1) * $this->config['dir_comments_per_page'];
+		$view = $this->request->variable('view', '');
+		$start = ($page - 1) * $this->config['dir_comments_per_page'];
 
 		$this->s_hidden_fields = array_merge($this->s_hidden_fields, array('page' => $page));
 
 		$this->_populate_form($link_id, $mode);
 
 		$sql = 'SELECT COUNT(comment_id) AS nb_comments
-			FROM ' . $this->comments_table . '
+			FROM ' . $this->comments_table.'
 			WHERE comment_link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$nb_comments = (int) $this->db->sql_fetchfield('nb_comments');
@@ -266,10 +266,10 @@ 
 					),
 					array(
 						'FROM'	=> array(ZEBRA_TABLE => 'z'),
-						'ON'	=> 'z.user_id = ' . $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id'
+						'ON'	=> 'z.user_id = '.$this->user->data['user_id'].' AND z.zebra_id = a.comment_user_id'
 					)
 			),
-			'WHERE'		=> 'a.comment_link_id = ' . (int) $link_id,
+			'WHERE'		=> 'a.comment_link_id = '.(int) $link_id,
 			'ORDER_BY'	=> 'a.comment_date DESC');
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
 		$result = $this->db->sql_query_limit($sql, $this->config['dir_comments_per_page'], $start);
@@ -298,12 +298,12 @@ 
 				'S_COMMENT'			=> generate_text_for_display($comments['comment_text'], $comments['comment_uid'], $comments['comment_bitfield'], $comments['comment_flags']),
 				'S_ID'				=> $comments['comment_id'],
 
-				'U_EDIT'			=> ($edit_allowed) 		? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '',
-				'U_DELETE'			=> ($delete_allowed) 	? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '',
+				'U_EDIT'			=> ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '',
+				'U_DELETE'			=> ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '',
 
 				'S_IGNORE_POST'		=> ($comments['foe'] && ($view != 'show' || $comment_id != $comments['comment_id'])) ? true : false,
 				'L_IGNORE_POST'		=> ($comments['foe']) ? $this->language->lang('POST_BY_FOE', get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']), '<a href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
-				'L_POST_DISPLAY'	=> ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $comments['comment_id'] . '" href="' . $this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'] . '&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
+				'L_POST_DISPLAY'	=> ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="'.$comments['comment_id'].'" href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'].'&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
 
 				'S_INFO'			=> $this->auth->acl_get('m_info'),
 			));
@@ -343,7 +343,7 @@ 
 
 		if (!function_exists('validate_data'))
 		{
-			include($this->root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		$error = validate_data(
@@ -405,7 +405,7 @@ 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id));
 			meta_refresh(3, $meta_info);
 			$message = $this->language->lang('DIR_'.strtoupper($mode).'_COMMENT_OK');
-			$message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
+			$message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -428,7 +428,7 @@ 
 	private function _check_comments_enable($link_id)
 	{
 		$sql = 'SELECT link_cat
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$cat_id = (int) $this->db->sql_fetchfield('link_cat');
@@ -470,11 +470,11 @@ 
 
 		if (!function_exists('generate_smilies'))
 		{
-			include($this->root_path . 'includes/functions_posting.' . $this->php_ext);
+			include($this->root_path.'includes/functions_posting.'.$this->php_ext);
 		}
 		if (!function_exists('display_custom_bbcodes'))
 		{
-			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->root_path.'includes/functions_display.'.$this->php_ext);
 		}
 
 		generate_smilies('inline', 0);
@@ -484,11 +484,11 @@ 
 		$this->template->assign_vars(array(
 			'S_AUTH_COMM' 		=> $this->auth->acl_get('u_comment_dir'),
 
-			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) 	? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
-			'IMG_STATUS'		=> ($this->config['dir_allow_bbcode']) 	? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
-			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies'])	? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
-			'URL_STATUS'		=> ($this->config['dir_allow_links'])	? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
-			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash'])	? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
+			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'		=> ($this->config['dir_allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
+			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
+			'URL_STATUS'		=> ($this->config['dir_allow_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
+			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
 
 			'L_DIR_REPLY_EXP'	=> $this->language->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']),
 

controller/search.php

Indentation +26 added lines, -26 removed lines

@@ -50,21 +50,21 @@ 
 	protected $link;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 					$db				Database object
-	* @param \phpbb\config\config 								$config			Config object
-	* @param \phpbb\language\language							$language		Language object
-	* @param \phpbb\template\template 							$template		Template object
-	* @param \phpbb\user 										$user			User object
-	* @param \phpbb\controller\helper 							$helper			Controller helper object
-	* @param \phpbb\request\request 							$request		Request object
-	* @param \phpbb\auth\auth 									$auth			Auth object
-	* @param \phpbb\pagination 									$pagination		Pagination object
-	* @param \ernadoo\phpbbdirectory\search\fulltext_directory	$search			PhpBB Directory extension search object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie		PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link			PhpBB Directory extension link object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 					$db				Database object
+	 * @param \phpbb\config\config 								$config			Config object
+	 * @param \phpbb\language\language							$language		Language object
+	 * @param \phpbb\template\template 							$template		Template object
+	 * @param \phpbb\user 										$user			User object
+	 * @param \phpbb\controller\helper 							$helper			Controller helper object
+	 * @param \phpbb\request\request 							$request		Request object
+	 * @param \phpbb\auth\auth 									$auth			Auth object
+	 * @param \phpbb\pagination 									$pagination		Pagination object
+	 * @param \ernadoo\phpbbdirectory\search\fulltext_directory	$search			PhpBB Directory extension search object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie		PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link			PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\search\fulltext_directory $search, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
 		$this->db			= $db;
@@ -90,12 +90,12 @@ 
 	}
 
 	/**
-	* Search controller
-	*
-	* @param	int	$page	Page number taken from the URL
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Search controller
+	 *
+	 * @param	int	$page	Page number taken from the URL
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function main($page)
 	{
 		if (!$this->auth->acl_get('u_search_dir'))
@@ -319,11 +319,11 @@ 
 	}
 
 	/**
-	*
-	* @param	array	$search_category
-	* @param	bool	$search_child
-	* @return	array	Categories to exclude from search
-	*/
+	 *
+	 * @param	array	$search_category
+	 * @param	bool	$search_child
+	 * @return	array	Categories to exclude from search
+	 */
 	private function _get_exclude_categories(&$search_category, $search_child)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id

Spacing +26 added lines, -26 removed lines

@@ -69,18 +69,18 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\search\fulltext_directory $search, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
-		$this->db			= $db;
-		$this->config		= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language		= $language;
 		$this->template		= $template;
 		$this->user			= $user;
-		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->pagination	= $pagination;
-		$this->search		= $search;
-		$this->categorie	= $categorie;
-		$this->link			= $link;
+		$this->pagination = $pagination;
+		$this->search = $search;
+		$this->categorie = $categorie;
+		$this->link = $link;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 		$language->add_lang('search');
@@ -104,18 +104,18 @@ 
 			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
 		}
 
-		$cat_id				= $this->request->variable('cat_id', 0);
-		$keywords			= $this->request->variable('keywords', '', true);
+		$cat_id = $this->request->variable('cat_id', 0);
+		$keywords = $this->request->variable('keywords', '', true);
 		$search_terms		= $this->request->variable('terms', 'all');
-		$search_category	= $this->request->variable('cid', array(0));
-		$search_fields		= $this->request->variable('sf', 'all');
+		$search_category = $this->request->variable('cid', array(0));
+		$search_fields = $this->request->variable('sf', 'all');
 		$search_child		= $this->request->variable('sc', true);
-		$sort_days			= $this->request->variable('st', 0);
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key			= $this->request->variable('sk', 't');
 		$sort_dir			= $this->request->variable('sd', 'd');
-		$start				= ($page - 1) * (int) $this->config['dir_show'];
+		$start = ($page - 1) * (int) $this->config['dir_show'];
 
-		$default_sort_days	= 0;
+		$default_sort_days = 0;
 		$default_sort_key	= (string) substr($this->config['dir_default_order'], 0, 1);
 		$default_sort_dir	= (string) substr($this->config['dir_default_order'], 2);
 
@@ -164,12 +164,12 @@ 
 
 			$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
 
-			($u_hilit) 					? $u_search['keywords']		= urlencode(htmlspecialchars_decode($keywords)) : '';
-			($search_terms != 'all') 	? $u_search['terms']		= $search_terms : '';
-			($cat_id)					? $u_search['cat_id']		= $cat_id : '';
-			($search_category)			? $u_search['cid']			= $search_category : '';
-			(!$search_child)			? $u_search['sc']			= 0 : '';
-			($search_fields != 'all')	? $u_search['sf'] 			= $search_fields : '';
+			($u_hilit) ? $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)) : '';
+			($search_terms != 'all') ? $u_search['terms'] = $search_terms : '';
+			($cat_id) ? $u_search['cat_id'] = $cat_id : '';
+			($search_category) ? $u_search['cid'] = $search_category : '';
+			(!$search_child) ? $u_search['sc'] = 0 : '';
+			($search_fields != 'all') ? $u_search['sf'] = $search_fields : '';
 
 			$base_url = array(
 				'routes'	=> 'ernadoo_phpbbdirectory_search_controller',
@@ -199,7 +199,7 @@ 
 			{
 				$this->template->assign_vars(array(
 					'SEARCH_CATEGORY'	=> $this->language->lang('RETURN_TO', \ernadoo\phpbbdirectory\core\categorie::getname((int) $cat_id)),
-					'U_SEARCH_CATEGORY'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id),
+					'U_SEARCH_CATEGORY'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id),
 				));
 			}
 
@@ -243,7 +243,7 @@ 
 
 					foreach ($rowset as $data)
 					{
-						$s_banner	= $this->link->display_bann($data);
+						$s_banner = $this->link->display_bann($data);
 						$s_thumb	= $this->link->display_thumb($data);
 						$s_flag		= $this->link->display_flag($data);
 
@@ -251,8 +251,8 @@ 
 
 						if ($hilit)
 						{
-							$data['link_name'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']);
-							$data['link_description'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']);
+							$data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']);
+							$data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']);
 						}
 
 						$this->template->assign_block_vars('results', array(
@@ -312,7 +312,7 @@ 
 	private function _get_exclude_categories(&$search_category, $search_child)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 				ORDER BY left_id';
 		$result = $this->db->sql_query($sql);
 

migrations/converter/convert_module.php

Indentation +10 added lines, -10 removed lines

@@ -16,11 +16,11 @@ 
 class convert_module extends \phpbb\db\migration\migration
 {
 	/**
-	* Skip this migration if an ACP_DIRECTORY module does not exist
-	*
-	* @return	bool	True if table does not exist
-	* @access	public
-	*/
+	 * Skip this migration if an ACP_DIRECTORY module does not exist
+	 *
+	 * @return	bool	True if table does not exist
+	 * @access	public
+	 */
 	public function effectively_installed()
 	{
 		$sql = 'SELECT module_id
@@ -37,11 +37,11 @@ 
 	}
 
 	/**
-	* Add or update data in the database
-	*
-	* @return	array Array of table data
-	* @access	public
-	*/
+	 * Add or update data in the database
+	 *
+	 * @return	array Array of table data
+	 * @access	public
+	 */
 	public function update_data()
 	{
 		return array(

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	public function effectively_installed()
 	{
 		$sql = 'SELECT module_id
-			FROM ' . $this->table_prefix . "modules
+			FROM ' . $this->table_prefix."modules
 			WHERE module_class = 'acp'
 				AND module_basename = 'acp_directory'
 				AND module_mode = 'main'";
@@ -56,8 +56,8 @@ 
 			'module_auth'		=> 'ext_ernadoo/phpbbdirectory'
 		);
 
-		$sql = 'UPDATE '  . $this->table_prefix . 'modules
-			SET ' . $this->db->sql_build_array('UPDATE', $module_data) . "
+		$sql = 'UPDATE '.$this->table_prefix.'modules
+			SET ' . $this->db->sql_build_array('UPDATE', $module_data)."
 			WHERE module_basename = 'acp_directory'
 				AND module_mode IN ('main', 'settings', 'cat', 'val')";
 		$this->db->sql_query($sql);

migrations/converter/convert_notifications.php

Indentation +14 added lines, -14 removed lines

@@ -16,11 +16,11 @@ 
 class convert_notifications extends \phpbb\db\migration\migration
 {
 	/**
-	* Skip this migration if phpbb_directory_notifications table does not exist
-	*
-	* @return	bool	True if table does not exist
-	* @access	public
-	*/
+	 * Skip this migration if phpbb_directory_notifications table does not exist
+	 *
+	 * @return	bool	True if table does not exist
+	 * @access	public
+	 */
 	public function effectively_installed()
 	{
 		return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications');
@@ -34,11 +34,11 @@ 
 	}
 
 	/**
-	* Add or update data in the database
-	*
-	* @return	array Array of table data
-	* @access	public
-	*/
+	 * Add or update data in the database
+	 *
+	 * @return	array Array of table data
+	 * @access	public
+	 */
 	public function update_data()
 	{
 		return array(
@@ -47,10 +47,10 @@ 
 	}
 
 	/**
-	* Copy category track from 3.0.x table
-	*
-	* @return null
-	*/
+	 * Copy category track from 3.0.x table
+	 *
+	 * @return null
+	 */
 	public function copy_from_notifications()
 	{
 		$sql = 'SELECT n_user_id, n_cat_id

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 	*/
 	public function effectively_installed()
 	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications');
+		return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications');
 	}
 
 	static public function depends_on()
@@ -54,7 +54,7 @@ 
 	public function copy_from_notifications()
 	{
 		$sql = 'SELECT n_user_id, n_cat_id
-			FROM ' . $this->table_prefix . 'directory_notifications';
+			FROM ' . $this->table_prefix.'directory_notifications';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
@@ -65,7 +65,7 @@ 
 				'notify_status'	=> 1,
 			);
 
-			$sql = 'INSERT INTO ' . $this->table_prefix . 'directory_watch ' . $this->db->sql_build_array('INSERT', $data);
+			$sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data);
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);

migrations/v10x/v1_0_0.php

Indentation +17 added lines, -17 removed lines

@@ -259,10 +259,10 @@ 
 	}
 
 	/**
-	* Create directories for banners/icons uploaded
-	*
-	* @return null
-	*/
+	 * Create directories for banners/icons uploaded
+	 *
+	 * @return null
+	 */
 	public function create_directories()
 	{
 		$directories = array(
@@ -281,10 +281,10 @@ 
 	}
 
 	/**
-	* Remove directories for banners/icons uploaded
-	*
-	* @return null
-	*/
+	 * Remove directories for banners/icons uploaded
+	 *
+	 * @return null
+	 */
 	public function remove_directories()
 	{
 		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
@@ -293,15 +293,15 @@ 
 	}
 
 	/**
-	* Attempts to remove recursively the directory named by dirname.
-	*
-	* @author Mehdi Kabab <http://pioupioum.fr>
-	* @copyright Copyright (C) 2009 Mehdi Kabab
-	* @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
-	*
-	* @param	string	$dirname		Path to the directory.
-	* @return	null
-	*/
+	 * Attempts to remove recursively the directory named by dirname.
+	 *
+	 * @author Mehdi Kabab <http://pioupioum.fr>
+	 * @copyright Copyright (C) 2009 Mehdi Kabab
+	 * @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
+	 *
+	 * @param	string	$dirname		Path to the directory.
+	 * @return	null
+	 */
 	private function _recursive_rmdir($dirname)
 	{
 		if (is_dir($dirname) && !is_link($dirname))

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'COLUMNS' => array(
 						'cat_id'				=> array('UINT', null, 'auto_increment'),
 						'parent_id'				=> array('UINT', 0),
@@ -57,7 +57,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_comments' => array(
+				$this->table_prefix.'directory_comments' => array(
 					'COLUMNS' => array(
 						'comment_id' 		=> array('UINT', null, 'auto_increment'),
 						'comment_date' 		=> array('TIMESTAMP', 0),
@@ -73,7 +73,7 @@ 
 					'PRIMARY_KEY'	=> array('comment_id'),
 				),
 
-				$this->table_prefix . 'directory_links' => array(
+				$this->table_prefix.'directory_links' => array(
 					'COLUMNS' => array(
 						'link_id'			=> array('UINT', null, 'auto_increment'),
 						'link_time' 		=> array('TIMESTAMP', 0),
@@ -110,7 +110,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_watch' => array(
+				$this->table_prefix.'directory_watch' => array(
 					'COLUMNS' => array(
 						'cat_id'		=> array('UINT', 0),
 						'user_id'		=> array('UINT', 0),
@@ -125,7 +125,7 @@ 
 
 				),
 
-				$this->table_prefix . 'directory_votes' => array(
+				$this->table_prefix.'directory_votes' => array(
 					'COLUMNS' => array(
 						'vote_id'			=> array('UINT', null, 'auto_increment'),
 						'vote_link_id'		=> array('UINT', 0),
@@ -148,11 +148,11 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'directory_cats',
-				$this->table_prefix . 'directory_comments',
-				$this->table_prefix . 'directory_links',
-				$this->table_prefix . 'directory_votes',
-				$this->table_prefix . 'directory_watch',
+				$this->table_prefix.'directory_cats',
+				$this->table_prefix.'directory_comments',
+				$this->table_prefix.'directory_links',
+				$this->table_prefix.'directory_votes',
+				$this->table_prefix.'directory_watch',
 			),
 		);
 	}
@@ -272,10 +272,10 @@ 
 
 		foreach ($directories as $dir)
 		{
-			if (!file_exists($this->phpbb_root_path . $dir))
+			if (!file_exists($this->phpbb_root_path.$dir))
 			{
-				@mkdir($this->phpbb_root_path . $dir, 0777, true);
-				phpbb_chmod($this->phpbb_root_path . $dir, CHMOD_READ | CHMOD_WRITE);
+				@mkdir($this->phpbb_root_path.$dir, 0777, true);
+				phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	*/
 	public function remove_directories()
 	{
-		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
+		$dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
 
 		$this->_recursive_rmdir($dir);
 	}

notification/type/directory_website_disapproved.php

Indentation +59 added lines, -59 removed lines

@@ -18,21 +18,21 @@ 
 class directory_website_disapproved extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved';
 	}
 
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'id'	=> 'dir_moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
@@ -40,17 +40,17 @@ 
 	);
 
 	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
+	 * Permission to check for (in find_users_for_notification)
+	 *
+	 * @var string Permission name
+	 */
 	protected $permission = array('a_', 'm_');
 
 	/**
-	* Is available
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is available
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		$has_permission = $this->auth->acl_gets($this->permission, true);
@@ -59,21 +59,21 @@ 
 	}
 
 	/**
-	* Get link id
-	*
-	* @param array $data The data from the link
-	* @return int
-	*/
+	 * Get link id
+	 *
+	 * @param array $data The data from the link
+	 * @return int
+	 */
 	static public function get_item_id($data)
 	{
 		return (int) $data['link_id'];
 	}
 
 	/**
-	* Get parent id - it's not used
-	*
-	* @param array $data The data from the link
-	*/
+	 * Get parent id - it's not used
+	 *
+	 * @param array $data The data from the link
+	 */
 	static public function get_item_parent_id($data)
 	{
 		// No parent
@@ -81,12 +81,12 @@ 
 	}
 
 	/**
-	* Find the users who want to receive notifications
-	*
-	* @param	array	$data		Data from submit link
-	* @param	array	$options	Options for finding users for notification
-	* @return	array
-	*/
+	 * Find the users who want to receive notifications
+	 *
+	 * @param	array	$data		Data from submit link
+	 * @param	array	$options	Options for finding users for notification
+	 * @return	array
+	 */
 	public function find_users_for_notification($data, $options = array())
 	{
 		$options = array_merge(array(
@@ -103,10 +103,10 @@ 
 	}
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 	public function get_title()
 	{
 		$link_name = $this->get_data('link_name');
@@ -116,20 +116,20 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_disapproved';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -138,33 +138,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return '';
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param	array	$data				Data from submit link
-	* @param	array	$pre_create_data	Data from pre_create_insert_array()
-	* @return	array						Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param	array	$data				Data from submit link
+	 * @param	array	$pre_create_data	Data from pre_create_insert_array()
+	 * @return	array						Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('link_name', $data['link_name']);