ErnadoO / ext-phpbb-directory

search/fulltext_directory.php

Indentation +20 added lines, -20 removed lines

@@ -16,32 +16,32 @@
 	protected $db;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface $db
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface $db
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db)
 	{
 		$this->db = $db;
 	}
 
 	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	array		$keywords_ary		contains each words to search
-	* @param	string		$fields				contains either titleonly (link titles should be searched), desconly (only description bodies should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_cid_ary			specifies an array of category ids which should not be searched
-	* @param	int			$cat_id				is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	int								total number of results
-	*/
+	 * Performs a search on keywords depending on display specific params. You have to run split_keywords() first
+	 *
+	 * @param	array		$keywords_ary		contains each words to search
+	 * @param	string		$fields				contains either titleonly (link titles should be searched), desconly (only description bodies should be searched)
+	 * @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
+	 * @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
+	 * @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
+	 * @param	string		$sort_dir			is either a or d representing ASC and DESC
+	 * @param	string		$sort_days			specifies the maximum amount of days a post may be old
+	 * @param	array		$ex_cid_ary			specifies an array of category ids which should not be searched
+	 * @param	int			$cat_id				is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
+	 * @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
+	 * @param	int			$start				indicates the first index of the page
+	 * @param	int			$per_page			number of ids each page is supposed to contain
+	 * @return	int								total number of results
+	 */
 	public function keyword_search($keywords_ary, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_cid_ary, $cat_id, &$id_ary, $start, $per_page)
 	{
 		$matches = array();

Spacing +9 added lines, -9 removed lines

@@ -69,20 +69,20 @@ 
 			$match_search_query = '';
 			foreach ($matches as $match)
 			{
-				$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') ';
-				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . strtolower($word) . $this->db->get_any_char()));
+				$match_search_query .= (($match_search_query) ? ' OR ' : '').'LOWER('.$match.') ';
+				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char().strtolower($word).$this->db->get_any_char()));
 			}
-			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')';
+			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')).'('.$match_search_query.')';
 		}
 		$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql_array = array(
@@ -90,10 +90,10 @@ 
 			'FROM'		=> array(
 					$this->links_table	=> 'l'),
 			'WHERE'		=> 'l.link_active = 1
-				' . (($search_query) ? 'AND (' . $search_query . ')' : '') . '
-				' . (sizeof($ex_cid_ary) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '') . '
-				' . (($cat_id) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $cat_id) : '') . '
-				' . (($sort_days) ? ' AND l.link_time >= ' . (time() - ($sort_days * 86400)) : ''),
+				' . (($search_query) ? 'AND ('.$search_query.')' : '').'
+				' . (sizeof($ex_cid_ary) ? ' AND '.$this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '').'
+				' . (($cat_id) ? ' AND '.$this->db->sql_in_set('l.link_cat', $cat_id) : '').'
+				' . (($sort_days) ? ' AND l.link_time >= '.(time() - ($sort_days * 86400)) : ''),
 			'ORDER_BY'	=> $sql_sort_order
 		);
 

migrations/v20x/v2_0_0.php

Indentation +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 class v2_0_0 extends \phpbb\db\migration\container_aware_migration
 {
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	static public function depends_on()
 	{
 		return array(
@@ -23,8 +23,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_data()
 	{
 		return array(

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		{
 			$default_reparser = new $fast_reparsers[0][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[0][1]);
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[0][1]);
 
 			$resume_data = array(
 				'reparser'	=> 0,
@@ -60,7 +60,7 @@ 
 		{
 			$reparser = new $fast_reparsers[$resume_data['reparser']][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[$resume_data['reparser']][1]
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[$resume_data['reparser']][1]
 				);
 
 			// New reparser

textreparser/plugins/comment_text.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 class comment_text extends \phpbb\textreparser\row_based_plugin
 {
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function get_columns()
 	{
 		return array(

acp/phpbbdirectory_module.php

Indentation +16 added lines, -16 removed lines

@@ -19,10 +19,10 @@ 
 	public $u_action;
 
 	/**
-	*
-	* @param int	$id
-	* @param string	$mode
-	*/
+	 *
+	 * @param int	$id
+	 * @param string	$mode
+	 */
 	public function main($id, $mode)
 	{
 		global $request, $phpbb_container;
@@ -187,11 +187,11 @@ 
 	}
 
 	/**
-	* Display thumb services available
-	*
-	* @param 	string	$url_selected
-	* @return 	string
-	*/
+	 * Display thumb services available
+	 *
+	 * @param 	string	$url_selected
+	 * @return 	string
+	 */
 	public function get_thumb_service_list($url_selected)
 	{
 		$thumbshot = array(
@@ -211,11 +211,11 @@ 
 	}
 
 	/**
-	* Display order drop-down list
-	*
-	* @param	string	$order_selected
-	* @return	string
-	*/
+	 * Display order drop-down list
+	 *
+	 * @param	string	$order_selected
+	 * @return	string
+	 */
 	public function get_order_list($order_selected)
 	{
 		global $user;
@@ -244,8 +244,8 @@ 
 	}
 
 	/**
-	* Adjust all three max_filesize config vars for display
-	*/
+	 * Adjust all three max_filesize config vars for display
+	 */
 	public function max_filesize($value, $key = '')
 	{
 		// Determine size var and adjust the value accordingly

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
 		{
 			$selected = ($url == $url_selected) ? 'selected="selected"' : '';
 
-			$select_options .= '<option value="' . $url . '" ' . $selected . '>' . parse_url($url, PHP_URL_HOST) . '</option>';
+			$select_options .= '<option value="'.$url.'" '.$selected.'>'.parse_url($url, PHP_URL_HOST).'</option>';
 		}
 
 		return $select_options;
@@ -237,7 +237,7 @@ 
 		{
 			$selected = ($i == $order_selected) ? 'selected="selected"' : '';
 			$order_substr = trim(str_replace(' ', '_', $i));
-			$tpl .= '<option value="' . $i . '" ' . $selected . '>' . $user->lang['DIR_ORDER_' . strtoupper($order_substr)] . '</option>';
+			$tpl .= '<option value="'.$i.'" '.$selected.'>'.$user->lang['DIR_ORDER_'.strtoupper($order_substr)].'</option>';
 		}
 
 		return ($tpl);
@@ -254,6 +254,6 @@ 
 		$value = $filesize['value'];
 
 		// size and maxlength must not be specified for input of type number
-		return '<input type="number" id="' . $key . '" min="0" max="999999999999999" step="any" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		return '<input type="number" id="'.$key.'" min="0" max="999999999999999" step="any" name="config['.$key.']" value="'.$value.'" /> <select name="'.$key.'">'.size_select_options($size_var).'</select>';
 	}
 }

controller/comments.php

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)

Indentation +64 added lines, -64 removed lines

@@ -61,23 +61,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;
@@ -109,13 +109,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);
@@ -154,13 +154,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);
@@ -191,12 +191,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);
@@ -222,14 +222,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);
@@ -322,13 +322,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'))
@@ -416,12 +416,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
@@ -447,12 +447,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)
 	{
 		$this->user->add_lang(array('ucp', 'posting'));

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;
@@ -127,7 +127,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);
@@ -144,7 +144,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
@@ -166,7 +166,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);
@@ -179,7 +179,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)
@@ -235,15 +235,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');
@@ -263,10 +263,10 @@ 
 					),
 					array(
 						'FROM'	=> array(ZEBRA_TABLE => 'z'),
-						'ON'	=> 'z.user_id = ' . (int) $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id'
+						'ON'	=> 'z.user_id = '.(int) $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);
@@ -295,12 +295,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'])) : '',
-				'L_POST_DISPLAY'	=> ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $comments['comment_id'] . '" href="' . $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id, 'page' => $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->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id, 'page' => $page)).'?c='.(int) $comments['comment_id'].'&view=show#c'.(int) $comments['comment_id'].'">', '</a>') : '',
 
 				'S_INFO'			=> $this->auth->acl_get('m_info'),
 			));
@@ -340,7 +340,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(
@@ -402,7 +402,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
@@ -425,7 +425,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');
@@ -469,11 +469,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);
@@ -483,11 +483,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/acp/validation.php

Spacing +21 added lines, -21 removed lines

@@ -84,21 +84,21 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
-		$this->config		= $config;
-		$this->db			= $db;
-		$this->pagination	= $pagination;
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
 		$this->language		= $language;
 		$this->phpbb_log	= $log;
-		$this->notification	= $notification;
-		$this->request		= $request;
+		$this->notification = $notification;
+		$this->request = $request;
 		$this->template		= $template;
 		$this->user			= $user;
 		$this->categorie	= $categorie;
 		$this->link			= $link;
 		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 
-		$this->action		= $this->request->variable('action', '');
+		$this->action = $this->request->variable('action', '');
 	}
 
 	/**
@@ -127,14 +127,14 @@ 
 		global $phpbb_admin_path;
 
 		// Sort keys
-		$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');
 
 		// Number of entries to display
 		$per_page = $this->request->variable('links_per_page', (int) $this->config['dir_show']);
 
-		$start	= $this->request->variable('start', 0);
+		$start = $this->request->variable('start', 0);
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->language->lang('SEE_ALL'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR'));
@@ -150,15 +150,15 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql = 'SELECT COUNT(1) AS total_links
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_active = 0' .
 				(($sql_where) ? " AND link_time >= $sql_where" : '');
 		$result = $this->db->sql_query($sql);
@@ -182,7 +182,7 @@ 
 					'ON'	=> 'u.user_id = l.link_user_id'
 				)
 			),
-			'WHERE'		=> 'l.link_active = 0' . (($sql_where) ? " AND l.link_time >= $sql_where" : ''),
+			'WHERE'		=> 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
 			'ORDER_BY'	=> $sql_sort_order);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -209,7 +209,7 @@ 
 
 		$option_ary = array('approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE');
 
-		$base_url = $this->u_action . "&$u_sort_param&links_per_page=$per_page";
+		$base_url = $this->u_action."&$u_sort_param&links_per_page=$per_page";
 		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
 
 		$this->template->assign_vars(array(
@@ -220,7 +220,7 @@ 
 			'S_SORT_DIR'		=> $s_sort_dir,
 			'LINKS_PER_PAGE'	=> $per_page,
 
-			'U_ACTION'			=> $this->u_action . "&$u_sort_param&links_per_page=$per_page&start=$start",
+			'U_ACTION'			=> $this->u_action."&$u_sort_param&links_per_page=$per_page&start=$start",
 		));
 	}
 
@@ -248,7 +248,7 @@ 
 				return;
 		}
 
-		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_' . strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	{
 		if (!class_exists('messenger'))
 		{
-			include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
+			include($this->root_path.'includes/functions_messenger.'.$this->php_ext);
 		}
 		$messenger = new \messenger(false);
 
@@ -327,15 +327,15 @@ 
 				'link_cat'		=> (int) $row['link_cat'],
 			);
 
-			$sql = 'UPDATE ' . $this->links_table . '
-							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+			$sql = 'UPDATE '.$this->links_table.'
+							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE link_id = ' . (int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 
 		foreach ($this->cat_data as $cat_id => $count)
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = ' . (int) $cat_id;
 			$this->db->sql_query($sql);
@@ -361,7 +361,7 @@ 
 				}
 			}
 
-			$sql = 'DELETE FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $row['link_id'];
+			$sql = 'DELETE FROM '.$this->links_table.' WHERE link_id = '.(int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 	}

Indentation +58 added lines, -58 removed lines

@@ -69,22 +69,22 @@ 
 	private $links_data;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\config\config								$config				Config object
-	* @param \phpbb\db\driver\driver_interface 					$db					Database object
-	* @param \phpbb\pagination									$pagination			Pagination object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\log\log										$log				Log object
-	* @param \phpbb\notification\manager						$notification		Notification object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link				PhpBB Directory extension link object
-	* @param string												$root_path			phpBB root path
-	* @param string												$php_ext   			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config								$config				Config object
+	 * @param \phpbb\db\driver\driver_interface 					$db					Database object
+	 * @param \phpbb\pagination									$pagination			Pagination object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\log\log										$log				Log object
+	 * @param \phpbb\notification\manager						$notification		Notification object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link				PhpBB Directory extension link object
+	 * @param string												$root_path			phpBB root path
+	 * @param string												$php_ext   			phpEx
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
 		$this->config		= $config;
@@ -105,11 +105,11 @@ 
 	}
 
 	/**
-	* Display confirm box
-	*
-	* @param	array $mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Display confirm box
+	 *
+	 * @param	array $mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	public function display_confirm($mark)
 	{
 		$s_hidden_fields = array(
@@ -121,10 +121,10 @@ 
 	}
 
 	/**
-	* Display website list for (dis)approval
-	*
-	* @return null
-	*/
+	 * Display website list for (dis)approval
+	 *
+	 * @return null
+	 */
 	public function display_websites()
 	{
 		global $phpbb_admin_path;
@@ -228,11 +228,11 @@ 
 	}
 
 	/**
-	* Get link's information and call appropriate action
-	*
-	* @param	array $mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Get link's information and call appropriate action
+	 *
+	 * @param	array $mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	public function exec_action($mark)
 	{
 		$this->_get_infos_links($mark);
@@ -255,10 +255,10 @@ 
 	}
 
 	/**
-	* Notify users which had submitted their websites
-	*
-	* @return null
-	*/
+	 * Notify users which had submitted their websites
+	 *
+	 * @return null
+	 */
 	public function notifiy_submiters()
 	{
 		if (!class_exists('messenger'))
@@ -302,22 +302,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;
 	}
 
 	/**
-	* Approve action
-	*
-	* @return null
-	*/
+	 * Approve action
+	 *
+	 * @return null
+	 */
 	private function _action_approved()
 	{
 		foreach ($this->links_data as $row)
@@ -346,10 +346,10 @@ 
 	}
 
 	/**
-	* Disapprove action
-	*
-	* @return null
-	*/
+	 * Disapprove action
+	 *
+	 * @return null
+	 */
 	private function _action_disapproved()
 	{
 		foreach ($this->links_data as $row)
@@ -370,11 +370,11 @@ 
 	}
 
 	/**
-	* Get informations about links selected
-	*
-	* @param	array $mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Get informations about links selected
+	 *
+	 * @param	array $mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	private function _get_infos_links($mark)
 	{
 		$sql_array = array(
@@ -409,11 +409,11 @@ 
 	}
 
 	/**
-	* Notify users which watch categories
-	*
-	* @param	array $row Informations about website
-	* @return	null
-	*/
+	 * Notify users which watch categories
+	 *
+	 * @param	array $row Informations about website
+	 * @return	null
+	 */
 	private function _notify_suscribers($row)
 	{
 		$notification_data = array(

controller/acp/main.php

Indentation +32 added lines, -32 removed lines

@@ -30,13 +30,13 @@ 
 	protected $u_action;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db			Database object
-	* @param \phpbb\language\language				$language	Language object
-	* @param \phpbb\request\request					$request	Request object
-	* @param \phpbb\template\template				$template	Template object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 		$db			Database object
+	 * @param \phpbb\language\language				$language	Language object
+	 * @param \phpbb\request\request					$request	Request object
+	 * @param \phpbb\template\template				$template	Template object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template)
 	{
 		$this->db			= $db;
@@ -46,11 +46,11 @@ 
 	}
 
 	/**
-	* Display confirm box
-	*
-	* @param	string $action Requested action
-	* @return	null
-	*/
+	 * Display confirm box
+	 *
+	 * @param	string $action Requested action
+	 * @return	null
+	 */
 	public function display_confirm($action)
 	{
 		switch ($action)
@@ -88,10 +88,10 @@ 
 	}
 
 	/**
-	* Display phpBB Directory statistics
-	*
-	* @return null
-	*/
+	 * Display phpBB Directory statistics
+	 *
+	 * @return null
+	 */
 	public function display_stats()
 	{
 		// Count number of categories
@@ -178,11 +178,11 @@ 
 	}
 
 	/**
-	* Execute action requested
-	*
-	* @param	string $action Requested action
-	* @return	null
-	*/
+	 * Execute action requested
+	 *
+	 * @param	string $action Requested action
+	 * @return	null
+	 */
 	public function exec_action($action)
 	{
 		switch ($action)
@@ -257,23 +257,23 @@ 
 	}
 
 	/**
-	* 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;
 	}
 
 	/**
-	* Get orphan banners
-	*
-	* @param	bool		$delete	True if we want to delete banners, else false
-	* @return	null|int	Number of orphan files, else null
-	*/
+	 * Get orphan banners
+	 *
+	 * @param	bool		$delete	True if we want to delete banners, else false
+	 * @return	null|int	Number of orphan files, else null
+	 */
 	private function _orphan_files($delete = false)
 	{
 		$banner_path = $this->get_banner_path();

Spacing +11 added lines, -11 removed lines

@@ -39,10 +39,10 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->language		= $language;
 		$this->template		= $template;
-		$this->request		= $request;
+		$this->request = $request;
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 			{
 				if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false)
 				{
-					$banners_dir_size += filesize($banners_path . $file);
+					$banners_dir_size += filesize($banners_path.$file);
 				}
 			}
 			closedir($banners_dir);
@@ -167,7 +167,7 @@ 
 			'U_ACTION'			=> $this->u_action,
 
 			'TOTAL_CATS'		=> $total_cats,
-			'TOTAL_LINKS'		=> $total_links-$waiting_links,
+			'TOTAL_LINKS'		=> $total_links - $waiting_links,
 			'WAITING_LINKS'		=> $waiting_links,
 			'TOTAL_COMMENTS'	=> $total_comments,
 			'TOTAL_VOTES'		=> $total_votes,
@@ -188,9 +188,9 @@ 
 		switch ($action)
 		{
 			case 'votes':
-				$this->db->sql_query('DELETE FROM ' . $this->votes_table);
+				$this->db->sql_query('DELETE FROM '.$this->votes_table);
 
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_vote = 0, link_note = 0';
 				$this->db->sql_query($sql);
 
@@ -205,15 +205,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . $this->comments_table);
+						$this->db->sql_query('DELETE FROM '.$this->comments_table);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . $this->comments_table);
+						$this->db->sql_query('TRUNCATE TABLE '.$this->comments_table);
 					break;
 				}
 
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_comment = 0';
 				$this->db->sql_query($sql);
 
@@ -225,7 +225,7 @@ 
 				break;
 
 			case 'clicks':
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_view = 0';
 				$this->db->sql_query($sql);
 
@@ -279,7 +279,7 @@ 
 			{
 				$physical_files[] = $img;
 			}
-			$sql = 'SELECT link_banner FROM ' . $this->links_table . "
+			$sql = 'SELECT link_banner FROM '.$this->links_table."
 				WHERE link_banner <> ''";
 			$result = $this->db->sql_query($sql);
 

core/nestedset_category.php

Indentation +6 added lines, -6 removed lines

@@ -13,12 +13,12 @@
 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
-	* @param string								$categorie_table	Categories table
-	*/
+	 * 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
+	 * @param string								$categorie_table	Categories table
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $categorie_table)
 	{
 		parent::__construct(

core/comment.php

Spacing +9 added lines, -9 removed lines

@@ -28,8 +28,8 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language)
 	{
-		$this->db		= $db;
-		$this->language	= $language;
+		$this->db = $db;
+		$this->language = $language;
 	}
 
 	/**
@@ -42,10 +42,10 @@ 
 	{
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->comments_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->comments_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_comment = link_comment + 1
 			WHERE link_id = ' . (int) $data['comment_link_id'];
 		$this->db->sql_query($sql);
@@ -62,8 +62,8 @@ 
 	*/
 	public function edit($data, $comment_id)
 	{
-		$sql = 'UPDATE ' . $this->comments_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.$this->comments_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE comment_id = ' . (int) $comment_id;
 		$this->db->sql_query($sql);
 	}
@@ -81,10 +81,10 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'DELETE FROM ' . $this->comments_table . ' WHERE comment_id = ' . (int) $comment_id;
+		$sql = 'DELETE FROM '.$this->comments_table.' WHERE comment_id = '.(int) $comment_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_comment = link_comment - 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -94,7 +94,7 @@ 
 		if ($request->is_ajax())
 		{
 			$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');

Indentation +22 added lines, -22 removed lines

@@ -21,11 +21,11 @@ 
 	protected $language;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface	$db			Database object
-	* @param \phpbb\language\language			$language	Language object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface	$db			Database object
+	 * @param \phpbb\language\language			$language	Language object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language)
 	{
 		$this->db		= $db;
@@ -33,11 +33,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');
@@ -54,12 +54,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 ' . $this->comments_table . '
@@ -69,12 +69,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;