ErnadoO / ext-phpbb-directory

controller/comments.php

Indentation +63 added lines, -63 removed lines

@@ -56,22 +56,22 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db					Database object
-	* @param \phpbb\config\config								$config				Config 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\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\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;
@@ -106,13 +106,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);
@@ -151,13 +151,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);
@@ -188,12 +188,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);
@@ -219,14 +219,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);
@@ -319,13 +319,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'))
@@ -413,12 +413,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
@@ -444,12 +444,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')

Spacing +18 added lines, -18 removed lines

@@ -74,15 +74,15 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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->db = $db;
 		$this->config			= $config;
-		$this->template			= $template;
+		$this->template = $template;
 		$this->user				= $user;
 		$this->helper			= $helper;
-		$this->request			= $request;
+		$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;
@@ -176,7 +176,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)
@@ -232,8 +232,8 @@ 
 		$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));
 
@@ -292,12 +292,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->user->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->user->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_IGNORE_POST'		=> ($comments['foe']) ? $this->user->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->user->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'),
 			));
@@ -398,7 +398,7 @@ 
 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id));
 			meta_refresh(3, $meta_info);
-			$message = $this->user->lang['DIR_'.strtoupper($mode).'_COMMENT_OK'];
+			$message = $this->user->lang['DIR_' . strtoupper($mode) . '_COMMENT_OK'];
 			$message = $message . '<br /><br />' . $this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
 			return $this->helper->message($message);
 		}
@@ -478,11 +478,11 @@ 
 		$this->template->assign_vars(array(
 			'S_AUTH_COMM' 		=> $this->auth->acl_get('u_comment_dir'),
 
-			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) 	? $this->user->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->user->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->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
-			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies'])	? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
-			'URL_STATUS'		=> ($this->config['dir_allow_links'])	? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
-			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash'])	? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
+			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path . "faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->user->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->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
+			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
+			'URL_STATUS'		=> ($this->config['dir_allow_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
+			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
 
 			'L_DIR_REPLY_EXP'	=> $this->user->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']),
 

controller/links.php

Indentation +68 added lines, -68 removed lines

@@ -68,22 +68,22 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db					Database object
-	* @param \phpbb\config\config					$config				Config 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\captcha\factory					$captcha_factory	Captcha object
-	* @param \ernadoo\phpbbdirectory\core\categorie	$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link		$link				PhpBB Directory extension link object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper			PhpBB Directory extension helper 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\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\captcha\factory					$captcha_factory	Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie	$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link		$link				PhpBB Directory extension link object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper			PhpBB Directory extension helper 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\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -109,12 +109,12 @@ 
 	}
 
 	/**
-	* Delete a link
-	*
-	* @param	int	$cat_id		The category ID
-	* @param	int	$link_id		The link ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Delete a link
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @param	int	$link_id		The link ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function delete_link($cat_id, $link_id)
 	{
 		if ($this->request->is_set_post('cancel'))
@@ -157,13 +157,13 @@ 
 	}
 
 	/**
-	* Edit a link
-	*
-	* @param	int	$cat_id		The category ID
-	* @param	int	$link_id	The link ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Edit a link
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @param	int	$link_id	The link ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_user_id
@@ -238,12 +238,12 @@ 
 	}
 
 	/**
-	* Display add form
-	*
-	* @param	int	$cat_id		The category ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Display add form
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function new_link($cat_id)
 	{
 		if (!$this->auth->acl_get('u_submit_dir'))
@@ -285,23 +285,23 @@ 
 	}
 
 	/**
-	* View link controller
-	*
-	* @param	int	$link_id		The link ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * View link controller
+	 *
+	 * @param	int	$link_id		The link ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function view_link($link_id)
 	{
 		return $this->link->view($link_id);
 	}
 
 	/**
-	* Vote for a link
-	*
-	* @param	int $cat_id		The category ID
-	* @param	int $link_id	The link ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Vote for a link
+	 *
+	 * @param	int $cat_id		The category ID
+	 * @param	int $link_id	The link ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function vote_link($cat_id, $link_id)
 	{
 		$this->categorie->get($cat_id);
@@ -337,14 +337,14 @@ 
 	}
 
 	/**
-	* Routine
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$link_id	The link ID
-	* @param	string	$mode		add|edit
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Routine
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$link_id	The link ID
+	 * @param	string	$mode		add|edit
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	private function _data_processing($cat_id, $link_id = 0, $mode = 'new')
 	{
 		if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir')))
@@ -434,8 +434,8 @@ 
 		if (!$error)
 		{
 			/**
-			* No errrors, we execute heavy tasks wich need a valid url
-			*/
+			 * No errrors, we execute heavy tasks wich need a valid url
+			 */
 
 			// Banner
 			$this->link->banner_process($this->banner, $error);
@@ -518,11 +518,11 @@ 
 	}
 
 	/**
-	* Display a banner
-	*
-	* @param	string $banner_img		Path to banner file
-	* @return	Response object
-	*/
+	 * Display a banner
+	 *
+	 * @param	string $banner_img		Path to banner file
+	 * @return	Response object
+	 */
 	public function return_banner($banner_img)
 	{
 		if (!function_exists('file_gc'))
@@ -555,13 +555,13 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	string	$mode		add|edit
-	* @param	string	$title		Page title (depends of $mode)
-	* @return	null
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	string	$mode		add|edit
+	 * @param	string	$title		Page title (depends of $mode)
+	 * @return	null
+	 */
 	private function _populate_form($cat_id, $mode, $title)
 	{
 		global $phpbb_extension_manager;

Spacing +31 added lines, -31 removed lines

@@ -86,19 +86,19 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
-		$this->db				= $db;
+		$this->db = $db;
 		$this->config			= $config;
-		$this->template			= $template;
+		$this->template = $template;
 		$this->user				= $user;
 		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->captcha_factory 	= $captcha_factory;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->link				= $link;
-		$this->dir_helper		= $dir_helper;
+		$this->dir_helper = $dir_helper;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 
 		$this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
 
@@ -183,7 +183,7 @@ 
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->user->lang['DIR_EDIT_SITE'];
+		$title = $this->user->lang['DIR_EDIT_SITE'];
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -219,15 +219,15 @@ 
 				'old_banner'	=> $site['link_banner'],
 			);
 
-			$site_description		= generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
-			$site['link_banner'] 	= (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
+			$site_description = generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
+			$site['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
 
-			$this->url			= $site['link_url'];
-			$this->site_name	= $site['link_name'];
+			$this->url = $site['link_url'];
+			$this->site_name = $site['link_name'];
 			$this->description	= $site_description['text'];
 			$this->guest_email	= $site['link_guest_email'];
-			$this->rss			= $site['link_rss'];
-			$this->banner 		= $site['link_banner'];
+			$this->rss = $site['link_rss'];
+			$this->banner = $site['link_banner'];
 			$this->back			= $site['link_back'];
 			$this->flag 		= $site['link_flag'];
 		}
@@ -254,7 +254,7 @@ 
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->user->lang['DIR_NEW_SITE'];
+		$title = $this->user->lang['DIR_NEW_SITE'];
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -357,12 +357,12 @@ 
 			return $this->helper->message('FORM_INVALID');
 		}
 
-		$this->url			= $this->request->variable('url', '');
-		$this->site_name	= $this->request->variable('site_name', '', true);
+		$this->url = $this->request->variable('url', '');
+		$this->site_name = $this->request->variable('site_name', '', true);
 		$this->description	= $this->request->variable('description', '', true);
 		$this->guest_email	= $this->request->variable('guest_email', '');
-		$this->rss			= $this->request->variable('rss', '');
-		$this->banner 		= $this->request->variable('banner', '');
+		$this->rss = $this->request->variable('rss', '');
+		$this->banner = $this->request->variable('banner', '');
 		$this->back			= $this->request->variable('back', '');
 		$this->flag 		= $this->request->variable('flag', '');
 
@@ -391,17 +391,17 @@ 
 			'site_name' =>			array(
 				array('string', false, 1, 100)),
 			'website'		=>		array(
-				array('string',	false, 12, 255),
-				array('match',	true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('string', false, 12, 255),
+				array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'description'	=>		array(
 				array('string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe'])),
 			'rss'			=>		array(
 				array('string', true, 12, 255),
-				array('match',	empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('match', empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'banner'		=>		array(
 				array('string', true, 5, 255)),
 			'back'			=>		array(
-				array('string',	!$this->categorie->data['cat_link_back'], 12, 255),
+				array('string', !$this->categorie->data['cat_link_back'], 12, 255),
 				array(array($this->link, 'link_back'), true)),
 			'cat'			=>		array(
 				array('num', '', 1))
@@ -450,8 +450,8 @@ 
 		// Still no errors?? So let's go!
 		if (!$error)
 		{
-			$this->banner	= (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
-			$this->url		= $this->link->clean_url($this->url);
+			$this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
+			$this->url = $this->link->clean_url($this->url);
 
 			$data_edit = array(
 				'link_user_id'		=> $this->link_user_id,
@@ -499,7 +499,7 @@ 
 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
 			meta_refresh(3, $meta_info);
-			$message	= ($need_approval) ? $this->user->lang['DIR_'.strtoupper($mode).'_SITE_ACTIVE'] : $this->user->lang['DIR_'.strtoupper($mode).'_SITE_OK'];
+			$message	= ($need_approval) ? $this->user->lang['DIR_' . strtoupper($mode) . '_SITE_ACTIVE'] : $this->user->lang['DIR_' . strtoupper($mode) . '_SITE_OK'];
 			$message	= $message . '<br /><br />' . $this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id)) . '">', '</a>');
 			return $this->helper->message($message);
 		}
@@ -589,20 +589,20 @@ 
 		add_form_key('dir_form');
 
 		$ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
-		$flag_path = $ext_path.'images/flags/';
+		$flag_path = $ext_path . 'images/flags/';
 
 		$s_guest	= (!$this->user->data['is_registered'] || !empty($this->guest_email));
-		$s_rss		= $this->config['dir_activ_rss'];
-		$s_banner	= $this->config['dir_activ_banner'];
+		$s_rss = $this->config['dir_activ_rss'];
+		$s_banner = $this->config['dir_activ_banner'];
 		$s_back		= $this->categorie->data['cat_link_back'];
 		$s_flag		= $this->config['dir_activ_flag'];
 
 		$this->template->assign_vars(array(
-			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) 	? $this->user->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
-			'IMG_STATUS'			=> ($this->config['allow_bbcode'])	? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
+			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path . "faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path . "faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
+			'IMG_STATUS'			=> ($this->config['allow_bbcode']) ? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
 			'SMILIES_STATUS'		=> ($this->config['allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
 			'URL_STATUS'			=> ($this->config['allow_post_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
-			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash'])	? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
+			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
 
 			'L_TITLE'				=> $title,
 			'L_DIR_DESCRIPTION_EXP'	=> $this->user->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),

controller/search.php

Indentation +25 added lines, -25 removed lines

@@ -47,20 +47,20 @@ 
 	protected $link;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 					$db				Database object
-	* @param \phpbb\config\config 								$config			Config 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\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\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;
@@ -85,12 +85,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'))
@@ -314,11 +314,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 +24 added lines, -24 removed lines

@@ -63,17 +63,17 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$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;
 
 		$this->user->add_lang_ext('ernadoo/phpbbdirectory', array('directory'));
 		$this->user->add_lang('search');
@@ -98,24 +98,24 @@ 
 			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);
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->user->lang['ALL_RESULTS'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']);
-		$sort_by_text	= array('a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']);
+		$sort_by_text = array('a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']);
 		$sort_by_sql	= array('a' => 'u.username_clean', 't' => array('l.link_time', 'l.link_id'), 'r' => 'l.link_comment', 's' => 'l.link_name', 'v' => 'l.link_view');
 
 		if ($this->config['dir_activ_pagerank'])
@@ -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',
@@ -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);
 
@@ -264,10 +264,10 @@ 
 							'S_TIME'		=> ($data['link_time'] != 0) ? $this->user->format_date($data['link_time']) : '',
 							'S_COMMENT'		=> $data['link_comment'],
 
-							'THUMB'			=> '<img src="'.$s_thumb.'" alt="'.$this->user->lang['DIR_THUMB'].'" title="'.$data['link_name'].'"/>',
+							'THUMB'			=> '<img src="' . $s_thumb . '" alt="' . $this->user->lang['DIR_THUMB'] . '" title="' . $data['link_name'] . '"/>',
 							'IMG_BANNER'	=> $s_banner,
 							'IMG_FLAG'		=> $s_flag,
-							'ON_CLICK' 		=> "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $data['link_id']))."'); return false;\"",
+							'ON_CLICK' 		=> "onclick=\"window.open('" . $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $data['link_id'])) . "'); return false;\"",
 
 							'L_DIR_SEARCH_NB_CLICKS'	=> $this->user->lang('DIR_SEARCH_NB_CLICKS', (int) $data['link_view']),
 							'L_DIR_SEARCH_NB_COMMS'		=> $this->user->lang('DIR_SEARCH_NB_COMMS', (int) $data['link_comment']),

core/categorie.php

Spacing +8 added lines, -8 removed lines

@@ -58,15 +58,15 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\cron\manager $cron, \ernadoo\phpbbdirectory\core\helper $dir_helper)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->request = $request;
 		$this->auth			= $auth;
 		$this->cron 		= $cron;
-		$this->dir_helper	= $dir_helper;
+		$this->dir_helper = $dir_helper;
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	*/
 	public function display()
 	{
-		$cat_rows	= $subcats = array();
+		$cat_rows = $subcats = array();
 		$parent_id	= $visible_cats = 0;
 
 		$sql_array = array(
@@ -259,7 +259,7 @@ 
 			{
 				foreach ($subcats[$dir_cat_id] as $subcat_id => $subcat_row)
 				{
-					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links']+$subcat_row['links']) : $row['cat_links'];
+					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links'] + $subcat_row['links']) : $row['cat_links'];
 
 					if ($subcat_row['display'] && $subcat_row['parent_id'] == $dir_cat_id)
 					{
@@ -505,9 +505,9 @@ 
 
 		if ($can_watch)
 		{
-			$s_watching['link'] 		= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
+			$s_watching['link'] = $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
 			$s_watching['link_toggle'] 	= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => ((!$is_watching) ? 'unwatch' : 'watch')));
-			$s_watching['title'] 		= $this->user->lang[(($is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT'];
+			$s_watching['title'] = $this->user->lang[(($is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT'];
 			$s_watching['title_toggle'] = $this->user->lang[((!$is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT'];
 			$s_watching['is_watching'] 	= $is_watching;
 		}

Indentation +61 added lines, -61 removed lines

@@ -44,18 +44,18 @@ 
 	public $data = array();
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db			Database object
-	* @param \phpbb\config\config 					$config		Config 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\cron\manager					$cron		Cron object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper	PhpBB Directory extension helper object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 		$db			Database object
+	 * @param \phpbb\config\config 					$config		Config 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\cron\manager					$cron		Cron object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper	PhpBB Directory extension helper object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\cron\manager $cron, \ernadoo\phpbbdirectory\core\helper $dir_helper)
 	{
 		$this->db			= $db;
@@ -70,21 +70,21 @@ 
 	}
 
 	/**
-	* Function for get approval setting
-	* used in edit mode for test the setting of new category's link
-	*
-	* @return bool
-	*/
+	 * Function for get approval setting
+	 * used in edit mode for test the setting of new category's link
+	 *
+	 * @return bool
+	 */
 	public function need_approval()
 	{
 		return (bool) $this->data['cat_validate'];
 	}
 
 	/**
-	* Generate Jumpbox
-	*
-	* @return null
-	*/
+	 * Generate Jumpbox
+	 *
+	 * @return null
+	 */
 	public function make_cat_jumpbox()
 	{
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
@@ -137,12 +137,12 @@ 
 	}
 
 	/**
-	* Generate a list of directory's categories
-	*
-	* @param	int		$select_id		Selected category
-	* @param	array	$ignore_id		Array of ignored categories
-	* @return	string	$cat_list		html code
-	*/
+	 * Generate a list of directory's categories
+	 *
+	 * @param	int		$select_id		Selected category
+	 * @param	array	$ignore_id		Array of ignored categories
+	 * @return	string	$cat_list		html code
+	 */
 	public function make_cat_select($select_id = 0, $ignore_id = array())
 	{
 		$ignore_id = is_array($ignore_id) ? $ignore_id : array($ignore_id);
@@ -188,10 +188,10 @@ 
 	}
 
 	/**
-	* Display cat or subcat
-	*
-	* @return	null
-	*/
+	 * Display cat or subcat
+	 *
+	 * @return	null
+	 */
 	public function display()
 	{
 		$cat_rows	= $subcats = array();
@@ -320,11 +320,11 @@ 
 	}
 
 	/**
-	* Get informations about a cat or subcat
-	*
-	* @param	int	$cat_id		The category ID
-	* @return	null|false
-	*/
+	 * Get informations about a cat or subcat
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @return	null|false
+	 */
 	public function get($cat_id = 0)
 	{
 		if ($cat_id)
@@ -352,11 +352,11 @@ 
 	}
 
 	/**
-	* Create category navigation links for given category, create parent
-	* list if currently null, assign basic category info to template
-	*
-	* @param	array	$dir_cat_data
-	*/
+	 * Create category navigation links for given category, create parent
+	 * list if currently null, assign basic category info to template
+	 *
+	 * @param	array	$dir_cat_data
+	 */
 	public function generate_dir_nav(&$dir_cat_data)
 	{
 		global $phpbb_container;
@@ -393,12 +393,12 @@ 
 	}
 
 	/**
-	* Return good key language
-	*
-	* @param	bool	$validate	True if approbation needed before publication
-	* @return	string				Information about approval, depends on user auth level
-	* @throws	\phpbb\exception\runtime_exception
-	*/
+	 * Return good key language
+	 *
+	 * @param	bool	$validate	True if approbation needed before publication
+	 * @return	string				Information about approval, depends on user auth level
+	 * @throws	\phpbb\exception\runtime_exception
+	 */
 	public function dir_submit_type($validate)
 	{
 		if ($validate && !$this->auth->acl_get('a_'))
@@ -422,15 +422,15 @@ 
 	}
 
 	/**
-	* Category watching common code
-	*
-	* @param	string		$mode			Watch or unwatch a category
-	* @param	array		$s_watching		An empty array, passed by reference
-	* @param	int			$user_id		The user ID
-	* @param	int			$cat_id			The category ID
-	* @param	string		$notify_status	User is watching the category?
-	* @return	null|string
-	*/
+	 * Category watching common code
+	 *
+	 * @param	string		$mode			Watch or unwatch a category
+	 * @param	array		$s_watching		An empty array, passed by reference
+	 * @param	int			$user_id		The user ID
+	 * @param	int			$cat_id			The category ID
+	 * @param	string		$notify_status	User is watching the category?
+	 * @return	null|string
+	 */
 	public function watch_categorie($mode, &$s_watching, $user_id, $cat_id, $notify_status)
 	{
 		// Is user watching this thread?
@@ -516,11 +516,11 @@ 
 	}
 
 	/**
-	* Return Category name
-	*
-	* @param	int		$cat_id		The category ID
-	* @return	string				The category name
-	*/
+	 * Return Category name
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @return	string				The category name
+	 */
 	static public function getname($cat_id)
 	{
 		global $db;

core/comment.php

Indentation +22 added lines, -22 removed lines

@@ -22,11 +22,11 @@ 
 	protected $user;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface	$db		Database object
-	* @param \phpbb\user 						$user	User object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface	$db		Database object
+	 * @param \phpbb\user 						$user	User object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
 	{
 		$this->db	= $db;
@@ -34,11 +34,11 @@ 
 	}
 
 	/**
-	* Add a comment
-	*
-	* @param	array	$data	Link's data from db
-	* @return	null
-	*/
+	 * Add a comment
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	null
+	 */
 	public function add($data)
 	{
 		$this->db->sql_transaction('begin');
@@ -55,12 +55,12 @@ 
 	}
 
 	/**
-	* Edit a comment
-	*
-	* @param	array	$data		Data to edit
-	* @param	int		$comment_id	The comment ID
-	* @return	null
-	*/
+	 * Edit a comment
+	 *
+	 * @param	array	$data		Data to edit
+	 * @param	int		$comment_id	The comment ID
+	 * @return	null
+	 */
 	public function edit($data, $comment_id)
 	{
 		$sql = 'UPDATE ' . DIR_COMMENT_TABLE . '
@@ -70,12 +70,12 @@ 
 	}
 
 	/**
-	* Delete a comment
-	*
-	* @param	string	$link_id	The link ID
-	* @param	string	$comment_id	The comment ID
-	* @return	null
-	*/
+	 * Delete a comment
+	 *
+	 * @param	string	$link_id	The link ID
+	 * @param	string	$comment_id	The comment ID
+	 * @return	null
+	 */
 	public function del($link_id, $comment_id)
 	{
 		global $request;

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
 	{
-		$this->db	= $db;
+		$this->db = $db;
 		$this->user = $user;
 	}
 

core/link.php

Indentation +177 added lines, -177 removed lines

@@ -46,20 +46,20 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db				Database object
-	* @param \phpbb\config\config 					$config			Config 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\notification\manager			$notification	Notification object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper		PhpBB Directory extension helper 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\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\notification\manager			$notification	Notification object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper		PhpBB Directory extension helper 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\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
 		$this->db			= $db;
@@ -76,12 +76,12 @@ 
 	}
 
 	/**
-	* Add a link into db
-	*
-	* @param	array	$data			Contains all data to insert in db
-	* @param	bool	$need_approval	Links needs to be approved?
-	* @return	null
-	*/
+	 * Add a link into db
+	 *
+	 * @param	array	$data			Contains all data to insert in db
+	 * @param	bool	$need_approval	Links needs to be approved?
+	 * @return	null
+	 */
 	public function add($data, $need_approval)
 	{
 		$notification_data = array();
@@ -126,13 +126,13 @@ 
 	}
 
 	/**
-	* Edit a link of the db
-	*
-	* @param	array	$data			Contains all data to edit in db
-	* @param	int		$link_id		is link's id, for WHERE clause
-	* @param	bool	$need_approval	Links needs to be approved?
-	* @return	null
-	*/
+	 * Edit a link of the db
+	 *
+	 * @param	array	$data			Contains all data to edit in db
+	 * @param	int		$link_id		is link's id, for WHERE clause
+	 * @param	bool	$need_approval	Links needs to be approved?
+	 * @return	null
+	 */
 	public function edit($data, $link_id, $need_approval)
 	{
 		$notification_data = array(
@@ -184,12 +184,12 @@ 
 	}
 
 	/**
-	* Delete a link of the db
-	*
-	* @param	int 	$cat_id		The category ID
-	* @param	mixed 	$link_id	Link's id, for WHERE clause
-	* @return	null
-	*/
+	 * Delete a link of the db
+	 *
+	 * @param	int 	$cat_id		The category ID
+	 * @param	mixed 	$link_id	Link's id, for WHERE clause
+	 * @return	null
+	 */
 	public function del($cat_id, $link_id)
 	{
 		$this->db->sql_transaction('begin');
@@ -262,12 +262,12 @@ 
 	}
 
 	/**
-	* Increments link view counter
-	*
-	* @param	int		$link_id	Link's id, for WHERE clause
-	* @return	null
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Increments link view counter
+	 *
+	 * @param	int		$link_id	Link's id, for WHERE clause
+	 * @return	null
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
@@ -291,11 +291,11 @@ 
 	}
 
 	/**
-	* Verify that an URL exist before add into db
-	*
-	* @param	string	$url	The URL to check
-	* @return	bool			True if url is reachable, else false.
-	*/
+	 * Verify that an URL exist before add into db
+	 *
+	 * @param	string	$url	The URL to check
+	 * @return	bool			True if url is reachable, else false.
+	 */
 	public function checkurl($url)
 	{
 		$details = parse_url($url);
@@ -332,11 +332,11 @@ 
 	}
 
 	/**
-	* Delete the final '/', if no path
-	*
-	* @param	string	$url	URL to clean
-	* @return	string	$url	The correct string.
-	*/
+	 * Delete the final '/', if no path
+	 *
+	 * @param	string	$url	URL to clean
+	 * @return	string	$url	The correct string.
+	 */
 	public function clean_url($url)
 	{
 		$details = parse_url($url);
@@ -349,11 +349,11 @@ 
 	}
 
 	/**
-	* Display a flag
-	*
-	* @param	array	$data	Link's data from db
-	* @return	string			Flag path.
-	*/
+	 * Display a flag
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	string			Flag path.
+	 */
 	public function display_flag($data)
 	{
 		global $phpbb_extension_manager;
@@ -371,13 +371,13 @@ 
 	}
 
 	/**
-	* Calculate the link's note
-	*
-	* @param	int		$total_note		Sum of all link's notes
-	* @param	int		$nb_vote		Number of votes
-	* @param	bool	$votes_status	Votes are enable in this category?
-	* @return	string	$note			The calculated note.
-	*/
+	 * Calculate the link's note
+	 *
+	 * @param	int		$total_note		Sum of all link's notes
+	 * @param	int		$nb_vote		Number of votes
+	 * @param	bool	$votes_status	Votes are enable in this category?
+	 * @return	string	$note			The calculated note.
+	 */
 	public function display_note($total_note, $nb_vote, $votes_status)
 	{
 		if (!$votes_status)
@@ -392,11 +392,11 @@ 
 	}
 
 	/**
-	* Display the vote form for auth users
-	*
-	* @param	array	$data	Link's data from db
-	* @return	null|string		Html combo list or nothing if votes are not available.
-	*/
+	 * Display the vote form for auth users
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	null|string		Html combo list or nothing if votes are not available.
+	 */
 	public function display_vote($data)
 	{
 		if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id']))
@@ -413,11 +413,11 @@ 
 	}
 
 	/**
-	* Display the RSS icon
-	*
-	* @param	array	$data	Link's data from db
-	* @return	null|string		RSS feed URL or nothing.
-	*/
+	 * Display the RSS icon
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	null|string		RSS feed URL or nothing.
+	 */
 	public function display_rss($data)
 	{
 		if ($this->config['dir_activ_rss'] && !empty($data['link_rss']))
@@ -427,13 +427,13 @@ 
 	}
 
 	/**
-	* Display link's thumb if thumb service enabled.
-	* if thumb don't exists in db or if a new service was choosen in acp
-	* thumb is research
-	*
-	* @param	array		$data	Link's data from db
-	* @return	string|null			Thumb or null.
-	*/
+	 * Display link's thumb if thumb service enabled.
+	 * if thumb don't exists in db or if a new service was choosen in acp
+	 * thumb is research
+	 *
+	 * @param	array		$data	Link's data from db
+	 * @return	string|null			Thumb or null.
+	 */
 	public function display_thumb($data)
 	{
 		if ($this->config['dir_activ_thumb'])
@@ -454,11 +454,11 @@ 
 	}
 
 	/**
-	* Display and calculate PageRank if needed
-	*
-	* @param	array	$data	Link's data from db
-	* @return	string			Pagerank, 'n/a' or false
-	*/
+	 * Display and calculate PageRank if needed
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	string			Pagerank, 'n/a' or false
+	 */
 	public function display_pagerank($data)
 	{
 		if ($this->config['dir_activ_pagerank'])
@@ -488,11 +488,11 @@ 
 	}
 
 	/**
-	* Display and resize a banner
-	*
-	* @param	array	$data		link's data from db
-	* @return	string	$s_banner	html code.
-	*/
+	 * Display and resize a banner
+	 *
+	 * @param	array	$data		link's data from db
+	 * @return	string	$s_banner	html code.
+	 */
 	public function display_bann($data)
 	{
 		$s_banner = '';
@@ -526,11 +526,11 @@ 
 	}
 
 	/**
-	* Add a vote in db, for a specifi link
-	*
-	* @param	int		$link_id	Link_id from db
-	* @return	null
-	*/
+	 * Add a vote in db, for a specifi link
+	 *
+	 * @param	int		$link_id	Link_id from db
+	 * @return	null
+	 */
 	public function add_vote($link_id)
 	{
 		$data = array(
@@ -574,11 +574,11 @@ 
 	}
 
 	/**
-	* Search an appropriate thumb for url
-	*
-	* @param	string	$url	Link's url
-	* @return	string			The thumb url
-	*/
+	 * Search an appropriate thumb for url
+	 *
+	 * @param	string	$url	Link's url
+	 * @return	string			The thumb url
+	 */
 	public function thumb_process($url)
 	{
 		if (!$this->config['dir_activ_thumb'])
@@ -599,12 +599,12 @@ 
 	}
 
 	/**
-	* Check if ascreen thumb exists
-	*
-	* @param	string	$protocol	The protocol
-	* @param	string	$host		The hostname
-	* @return	bool				True if ascreen file exixts, else false
-	*/
+	 * Check if ascreen thumb exists
+	 *
+	 * @param	string	$protocol	The protocol
+	 * @param	string	$host		The hostname
+	 * @return	bool				True if ascreen file exixts, else false
+	 */
 	private function _ascreen_exist($protocol, $host)
 	{
 		if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg'))
@@ -619,12 +619,12 @@ 
 	}
 
 	/**
-	* Primary work on banner, can edit, copy or check a banner
-	*
-	* @param	string	$banner	The banner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	null
-	*/
+	 * Primary work on banner, can edit, copy or check a banner
+	 *
+	 * @param	string	$banner	The banner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	null
+	 */
 	public function banner_process(&$banner, &$error)
 	{
 		$old_banner = $this->request->variable('old_banner', '');
@@ -660,13 +660,13 @@ 
 	}
 
 	/**
-	* Copy a remonte banner to server.
-	* called by banner_process()
-	*
-	* @param	string	$banner The anner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	false|string	String if no errors, else false
-	*/
+	 * Copy a remonte banner to server.
+	 * called by banner_process()
+	 *
+	 * @param	string	$banner The anner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	false|string	String if no errors, else false
+	 */
 	private function _banner_upload($banner, &$error)
 	{
 		// Init upload class
@@ -697,13 +697,13 @@ 
 	}
 
 	/**
-	* Check than remote banner exists
-	* called by banner_process()
-	*
-	* @param	string	$banner	The banner's remote url
-	* @param	array	$error	The array error, passed by reference
-	* @return	false|string	String if no errors, else false
-	*/
+	 * Check than remote banner exists
+	 * called by banner_process()
+	 *
+	 * @param	string	$banner	The banner's remote url
+	 * @param	array	$error	The array error, passed by reference
+	 * @return	false|string	String if no errors, else false
+	 */
 	private function _banner_remote($banner, &$error)
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
@@ -810,11 +810,11 @@ 
 	}
 
 	/**
-	* Delete a banner from server
-	*
-	* @param	string	$file	The file's name
-	* @return	bool			True if delete success, else false
-	*/
+	 * Delete a banner from server
+	 *
+	 * @param	string	$file	The file's name
+	 * @return	bool			True if delete success, else false
+	 */
 	private function _banner_delete($file)
 	{
 		if (file_exists($this->dir_helper->get_banner_path($file)))
@@ -827,18 +827,18 @@ 
 	}
 
 	/**
-	* PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
-	*
-	* @copyright 2012 HM2K <hm2k@php.net>
-	* @link http://pagerank.phurix.net/
-	* @author James Wade <hm2k@php.net>
-	* @version $Revision: 2.1 $
-	* @require PHP 4.3.0 (file_get_contents)
-	* @updated 06/10/11
-	*
-	* @param	string		$q	The website URL
-	* @return	string			The calculated pagerank, or -1
-	*/
+	 * PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
+	 *
+	 * @copyright 2012 HM2K <hm2k@php.net>
+	 * @link http://pagerank.phurix.net/
+	 * @author James Wade <hm2k@php.net>
+	 * @version $Revision: 2.1 $
+	 * @require PHP 4.3.0 (file_get_contents)
+	 * @updated 06/10/11
+	 *
+	 * @param	string		$q	The website URL
+	 * @return	string			The calculated pagerank, or -1
+	 */
 	public function pagerank_process($q)
 	{
 		$googleDomains	= array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
@@ -872,12 +872,12 @@ 
 	}
 
 	/**
-	* List flags
-	*
-	* @param	string	$flag_path	The flag directory path
-	* @param	string	$value		Selected flag
-	* @return	string	$list		Html code
-	*/
+	 * List flags
+	 *
+	 * @param	string	$flag_path	The flag directory path
+	 * @param	string	$value		Selected flag
+	 * @return	string	$list		Html code
+	 */
 	public function get_dir_flag_list($flag_path, $value)
 	{
 		$list = '';
@@ -912,10 +912,10 @@ 
 	}
 
 	/**
-	* Display recents links added
-	*
-	* @return	null
-	*/
+	 * Display recents links added
+	 *
+	 * @return	null
+	 */
 	public function recents()
 	{
 		if ($this->config['dir_recent_block'])
@@ -992,13 +992,13 @@ 
 	}
 
 	/**
-	* Validate back link
-	*
-	* @param	string		$remote_url	Page URL contains the backlink
-	* @param	bool		$optional	Link back is optional in this category?
-	* @param	bool		$cron		This methos is called by con process?
-	* @return	false|string			Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-	*/
+	 * Validate back link
+	 *
+	 * @param	string		$remote_url	Page URL contains the backlink
+	 * @param	bool		$optional	Link back is optional in this category?
+	 * @param	bool		$cron		This methos is called by con process?
+	 * @return	false|string			Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
+	 */
 	public function validate_link_back($remote_url, $optional, $cron = false)
 	{
 		if (!$cron)
@@ -1038,14 +1038,14 @@ 
 	}
 
 	/**
-	* Check, for website with backlink specified, if backlink is always here.
-	* After $nb_check verification, website is deleted, otherwise, a notification is send to poster
-	*
-	* @param	int		$cat_id		The categoryID
-	* @param	int		$nb_check	Number of check before demete a website
-	* @param	int		$next_prune	Date of next auto check
-	* @return	null
-	*/
+	 * Check, for website with backlink specified, if backlink is always here.
+	 * After $nb_check verification, website is deleted, otherwise, a notification is send to poster
+	 *
+	 * @param	int		$cat_id		The categoryID
+	 * @param	int		$nb_check	Number of check before demete a website
+	 * @param	int		$next_prune	Date of next auto check
+	 * @return	null
+	 */
 	private function _check($cat_id, $nb_check, $next_prune)
 	{
 		$del_array = $update_array = array();
@@ -1093,11 +1093,11 @@ 
 	}
 
 	/**
-	* Method called by cron task.
-	*
-	* @param	array	$cat_data	Information about category, from db
-	* @return	null
-	*/
+	 * Method called by cron task.
+	 *
+	 * @param	array	$cat_data	Information about category, from db
+	 * @return	null
+	 */
 	public function auto_check($cat_data)
 	{
 		global $phpbb_log;
@@ -1127,12 +1127,12 @@ 
 	}
 
 	/**
-	* Update website verification number after a missing backlink, and send notificaton
-	*
-	* @param	array	$u_array	Information about website
-	* @param	int		$next_prune	Date of next auto check
-	* @return	null
-	*/
+	 * Update website verification number after a missing backlink, and send notificaton
+	 *
+	 * @param	array	$u_array	Information about website
+	 * @param	int		$next_prune	Date of next auto check
+	 * @return	null
+	 */
 	private function _update_check($u_array, $next_prune)
 	{
 		if (!class_exists('messenger'))

Spacing +43 added lines, -43 removed lines

@@ -62,17 +62,17 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->notification	= $notification;
-		$this->dir_helper	= $dir_helper;
-		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->notification = $notification;
+		$this->dir_helper = $dir_helper;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -223,11 +223,11 @@ 
 
 		foreach ($link_datas_ary as $table => $field)
 		{
-			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
+			$this->db->sql_query("DELETE FROM $table WHERE " . $this->db->sql_in_set($field, $url_array));
 		}
 
 		$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-			SET cat_links = cat_links - '.sizeof($url_array).'
+			SET cat_links = cat_links - '.sizeof($url_array) . '
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
 
@@ -311,8 +311,8 @@ 
 
 		if ($sock = @fsockopen($details['host'], $details['port'], $errno, $errstr, 1))
 		{
-			$requete = 'GET '.$details['path']." HTTP/1.1\r\n";
-			$requete .= 'Host: '.$details['host']."\r\n\r\n";
+			$requete = 'GET ' . $details['path'] . " HTTP/1.1\r\n";
+			$requete .= 'Host: ' . $details['host'] . "\r\n\r\n";
 
 			// Send a HTTP GET header
 			fputs($sock, $requete);
@@ -359,7 +359,7 @@ 
 		global $phpbb_extension_manager;
 
 		$ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
-		$flag_path = $ext_path.'images/flags/';
+		$flag_path = $ext_path . 'images/flags/';
 		$img_flag = 'no_flag.png';
 
 		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path . $data['link_flag']))
@@ -477,12 +477,12 @@ 
 				$pagerank = (int) $data['link_pagerank'];
 			}
 
-			$prpos=40*$pagerank/10;
-			$prneg=40-$prpos;
-			$html='<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
+			$prpos = 40 * $pagerank / 10;
+			$prneg = 40 - $prpos;
+			$html = '<img src="http://www.google.com/images/pos.gif" width="' . $prpos . '" height="4" alt="' . $pagerank . '" /><img src="http://www.google.com/images/neg.gif" width="' . $prneg . '" height="4" alt="' . $pagerank . '" /> ';
 
 			$pagerank = $pagerank == '-1' ? $this->user->lang['DIR_PAGERANK_NOT_AVAILABLE'] : $this->user->lang('DIR_FROM_TEN', $pagerank);
-			return $html.$pagerank;
+			return $html . $pagerank;
 		}
 		return false;
 	}
@@ -519,7 +519,7 @@ 
 				$height /= $coef_max;
 			}
 
-			$s_banner = '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			$s_banner = '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="' . $data['link_name'] . '" title="' . $data['link_name'] . '" />';
 		}
 
 		return $s_banner;
@@ -554,7 +554,7 @@ 
 
 		if ($this->request->is_ajax())
 		{
-			$sql= 'SELECT link_vote, link_note FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int) $link_id;
+			$sql = 'SELECT link_vote, link_note FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
 
@@ -583,19 +583,19 @@ 
 	{
 		if (!$this->config['dir_activ_thumb'])
 		{
-			return $this->root_path.'images/directory/nothumb.gif';
+			return $this->root_path . 'images/directory/nothumb.gif';
 		}
 
 		$details = parse_url($url);
 
-		$root_url		= $details['scheme'].'://'.$details['host'];
-		$absolute_url	= isset($details['path']) ? $root_url.$details['path'] : $root_url;
+		$root_url = $details['scheme'] . '://' . $details['host'];
+		$absolute_url = isset($details['path']) ? $root_url . $details['path'] : $root_url;
 
 		if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
 		{
-			return $root_url.'/ascreen.jpg';
+			return $root_url . '/ascreen.jpg';
 		}
-		return $this->config['dir_thumb_service'].$absolute_url;
+		return $this->config['dir_thumb_service'] . $absolute_url;
 	}
 
 	/**
@@ -607,7 +607,7 @@ 
 	*/
 	private function _ascreen_exist($protocol, $host)
 	{
-		if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg'))
+		if ($thumb_info = @getimagesize($protocol . '://' . $host . '/ascreen.jpg'))
 		{
 			// Obviously this is an image, we did some additional tests
 			if ($thumb_info[0] == '120' && $thumb_info[1] == '90' && $thumb_info['mime'] == 'image/jpeg')
@@ -693,7 +693,7 @@ 
 			return false;
 		}
 
-		return $prefix .strtolower($file->uploadname);
+		return $prefix . strtolower($file->uploadname);
 	}
 
 	/**
@@ -738,8 +738,8 @@ 
 			include($this->root_path . 'includes/functions_upload.' . $this->php_ext);
 		}
 
-		$types		= \fileupload::image_types();
-		$extension	= strtolower(\filespec::get_extension($banner));
+		$types = \fileupload::image_types();
+		$extension = strtolower(\filespec::get_extension($banner));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($banner, 'r'))
@@ -841,14 +841,14 @@ 
 	*/
 	public function pagerank_process($q)
 	{
-		$googleDomains	= array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
-		$seed			= $this->user->lang['SEED'];
-		$result			= 0x01020345;
+		$googleDomains = array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
+		$seed = $this->user->lang['SEED'];
+		$result = 0x01020345;
 		$len			= strlen($q);
 
-		for ($i=0; $i<$len; $i++)
+		for ($i = 0; $i < $len; $i++)
 		{
-			$result ^= ord($seed{$i%strlen($seed)}) ^ ord($q{$i});
+			$result ^= ord($seed{$i % strlen($seed)}) ^ ord($q{$i});
 			$result = (($result >> 23) & 0x1ff) | $result << 9;
 		}
 
@@ -859,10 +859,10 @@ 
 
 		$ch		= sprintf('8%x', $result);
 		$url	= 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
-		$host	= 'toolbarqueries.google'.$googleDomains[mt_rand(0,count($googleDomains)-1)];
+		$host = 'toolbarqueries.google' . $googleDomains[mt_rand(0, count($googleDomains) - 1)];
 
-		$url	= sprintf($url,$host,$ch,$q);
-		@$pr	= trim(file_get_contents($url,false));
+		$url	= sprintf($url, $host, $ch, $q);
+		@$pr	= trim(file_get_contents($url, false));
 
 		if (is_numeric(substr(strrchr($pr, ':'), 1)))
 		{
@@ -900,9 +900,9 @@ 
 
 		foreach ($flags as $file => $name)
 		{
-			$img_file = strtolower(substr(strrchr($file, '_'), 1)).'.png';
+			$img_file = strtolower(substr(strrchr($file, '_'), 1)) . '.png';
 
-			if (file_exists($flag_path.$img_file))
+			if (file_exists($flag_path . $img_file))
 			{
 				$list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
 			}
@@ -920,8 +920,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
 			$sql_array = array(
 				'SELECT'	=> 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
@@ -937,7 +937,7 @@ 
 							'ON'	=> 'l.link_cat = c.cat_id'
 						)
 				),
-				'WHERE'		=> $this->db->sql_in_set('l.link_cat', $exclude_array, true).' AND l.link_active = 1',
+				'WHERE'		=> $this->db->sql_in_set('l.link_cat', $exclude_array, true) . ' AND l.link_active = 1',
 				'ORDER_BY'	=> 'l.link_time DESC, l.link_id DESC');
 
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -965,7 +965,7 @@ 
 					}
 
 					$this->template->assign_block_vars('block.row.col', array(
-						'UC_THUMBNAIL'            => '<a href="'.$row['link_url'].'" onclick="window.open(\''.$this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $row['link_id'])).'\'); return false;"><img src="'.$row['link_thumb'].'" title="'.$row['link_name'].'" alt="'.$row['link_name'].'" /></a>',
+						'UC_THUMBNAIL'            => '<a href="' . $row['link_url'] . '" onclick="window.open(\'' . $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $row['link_id'])) . '\'); return false;"><img src="' . $row['link_thumb'] . '" title="' . $row['link_name'] . '" alt="' . $row['link_name'] . '" /></a>',
 						'NAME'                    => $row['link_name'],
 						'USER'                    => get_username_string('full', $row['link_user_id'], $row['username'], $row['user_colour']),
 						'TIME'                    => ($row['link_time']) ? $this->user->format_date($row['link_time']) : '',
@@ -1060,7 +1060,7 @@ 
 						'ON'	=> 'l.link_user_id = u.user_id'
 					)
 			),
-			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '  . (int) $cat_id);
+			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = ' . (int) $cat_id);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
 		$result = $this->db->sql_query($sql);
@@ -1069,7 +1069,7 @@ 
 		{
 			if ($this->validate_link_back($row['link_back'], false, true) !== false)
 			{
-				if (!$nb_check || ($row['link_nb_check']+1) >= $nb_check)
+				if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check)
 				{
 					$del_array[] = $row['link_id'];
 				}

core/nestedset_category.php

Indentation +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 class nestedset_category extends \phpbb\tree\nestedset
 {
 	/**
-	* Construct
-	*
-	* @param \phpbb\db\driver\driver_interface	$db		Database connection
-	* @param \phpbb\lock\db						$lock	Lock class used to lock the table when moving forums around
-	*/
+	 * Construct
+	 *
+	 * @param \phpbb\db\driver\driver_interface	$db		Database connection
+	 * @param \phpbb\lock\db						$lock	Lock class used to lock the table when moving forums around
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock)
 	{
 		parent::__construct(

event/listener.php

Indentation +45 added lines, -45 removed lines

@@ -39,17 +39,17 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface		$db				Database object
-	* @param \phpbb\controller\helper				$helper			Controller helper object
-	* @param \phpbb\template\template				$template		Template object
-	* @param \phpbb\user							$user			User object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper		PhpBB Directory extension helper object
-	* @param string									$table_prefix 	prefix table
-	* @param string									$php_ext 		phpEx
-	* @access public
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface		$db				Database object
+	 * @param \phpbb\controller\helper				$helper			Controller helper object
+	 * @param \phpbb\template\template				$template		Template object
+	 * @param \phpbb\user							$user			User object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper		PhpBB Directory extension helper object
+	 * @param string									$table_prefix 	prefix table
+	 * @param string									$php_ext 		phpEx
+	 * @access public
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\helper $dir_helper, $table_prefix, $php_ext)
 	{
 		$this->db			= $db;
@@ -62,12 +62,12 @@ 
 	}
 
 	/**
-	* Assign functions defined in this class to event listeners in the core
-	*
-	* @return	array
-	* @static
-	* @access	public
-	*/
+	 * Assign functions defined in this class to event listeners in the core
+	 *
+	 * @return	array
+	 * @static
+	 * @access	public
+	 */
 	static public function getSubscribedEvents()
 	{
 		return array(
@@ -81,10 +81,10 @@ 
 	}
 
 	/**
-	* Define table constants
-	*
-	* @return null
-	*/
+	 * Define table constants
+	 *
+	 * @return null
+	 */
 	public function set_constants_tables()
 	{
 		define('DIR_CAT_TABLE', $this->table_prefix.'directory_cats');
@@ -95,10 +95,10 @@ 
 	}
 
 	/**
-	* Display links to Directory
-	*
-	* @return null
-	*/
+	 * Display links to Directory
+	 *
+	 * @return null
+	 */
 	public function add_page_header_variables()
 	{
 		$ext_theme_path		= $this->dir_helper->get_ext_name() . '/styles/prosilver/theme/';
@@ -118,11 +118,11 @@ 
 	}
 
 	/**
-	* Show users as viewing Directory on Who Is Online page
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Show users as viewing Directory on Who Is Online page
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function add_page_viewonline($event)
 	{
 		if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/directory') === 0)
@@ -133,11 +133,11 @@ 
 	}
 
 	/**
-	* Load common language files during user setup
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Load common language files during user setup
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function load_language_on_setup($event)
 	{
 		$lang_set_ext = $event['lang_set_ext'];
@@ -149,11 +149,11 @@ 
 	}
 
 	/**
-	* Add administrative permissions to manage Directory
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Add administrative permissions to manage Directory
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function permissions_add_directory($event)
 	{
 		$categories				= $event['categories'];
@@ -182,11 +182,11 @@ 
 	}
 
 	/**
-	* Update Directory tables if needed, after deleted an user
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Update Directory tables if needed, after deleted an user
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function update_links_with_anonymous($event)
 	{
 		$user_ids = $event['user_ids'];

Spacing +27 added lines, -27 removed lines

@@ -52,13 +52,13 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\helper $dir_helper, $table_prefix, $php_ext)
 	{
-		$this->db			= $db;
-		$this->helper 		= $helper;
-		$this->template 	= $template;
-		$this->user 		= $user;
-		$this->dir_helper	= $dir_helper;
+		$this->db = $db;
+		$this->helper = $helper;
+		$this->template = $template;
+		$this->user = $user;
+		$this->dir_helper = $dir_helper;
 		$this->table_prefix = $table_prefix;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -87,11 +87,11 @@ 
 	*/
 	public function set_constants_tables()
 	{
-		define('DIR_CAT_TABLE', $this->table_prefix.'directory_cats');
-		define('DIR_COMMENT_TABLE', $this->table_prefix.'directory_comments');
-		define('DIR_LINK_TABLE', $this->table_prefix.'directory_links');
-		define('DIR_VOTE_TABLE', $this->table_prefix.'directory_votes');
-		define('DIR_WATCH_TABLE', $this->table_prefix.'directory_watch');
+		define('DIR_CAT_TABLE', $this->table_prefix . 'directory_cats');
+		define('DIR_COMMENT_TABLE', $this->table_prefix . 'directory_comments');
+		define('DIR_LINK_TABLE', $this->table_prefix . 'directory_links');
+		define('DIR_VOTE_TABLE', $this->table_prefix . 'directory_votes');
+		define('DIR_WATCH_TABLE', $this->table_prefix . 'directory_watch');
 	}
 
 	/**
@@ -127,8 +127,8 @@ 
 	{
 		if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/directory') === 0)
 		{
-			$event['location']		= $this->user->lang['DIRECTORY'];
-			$event['location_url']	= $this->helper->route('ernadoo_phpbbdirectory_base_controller');
+			$event['location'] = $this->user->lang['DIRECTORY'];
+			$event['location_url'] = $this->helper->route('ernadoo_phpbbdirectory_base_controller');
 		}
 	}
 
@@ -158,24 +158,24 @@ 
 	{
 		$categories				= $event['categories'];
 		$categories				= array_merge($categories, array('dir' => 'ACL_CAT_DIRECTORY'));
-		$event['categories']	= $categories;
+		$event['categories'] = $categories;
 
 		$permissions = $event['permissions'];
 
 		$permissions = array_merge($permissions, array(
-			'm_delete_dir'			=> array('lang' => 'ACL_M_DELETE_DIR', 			'cat' => 'dir'),
-			'm_delete_comment_dir'	=> array('lang' => 'ACL_M_DELETE_COMMENT_DIR',	'cat' => 'dir'),
-			'm_edit_dir'			=> array('lang' => 'ACL_M_EDIT_DIR',			'cat' => 'dir'),
-			'm_edit_comment_dir'	=> array('lang' => 'ACL_M_EDIT_COMMENT_DIR',	'cat' => 'dir'),
-
-			'u_comment_dir'			=> array('lang' => 'ACL_U_COMMENT_DIR',			'cat' => 'dir'),
-			'u_delete_dir'			=> array('lang' => 'ACL_U_DELETE_DIR',			'cat' => 'dir'),
-			'u_delete_comment_dir'	=> array('lang' => 'ACL_U_DELETE_COMMENT_DIR',	'cat' => 'dir'),
-			'u_edit_dir'			=> array('lang' => 'ACL_U_EDIT_DIR',			'cat' => 'dir'),
-			'u_edit_comment_dir'	=> array('lang' => 'ACL_U_EDIT_COMMENT_DIR',	'cat' => 'dir'),
-			'u_search_dir'			=> array('lang' => 'ACL_U_SEARCH_DIR',			'cat' => 'dir'),
-			'u_submit_dir'			=> array('lang' => 'ACL_U_SUBMIT_DIR',			'cat' => 'dir'),
-			'u_vote_dir'			=> array('lang' => 'ACL_U_VOTE_DIR',			'cat' => 'dir'),
+			'm_delete_dir'			=> array('lang' => 'ACL_M_DELETE_DIR', 'cat' => 'dir'),
+			'm_delete_comment_dir'	=> array('lang' => 'ACL_M_DELETE_COMMENT_DIR', 'cat' => 'dir'),
+			'm_edit_dir'			=> array('lang' => 'ACL_M_EDIT_DIR', 'cat' => 'dir'),
+			'm_edit_comment_dir'	=> array('lang' => 'ACL_M_EDIT_COMMENT_DIR', 'cat' => 'dir'),
+
+			'u_comment_dir'			=> array('lang' => 'ACL_U_COMMENT_DIR', 'cat' => 'dir'),
+			'u_delete_dir'			=> array('lang' => 'ACL_U_DELETE_DIR', 'cat' => 'dir'),
+			'u_delete_comment_dir'	=> array('lang' => 'ACL_U_DELETE_COMMENT_DIR', 'cat' => 'dir'),
+			'u_edit_dir'			=> array('lang' => 'ACL_U_EDIT_DIR', 'cat' => 'dir'),
+			'u_edit_comment_dir'	=> array('lang' => 'ACL_U_EDIT_COMMENT_DIR', 'cat' => 'dir'),
+			'u_search_dir'			=> array('lang' => 'ACL_U_SEARCH_DIR', 'cat' => 'dir'),
+			'u_submit_dir'			=> array('lang' => 'ACL_U_SUBMIT_DIR', 'cat' => 'dir'),
+			'u_vote_dir'			=> array('lang' => 'ACL_U_VOTE_DIR', 'cat' => 'dir'),
 		));
 
 		$event['permissions'] = $permissions;