ErnadoO / ext-phpbb-directory

controller/acp/cat.php

Indentation +111 added lines, -111 removed lines

@@ -69,19 +69,19 @@ 
 	private $update;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\cache\service								$cache				Cache object
-	* @param \phpbb\db\driver\driver_interface 					$db					Database object
-	* @param \phpbb\controller\helper							$helper				Helper object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\log\log										$log				Log object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\nestedset_category	$nestedset_category	PhpBB Directory extension nestedset object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\cache\service								$cache				Cache object
+	 * @param \phpbb\db\driver\driver_interface 					$db					Database object
+	 * @param \phpbb\controller\helper							$helper				Helper object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\log\log										$log				Log object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\nestedset_category	$nestedset_category	PhpBB Directory extension nestedset object
+	 */
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
 	{
 		$this->cache				= $cache;
@@ -105,10 +105,10 @@ 
 	}
 
 	/**
-	* Initialize defaults data for add page
-	*
-	* @return null
-	*/
+	 * Initialize defaults data for add page
+	 *
+	 * @return null
+	 */
 	public function action_add()
 	{
 		$this->cat_id = $this->parent_id;
@@ -143,10 +143,10 @@ 
 	}
 
 	/**
-	* Display deleting page
-	*
-	* @return null
-	*/
+	 * Display deleting page
+	 *
+	 * @return null
+	 */
 	public function action_delete()
 	{
 		if (!$this->cat_id)
@@ -197,10 +197,10 @@ 
 	}
 
 	/**
-	* Initialize data for edit page
-	*
-	* @return null
-	*/
+	 * Initialize data for edit page
+	 *
+	 * @return null
+	 */
 	public function action_edit()
 	{
 		$row = $this->_get_cat_info($this->cat_id);
@@ -227,10 +227,10 @@ 
 	}
 
 	/**
-	* Move order categories
-	*
-	* @return null
-	*/
+	 * Move order categories
+	 *
+	 * @return null
+	 */
 	public function action_move()
 	{
 		if (!$this->cat_id)
@@ -273,10 +273,10 @@ 
 	}
 
 	/**
-	* Display progress bar for syncinc categories
-	*
-	* @return null
-	*/
+	 * Display progress bar for syncinc categories
+	 *
+	 * @return null
+	 */
 	public function action_progress_bar()
 	{
 		$start = $this->request->variable('start', 0);
@@ -297,10 +297,10 @@ 
 	}
 
 	/**
-	* Get link's ID interval for _sync_dir_links()
-	*
-	* @return null
-	*/
+	 * Get link's ID interval for _sync_dir_links()
+	 *
+	 * @return null
+	 */
 	public function action_sync()
 	{
 		if (!$this->cat_id)
@@ -382,10 +382,10 @@ 
 	}
 
 	/**
-	* Sync category data
-	*
-	* @return null
-	*/
+	 * Sync category data
+	 *
+	 * @return null
+	 */
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
@@ -409,10 +409,10 @@ 
 	}
 
 	/**
-	* Display categories page
-	*
-	* @return null
-	*/
+	 * Display categories page
+	 *
+	 * @return null
+	 */
 	public function display_cats()
 	{
 		// Default management page
@@ -506,22 +506,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;
 	}
 
 	/**
-	* Update cat table
-	*
-	* @return null
-	*/
+	 * Update cat table
+	 *
+	 * @return null
+	 */
 	public function update()
 	{
 		if (!check_form_key($this->form_key))
@@ -611,13 +611,13 @@ 
 	}
 
 	/**
-	* Check route
-	*
-	* @param string $route Route text
-	* @return null
-	* @access public
-	* @throws \phpbb\pages\exception\unexpected_value
-	*/
+	 * Check route
+	 *
+	 * @param string $route Route text
+	 * @return null
+	 * @access public
+	 * @throws \phpbb\pages\exception\unexpected_value
+	 */
 	private function _check_route($route)
 	{
 		// Route is a required field
@@ -648,11 +648,11 @@ 
 	}
 
 	/**
-	* Display form
-	*
-	* @param	string $parents_list	Drop-down list
-	* @return	null
-	*/
+	 * Display form
+	 *
+	 * @param	string $parents_list	Drop-down list
+	 * @return	null
+	 */
 	private function _display_cat_form($parents_list)
 	{
 		$dir_cat_desc_data = array(
@@ -724,11 +724,11 @@ 
 	}
 
 	/**
-	* Get category details
-	*
-	* @param	int		$cat_id	The category ID
-	* @return 	array
-	*/
+	 * Get category details
+	 *
+	 * @param	int		$cat_id	The category ID
+	 * @return 	array
+	 */
 	private function _get_cat_info($cat_id)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, cat_route, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
@@ -747,10 +747,10 @@ 
 	}
 
 	/**
-	* Update category data
-	*
-	* @return array
-	*/
+	 * Update category data
+	 *
+	 * @return array
+	 */
 	private function _update_cat_data()
 	{
 		if (!$this->cat_data['cat_name'])
@@ -846,14 +846,14 @@ 
 	}
 
 	/**
-	* Remove complete category
-	*
-	* @param	string		$action_links	Action for categories links
-	* @param	string		$action_subcats	Action for sub-categories
-	* @param	int			$links_to_id	New category ID for links
-	* @param	int			$subcats_to_id	New category ID for sub-categories
-	* @return 	array|null
-	*/
+	 * Remove complete category
+	 *
+	 * @param	string		$action_links	Action for categories links
+	 * @param	string		$action_subcats	Action for sub-categories
+	 * @param	int			$links_to_id	New category ID for links
+	 * @param	int			$subcats_to_id	New category ID for sub-categories
+	 * @return 	array|null
+	 */
 	private function _delete_cat($action_links = 'delete', $action_subcats = 'delete', $links_to_id = 0, $subcats_to_id = 0)
 	{
 		$this->cat_data = $this->_get_cat_info($this->cat_id);
@@ -968,12 +968,12 @@ 
 	}
 
 	/**
-	* Move category content from one to another forum
-	*
-	* @param	int	$from_id
-	* @param	int	$to_id
-	* @return	null
-	*/
+	 * Move category content from one to another forum
+	 *
+	 * @param	int	$from_id
+	 * @param	int	$to_id
+	 * @return	null
+	 */
 	private function _move_cat_content($from_id, $to_id)
 	{
 		$sql = 'UPDATE ' . $this->links_table . '
@@ -989,10 +989,10 @@ 
 	}
 
 	/**
-	* Delete category content
-	*
-	* @return null
-	*/
+	 * Delete category content
+	 *
+	 * @return null
+	 */
 	private function _delete_cat_content()
 	{
 		$this->db->sql_transaction('begin');
@@ -1049,11 +1049,11 @@ 
 	}
 
 	/**
-	* Update links counter
-	*
-	* @param	int $cat_id	The category ID
-	* @return	null
-	*/
+	 * Update links counter
+	 *
+	 * @param	int $cat_id	The category ID
+	 * @return	null
+	 */
 	private function _sync_dir_cat($cat_id)
 	{
 		$sql = 'SELECT COUNT(link_id) AS num_links
@@ -1071,12 +1071,12 @@ 
 	}
 
 	/**
-	* Update link data (note, vote, comment)
-	*
-	* @param	int	$start
-	* @param	int	$stop
-	* @return	null
-	*/
+	 * Update link data (note, vote, comment)
+	 *
+	 * @param	int	$start
+	 * @param	int	$stop
+	 * @return	null
+	 */
 	private function _sync_dir_links($start, $stop)
 	{
 		$sql_ary = array(
@@ -1119,12 +1119,12 @@ 
 	}
 
 	/**
-	* Display icons drop-down list
-	*
-	* @param	string	$icons_path
-	* @param	string	$img_selected
-	* @return	string
-	*/
+	 * Display icons drop-down list
+	 *
+	 * @param	string	$icons_path
+	 * @param	string	$img_selected
+	 * @return	string
+	 */
 	private function _get_dir_icon_list($icons_path, $img_selected)
 	{
 		$imglist = filelist($icons_path, '');

Spacing +89 added lines, -89 removed lines

@@ -84,23 +84,23 @@ 
 	*/
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
 	{
-		$this->cache				= $cache;
-		$this->db					= $db;
-		$this->helper				= $helper;
+		$this->cache = $cache;
+		$this->db = $db;
+		$this->helper = $helper;
 		$this->language				= $language;
 		$this->phpbb_log			= $log;
-		$this->request				= $request;
+		$this->request = $request;
 		$this->template				= $template;
-		$this->user					= $user;
+		$this->user = $user;
 		$this->categorie			= $categorie;
-		$this->nestedset_category	= $nestedset_category;
+		$this->nestedset_category = $nestedset_category;
 
 		$this->form_key = 'acp_dir_cat';
 		add_form_key($this->form_key);
 
 		$this->action		= $this->request->variable('action', '');
 		$this->cat_id		= $request->variable('c', 0);
-		$this->parent_id	= $request->variable('parent_id', 0);
+		$this->parent_id = $request->variable('parent_id', 0);
 		$this->update		= ($this->request->is_set_post('update')) ? true : false;
 	}
 
@@ -151,7 +151,7 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$this->cat_data = $this->_get_cat_info($this->cat_id);
@@ -167,7 +167,7 @@ 
 		$cat_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id);
 
 		$sql = 'SELECT cat_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id <> ' . (int) $this->cat_id;
 		$result = $this->db->sql_query_limit($sql, 1);
 
@@ -183,8 +183,8 @@ 
 
 		$this->template->assign_vars(array(
 			'S_DELETE_DIR_CAT'		=> true,
-			'U_ACTION'				=> $this->u_action . "&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
-			'U_BACK'				=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+			'U_ACTION'				=> $this->u_action."&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
+			'U_BACK'				=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
 			'DIR_CAT_NAME'			=> $this->cat_data['cat_name'],
 			'S_HAS_SUBCATS'			=> ($this->cat_data['right_id'] - $this->cat_data['left_id'] > 1) ? true : false,
@@ -235,11 +235,11 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -247,7 +247,7 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		try
@@ -261,7 +261,7 @@ 
 
 		if ($move_cat_name !== false)
 		{
-			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_' . strtoupper($this->action), time(), array($row['cat_name'], $move_cat_name));
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_'.strtoupper($this->action), time(), array($row['cat_name'], $move_cat_name));
 			$this->cache->destroy('sql', $this->categories_table);
 		}
 
@@ -305,13 +305,13 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		@set_time_limit(0);
 
 		$sql = 'SELECT cat_name, cat_links
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -319,12 +319,12 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$sql = 'SELECT MIN(link_id) as min_link_id, MAX(link_id) as max_link_id
-			FROM ' . $this->links_table . '
-			WHERE link_cat = ' . (int) $this->cat_id . '
+			FROM ' . $this->links_table.'
+			WHERE link_cat = ' . (int) $this->cat_id.'
 				AND link_active = 1';
 		$result = $this->db->sql_query($sql);
 		$row2 = $this->db->sql_fetchrow($result);
@@ -346,22 +346,22 @@ 
 		{
 			// We really need to find a way of showing statistics... no progress here
 			$sql = 'SELECT COUNT(link_id) as num_links
-				FROM ' . $this->links_table . '
-				WHERE link_cat = ' . (int) $this->cat_id . '
+				FROM ' . $this->links_table.'
+				WHERE link_cat = ' . (int) $this->cat_id.'
 						AND link_active = 1
-						AND link_id BETWEEN ' . $start . ' AND ' . $end;
+						AND link_id BETWEEN ' . $start.' AND '.$end;
 			$result = $this->db->sql_query($sql);
 			$links_done = $this->request->variable('links_done', 0) + (int) $this->db->sql_fetchfield('num_links');
 			$this->db->sql_freeresult($result);
 
 			$start += $batch_size;
 
-			$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
+			$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
 
 			meta_refresh(0, $url);
 
 			$this->template->assign_vars(array(
-				'UA_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
+				'UA_PROGRESS_BAR'		=> $this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
 				'S_CONTINUE_SYNC'		=> true,
 				'L_PROGRESS_EXPLAIN'	=> $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', $links_done, $row['cat_links']))
 			);
@@ -369,11 +369,11 @@ 
 			return;
 		}
 
-		$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
+		$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
 		meta_refresh(0, $url);
 
 		$this->template->assign_vars(array(
-			'UA_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'		=> $this->u_action.'&amp;action=progress_bar',
 			'S_CONTINUE_SYNC'		=> true,
 			'L_PROGRESS_EXPLAIN'	=> $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', 0, $row['cat_links']))
 		);
@@ -389,7 +389,7 @@ 
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -397,7 +397,7 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$this->_sync_dir_cat($this->cat_id);
@@ -422,7 +422,7 @@ 
 		}
 		else
 		{
-			$navigation = '<a href="' . $this->u_action . '">' . $this->language->lang('DIR_INDEX') . '</a>';
+			$navigation = '<a href="'.$this->u_action.'">'.$this->language->lang('DIR_INDEX').'</a>';
 
 			$cats_nav = $this->nestedset_category->get_path_data($this->parent_id);
 
@@ -430,11 +430,11 @@ 
 			{
 				if ($row['cat_id'] == $this->parent_id)
 				{
-					$navigation .= ' -&gt; ' . $row['cat_name'];
+					$navigation .= ' -&gt; '.$row['cat_name'];
 				}
 				else
 				{
-					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['cat_id'] . '">' . $row['cat_name'] . '</a>';
+					$navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
 				}
 			}
 		}
@@ -448,8 +448,8 @@ 
 		}
 
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_name, cat_icon, cat_desc_uid, cat_desc_bitfield, cat_desc, cat_desc_options, cat_links
-			FROM ' . $this->categories_table . '
-			WHERE parent_id = ' . (int) $this->parent_id . '
+			FROM ' . $this->categories_table.'
+			WHERE parent_id = ' . (int) $this->parent_id.'
 			ORDER BY left_id';
 		$result = $this->db->sql_query($sql);
 
@@ -457,23 +457,23 @@ 
 		{
 			do
 			{
-				$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $this->language->lang('DIR_SUBCAT') . '" />' : '<img src="images/icon_folder.gif" alt="' . $this->language->lang('FOLDER') . '" />';
+				$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$this->language->lang('DIR_SUBCAT').'" />' : '<img src="images/icon_folder.gif" alt="'.$this->language->lang('FOLDER').'" />';
 
-				$url = $this->u_action . "&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
+				$url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
 
 				$this->template->assign_block_vars('cats', array(
 					'FOLDER_IMAGE'		=> $folder_image,
-					'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="' . $this->get_img_path('icons', $row['cat_icon']) . '" alt="" />' : '',
+					'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="'.$this->get_img_path('icons', $row['cat_icon']).'" alt="" />' : '',
 					'CAT_NAME'			=> $row['cat_name'],
 					'CAT_DESCRIPTION'	=> generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
 					'CAT_LINKS'			=> $row['cat_links'],
 
-					'U_CAT'				=> $this->u_action . '&amp;parent_id=' . $row['cat_id'],
-					'U_MOVE_UP'			=> $url . '&amp;action=move_up',
-					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down',
-					'U_EDIT'			=> $url . '&amp;action=edit',
-					'U_DELETE'			=> $url . '&amp;action=delete',
-					'U_SYNC'			=> $url . '&amp;action=sync')
+					'U_CAT'				=> $this->u_action.'&amp;parent_id='.$row['cat_id'],
+					'U_MOVE_UP'			=> $url.'&amp;action=move_up',
+					'U_MOVE_DOWN'		=> $url.'&amp;action=move_down',
+					'U_EDIT'			=> $url.'&amp;action=edit',
+					'U_DELETE'			=> $url.'&amp;action=delete',
+					'U_SYNC'			=> $url.'&amp;action=sync')
 				);
 			}
 			while ($row = $this->db->sql_fetchrow($result));
@@ -482,14 +482,14 @@ 
 		{
 			$row = $this->_get_cat_info($this->parent_id);
 
-			$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;c=' . $row['cat_id'];
+			$url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
 
 			$this->template->assign_vars(array(
 				'S_NO_CATS'			=> true,
 
-				'U_EDIT'			=> $url . '&amp;action=edit',
-				'U_DELETE'			=> $url . '&amp;action=delete',
-				'U_SYNC'			=> $url . '&amp;action=sync')
+				'U_EDIT'			=> $url.'&amp;action=edit',
+				'U_DELETE'			=> $url.'&amp;action=delete',
+				'U_SYNC'			=> $url.'&amp;action=sync')
 			);
 		}
 		$this->db->sql_freeresult($result);
@@ -499,9 +499,9 @@ 
 			'NAVIGATION'	=> $navigation,
 			'CAT_BOX'		=> $cat_box,
 			'U_SEL_ACTION'	=> $this->u_action,
-			'U_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+			'U_ACTION'		=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
-			'UA_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'	=> $this->u_action.'&amp;action=progress_bar',
 		));
 	}
 
@@ -534,10 +534,10 @@ 
 		switch ($this->action)
 		{
 			case 'delete':
-				$action_subcats	= $this->request->variable('action_subcats', '');
-				$subcats_to_id	= $this->request->variable('subcats_to_id', 0);
-				$action_links	= $this->request->variable('action_links', '');
-				$links_to_id	= $this->request->variable('links_to_id', 0);
+				$action_subcats = $this->request->variable('action_subcats', '');
+				$subcats_to_id = $this->request->variable('subcats_to_id', 0);
+				$action_links = $this->request->variable('action_links', '');
+				$links_to_id = $this->request->variable('links_to_id', 0);
 
 				try
 				{
@@ -606,7 +606,7 @@ 
 			// Purge the cache to refresh route collections
 			$this->cache->purge();
 
-			trigger_error($this->language->lang($message) . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+			trigger_error($this->language->lang($message).adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
 		}
 	}
 
@@ -634,8 +634,8 @@ 
 		}
 
 		$sql = 'SELECT cat_route
-			FROM ' . $this->categories_table  . "
-			WHERE cat_route = '" . $this->db->sql_escape($route) . "'
+			FROM ' . $this->categories_table."
+			WHERE cat_route = '" . $this->db->sql_escape($route)."'
 				AND cat_id <> " . $this->cat_id;
 		$result = $this->db->sql_query_limit($sql, 1);
 		$row = $this->db->sql_fetchrow($result);
@@ -685,10 +685,10 @@ 
 			'S_CAT_PARENT_ID'	=> $this->cat_data['parent_id'],
 			'S_ADD_ACTION'		=> ($this->action == 'add') ? true : false,
 
-			'U_BACK'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-			'U_EDIT_ACTION'		=> $this->u_action . "&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
+			'U_BACK'			=> $this->u_action.'&amp;parent_id='.$this->parent_id,
+			'U_EDIT_ACTION'		=> $this->u_action."&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
 
-			'L_TITLE'					=> $this->language->lang('DIR_' . strtoupper($this->action) . '_CAT'),
+			'L_TITLE'					=> $this->language->lang('DIR_'.strtoupper($this->action).'_CAT'),
 			'ERROR_MSG'					=> (sizeof($this->errors)) ? implode('<br />', $this->errors) : '',
 			'ICON_IMAGE'				=> ($this->cat_data['cat_icon']) ? $this->get_img_path('icons', $this->cat_data['cat_icon']) : 'images/spacer.gif',
 
@@ -732,7 +732,7 @@ 
 	private function _get_cat_info($cat_id)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, cat_route, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -797,7 +797,7 @@ 
 		{
 			if ($cat_data_sql['cat_cron_enable'])
 			{
-				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 			}
 
 			$this->cat_data = $this->nestedset_category->insert($cat_data_sql);
@@ -820,13 +820,13 @@ 
 
 			if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable']))
 			{
-				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 			}
 
 			if ($row['cat_name'] != $cat_data_sql['cat_name'])
 			{
 				// the cat name has changed, clear the parents list of all categories (for safety)
-				$sql = 'UPDATE ' . $this->categories_table . "
+				$sql = 'UPDATE '.$this->categories_table."
 					SET cat_parents = ''";
 				$this->db->sql_query($sql);
 			}
@@ -834,8 +834,8 @@ 
 			// Setting the cat id to the categorie id is not really received well by some dbs. ;)
 			unset($cat_data_sql['cat_id']);
 
-			$sql = 'UPDATE ' . $this->categories_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql) . '
+			$sql = 'UPDATE '.$this->categories_table.'
+				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql).'
 				WHERE cat_id = ' . (int) $this->cat_id;
 			$this->db->sql_query($sql);
 
@@ -876,7 +876,7 @@ 
 				$log_action_links = 'MOVE_LINKS';
 
 				$sql = 'SELECT cat_name
-					FROM ' . $this->categories_table . '
+					FROM ' . $this->categories_table.'
 					WHERE cat_id = ' . (int) $links_to_id;
 				$result = $this->db->sql_query($sql);
 				$row = $this->db->sql_fetchrow($result);
@@ -976,12 +976,12 @@ 
 	*/
 	private function _move_cat_content($from_id, $to_id)
 	{
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET link_cat = ' . (int) $to_id . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET link_cat = ' . (int) $to_id.'
 			WHERE link_cat = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->watch_table . '
+		$sql = 'DELETE FROM '.$this->watch_table.'
 			WHERE cat_id = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
@@ -999,7 +999,7 @@ 
 
 		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
 		$sql = 'SELECT link_id, link_banner
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_cat = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 
@@ -1030,7 +1030,7 @@ 
 
 			foreach ($link_datas_ary as $table => $field)
 			{
-				$this->db->sql_query("DELETE FROM $table WHERE " . $this->db->sql_in_set($field, $link_ids));
+				$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $link_ids));
 			}
 		}
 
@@ -1042,7 +1042,7 @@ 
 
 		foreach ($cat_datas_ary as $table => $field)
 		{
-			$this->db->sql_query("DELETE FROM $table WHERE $field = " . (int) $this->cat_id);
+			$this->db->sql_query("DELETE FROM $table WHERE $field = ".(int) $this->cat_id);
 		}
 
 		$this->db->sql_transaction('commit');
@@ -1057,15 +1057,15 @@ 
 	private function _sync_dir_cat($cat_id)
 	{
 		$sql = 'SELECT COUNT(link_id) AS num_links
-			FROM ' . $this->links_table . '
-			WHERE link_cat = ' . (int) $cat_id . '
+			FROM ' . $this->links_table.'
+			WHERE link_cat = ' . (int) $cat_id.'
 				AND link_active = 1';
 		$result = $this->db->sql_query($sql);
 		$total_links = (int) $this->db->sql_fetchfield('num_links');
 		$this->db->sql_freeresult($result);
 
-		$sql = 'UPDATE ' . $this->categories_table . '
-			SET cat_links = ' . $total_links . '
+		$sql = 'UPDATE '.$this->categories_table.'
+			SET cat_links = ' . $total_links.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
 	}
@@ -1085,33 +1085,33 @@ 
 			'link_vote'		=> 0,
 		);
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-			WHERE link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop;
+		$sql = 'UPDATE '.$this->links_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
+			WHERE link_id BETWEEN ' . (int) $start.' AND '.(int) $stop;
 		$this->db->sql_query($sql);
 
-		$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM ' . $this->votes_table . '
-			WHERE vote_link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop . '
+		$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM '.$this->votes_table.'
+			WHERE vote_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 			GROUP BY vote_link_id';
 		$result = $this->db->sql_query($sql);
 		while ($tmp = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . $this->links_table . '
-				SET link_note = ' . (int) $tmp['total'] . ', link_vote = ' . (int) $tmp['nb_vote'] . '
+			$sql = 'UPDATE '.$this->links_table.'
+				SET link_note = ' . (int) $tmp['total'].', link_vote = '.(int) $tmp['nb_vote'].'
 				WHERE link_id = ' . (int) $tmp['vote_link_id'];
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);
 
 		$sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment
-			FROM ' . $this->comments_table . '
-			WHERE comment_link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop . '
+			FROM ' . $this->comments_table.'
+			WHERE comment_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 			GROUP BY comment_link_id';
 		$result = $this->db->sql_query($sql);
 		while ($tmp = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . $this->links_table . '
-				SET link_comment = ' . (int) $tmp['nb_comment'] . '
+			$sql = 'UPDATE '.$this->links_table.'
+				SET link_comment = ' . (int) $tmp['nb_comment'].'
 				WHERE link_id = ' . (int) $tmp['comment_link_id'];
 			$this->db->sql_query($sql);
 		}
@@ -1136,7 +1136,7 @@ 
 
 			foreach ($img_ary as $img)
 			{
-				$img = $path . $img;
+				$img = $path.$img;
 				$selected = '';
 
 				if (strlen($img) > 255)
@@ -1149,7 +1149,7 @@ 
 					$selected = ' selected="selected"';
 				}
 
-				$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
+				$filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
 			}
 		}
 

controller/categories.php

Indentation +48 added lines, -48 removed lines

@@ -50,20 +50,20 @@ 
 	protected $link;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db			Database object
-	* @param \phpbb\config\config								$config		Config object
-	* @param \phpbb\language\language							$language	Language object
-	* @param \phpbb\template\template							$template	Template object
-	* @param \phpbb\user										$user		User object
-	* @param \phpbb\controller\helper							$helper		Controller helper object
-	* @param \phpbb\request\request								$request	Request object
-	* @param \phpbb\auth\auth									$auth		Auth object
-	* @param \phpbb\pagination									$pagination	Pagination object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface					$db			Database object
+	 * @param \phpbb\config\config								$config		Config object
+	 * @param \phpbb\language\language							$language	Language object
+	 * @param \phpbb\template\template							$template	Template object
+	 * @param \phpbb\user										$user		User object
+	 * @param \phpbb\controller\helper							$helper		Controller helper object
+	 * @param \phpbb\request\request								$request	Request object
+	 * @param \phpbb\auth\auth									$auth		Auth object
+	 * @param \phpbb\pagination									$pagination	Pagination object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
 		$this->db			= $db;
@@ -86,10 +86,10 @@ 
 	}
 
 	/**
-	* Base controller to be accessed with the URL /directory
-	*
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Base controller to be accessed with the URL /directory
+	 *
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function base()
 	{
 		$this->categorie->display();
@@ -99,15 +99,15 @@ 
 	}
 
 	/**
-	* Legacy view controller for display a category
-	* Used with /directory/categorie/{cat_id}
-	* @deprecated 2.0.0 No longer used since dynamic routing.
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$page		Page number taken from the URL
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Legacy view controller for display a category
+	 * Used with /directory/categorie/{cat_id}
+	 * @deprecated 2.0.0 No longer used since dynamic routing.
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @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 view($cat_id, $page)
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -121,17 +121,17 @@ 
 	}
 
 	/**
-	* View controller for display a category
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$page		Page number taken from the URL
-	* @param	int		$sort_days	Specifies the maximum amount of days a link may be old
-	* @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
-	* @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
-	* @param	string	$mode		watch|unwatch
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * View controller for display a category
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$page		Page number taken from the URL
+	 * @param	int		$sort_days	Specifies the maximum amount of days a link may be old
+	 * @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
+	 * @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
+	 * @param	string	$mode		watch|unwatch
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view_route($cat_id, $page = 1, $sort_days = 0, $sort_key = '', $sort_dir = '', $mode = '')
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -386,11 +386,11 @@ 
 	}
 
 	/**
-	* date controller for return a date
-	*
-	* @return	\phpbb\json_response	A Json Response
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * date controller for return a date
+	 *
+	 * @return	\phpbb\json_response	A Json Response
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function return_date()
 	{
 		if (!$this->request->is_ajax())
@@ -407,11 +407,11 @@ 
 	}
 
 	/**
-	* slug controller for return a slugify category name
-	*
-	* @return	\phpbb\json_response	A Json Response
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * slug controller for return a slugify category name
+	 *
+	 * @return	\phpbb\json_response	A Json Response
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function return_slug()
 	{
 		if (!$this->request->is_ajax())

controller/links.php

Indentation +68 added lines, -68 removed lines

@@ -69,22 +69,22 @@ 
 	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\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 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\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 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\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $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_id, link_uid, link_user_id, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
@@ -230,12 +230,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'))
@@ -277,23 +277,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);
@@ -329,14 +329,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')))
@@ -426,8 +426,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);
@@ -508,11 +508,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'))
@@ -546,13 +546,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 +42 added lines, -42 removed lines

@@ -87,19 +87,19 @@ 
 	*/
 	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\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $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->captcha_factory 	= $captcha_factory;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->link				= $link;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 
@@ -119,12 +119,12 @@ 
 	{
 		if ($this->request->is_set_post('cancel'))
 		{
-			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			redirect($redirect);
 		}
 
 		$sql = 'SELECT link_user_id
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -145,9 +145,9 @@ 
 		{
 			$this->link->del($cat_id, $link_id);
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			meta_refresh(3, $meta_info);
-			$message = $this->language->lang('DIR_DELETE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
+			$message = $this->language->lang('DIR_DELETE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -167,7 +167,7 @@ 
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_id, link_uid, link_user_id, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -187,7 +187,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->language->lang('DIR_EDIT_SITE');
+		$title = $this->language->lang('DIR_EDIT_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -211,15 +211,15 @@ 
 				'old_banner'	=> $link_data['link_banner'],
 			);
 
-			$site_description			= generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
-			$link_data['link_banner'] 	= (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
+			$site_description = generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
+			$link_data['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
 
-			$this->url			= $link_data['link_url'];
-			$this->site_name	= $link_data['link_name'];
+			$this->url = $link_data['link_url'];
+			$this->site_name = $link_data['link_name'];
 			$this->description	= $site_description['text'];
 			$this->guest_email	= $link_data['link_guest_email'];
-			$this->rss			= $link_data['link_rss'];
-			$this->banner 		= $link_data['link_banner'];
+			$this->rss = $link_data['link_rss'];
+			$this->banner = $link_data['link_banner'];
 			$this->back			= $link_data['link_back'];
 			$this->flag 		= $link_data['link_flag'];
 		}
@@ -246,7 +246,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->language->lang('DIR_NEW_SITE');
+		$title = $this->language->lang('DIR_NEW_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -310,7 +310,7 @@ 
 
 		// We check if user had already vot for this website.
 		$sql = 'SELECT vote_link_id
-			FROM ' . $this->votes_table . '
+			FROM ' . $this->votes_table.'
 			WHERE ' . $this->db->sql_build_array('SELECT', $data);
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -322,9 +322,9 @@ 
 
 		$this->link->add_vote($link_id, $this->request->variable('vote', 0));
 
-		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 		meta_refresh(3, $meta_info);
-		$message = $this->language->lang('DIR_VOTE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $meta_info . '">', '</a>');
+		$message = $this->language->lang('DIR_VOTE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
 		return $this->helper->message($message);
 	}
 
@@ -349,18 +349,18 @@ 
 			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', '');
 
 		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);
 		}
 
 		// We define variables to check
@@ -383,17 +383,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))
@@ -439,8 +439,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,
@@ -485,10 +485,10 @@ 
 				$this->link->add($data_add, $need_approval);
 			}
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			meta_refresh(3, $meta_info);
 			$message	= ($need_approval) ? $this->language->lang('DIR_'.strtoupper($mode).'_SITE_ACTIVE') : $this->language->lang('DIR_'.strtoupper($mode).'_SITE_OK');
-			$message	= $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
+			$message	= $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -517,7 +517,7 @@ 
 	{
 		if (!function_exists('file_gc'))
 		{
-			include($this->root_path . 'includes/functions_download.' . $this->php_ext);
+			include($this->root_path.'includes/functions_download.'.$this->php_ext);
 		}
 
 		$file_path = $this->get_banner_path($banner_img);
@@ -572,7 +572,7 @@ 
 
 		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);
 		}
 		display_custom_bbcodes();
 		add_form_key('dir_form');
@@ -581,17 +581,17 @@ 
 		$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->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['allow_bbcode'])	? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
+			'BBCODE_STATUS'			=> ($this->config['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['allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
 			'SMILIES_STATUS'		=> ($this->config['allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
 			'URL_STATUS'			=> ($this->config['allow_post_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
-			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash'])	? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
+			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
 
 			'L_TITLE'				=> $title,
 			'L_DIR_DESCRIPTION_EXP'	=> $this->language->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),

core/link.php

Indentation +145 added lines, -145 removed lines

@@ -57,23 +57,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\notification\manager						$notification		Notification object
-	* @param \phpbb\filesystem\filesystem_interface				$filesystem			phpBB filesystem helper
-	* @param \FastImageSize\FastImageSize						$imagesize 			FastImageSize class
-	* @param \phpbb\files\factory								$files_factory		File classes factory
-	* @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\notification\manager						$notification		Notification object
+	 * @param \phpbb\filesystem\filesystem_interface				$filesystem			phpBB filesystem helper
+	 * @param \FastImageSize\FastImageSize						$imagesize 			FastImageSize class
+	 * @param \phpbb\files\factory								$files_factory		File classes factory
+	 * @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\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\factory $files_factory, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -93,12 +93,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();
@@ -143,13 +143,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(
@@ -201,12 +201,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');
@@ -279,12 +279,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
@@ -308,11 +308,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);
@@ -351,11 +351,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);
@@ -368,11 +368,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;
@@ -390,13 +390,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)
@@ -411,11 +411,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']))
@@ -432,11 +432,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']))
@@ -446,13 +446,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'])
@@ -473,11 +473,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)
 	{
 		if (!empty($data['link_banner']))
@@ -515,12 +515,12 @@ 
 	}
 
 	/**
-	* Add a vote in db, for a specifi link
-	*
-	* @param	int		$link_id	Link_id from db
-	* @param	int		$note		Note submeted
-	* @return	null
-	*/
+	 * Add a vote in db, for a specifi link
+	 *
+	 * @param	int		$link_id	Link_id from db
+	 * @param	int		$note		Note submeted
+	 * @return	null
+	 */
 	public function add_vote($link_id, $note)
 	{
 		$data = array(
@@ -564,11 +564,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'])
@@ -589,12 +589,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 = $this->imagesize->getImageSize($protocol.'://'.$host.'/ascreen.jpg')) !== false)
@@ -609,12 +609,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', '');
@@ -650,13 +650,13 @@ 
 	}
 
 	/**
-	* Copy a remonte banner to server.
-	* 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
-	*/
+	 * Copy a remonte banner to server.
+	 * 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_upload($banner, &$error)
 	{
 		/** @var \phpbb\files\upload $upload */
@@ -688,13 +688,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))
@@ -802,11 +802,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->get_banner_path($file)))
@@ -819,12 +819,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 = '';
@@ -859,10 +859,10 @@ 
 	}
 
 	/**
-	* Display recents links added
-	*
-	* @return	null
-	*/
+	 * Display recents links added
+	 *
+	 * @return	null
+	 */
 	public function recents()
 	{
 		if ($this->config['dir_recent_block'])
@@ -939,13 +939,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)

Spacing +42 added lines, -42 removed lines

@@ -76,20 +76,20 @@ 
 	*/
 	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\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\factory $files_factory, $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->notification		= $notification;
-		$this->filesystem		= $filesystem;
+		$this->notification = $notification;
+		$this->filesystem = $filesystem;
 		$this->imagesize		= $imagesize;
-		$this->files_factory 	= $files_factory;
+		$this->files_factory = $files_factory;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -105,13 +105,13 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->links_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->links_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 		$notification_data['link_id'] = $this->db->sql_nextid();
 
 		if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_'))
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = ' . (int) $data['link_cat'];
 			$this->db->sql_query($sql);
@@ -169,14 +169,14 @@ 
 
 			$this->db->sql_transaction('begin');
 
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links - 1
 				WHERE cat_id = ' . (int) $old_cat;
 			$this->db->sql_query($sql);
 
 			if (!$need_approval)
 			{
-				$sql = 'UPDATE ' . $this->categories_table . '
+				$sql = 'UPDATE '.$this->categories_table.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = ' . (int) $data['link_cat'];
 				$this->db->sql_query($sql);
@@ -194,8 +194,8 @@ 
 			$this->notification->add_notifications($notification_type, $notification_data);
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 	}
@@ -221,7 +221,7 @@ 
 		);
 
 		$sql = 'SELECT link_banner
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE '. $this->db->sql_in_set('link_id', $url_array);
 		$result = $this->db->sql_query($sql);
 
@@ -243,7 +243,7 @@ 
 			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
 		}
 
-		$sql = 'UPDATE ' . $this->categories_table . '
+		$sql = 'UPDATE '.$this->categories_table.'
 			SET cat_links = cat_links - '.sizeof($url_array).'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
@@ -261,7 +261,7 @@ 
 		if ($this->request->is_ajax())
 		{
 			$sql = 'SELECT cat_links
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 				WHERE cat_id = ' . (int) $cat_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
@@ -288,7 +288,7 @@ 
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -298,7 +298,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_view = link_view + 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -323,7 +323,7 @@ 
 		if ($details['scheme'] == 'https')
 		{
 			$default_port = 443;
-			$hostname = 'tls://' . $details['host'];
+			$hostname = 'tls://'.$details['host'];
 		}
 
 		if (!isset($details['path']))
@@ -381,7 +381,7 @@ 
 		$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']))
+		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
 		{
 			$img_flag = $data['link_flag'];
 		}
@@ -423,7 +423,7 @@ 
 			$list = '<select name="vote">';
 			for ($i = 0; $i <= 10; $i++)
 			{
-				$list .= '<option value="' . $i . '"' . (($i == 5) ? ' selected="selected"' : '') . '>' . $i . '</option>';
+				$list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
 			}
 			$list .= '</select>';
 
@@ -461,8 +461,8 @@ 
 			{
 				$thumb = $this->thumb_process($data['link_url']);
 
-				$sql = 'UPDATE ' . $this->links_table . "
-					SET link_thumb = '" . $this->db->sql_escape($thumb) . "'
+				$sql = 'UPDATE '.$this->links_table."
+					SET link_thumb = '" . $this->db->sql_escape($thumb)."'
 					WHERE link_id = " . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 
@@ -509,7 +509,7 @@ 
 				$height /= $coef_max;
 			}
 
-			return '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			return '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
 		}
 		return '';
 	}
@@ -531,12 +531,12 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->votes_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->votes_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_vote = link_vote + 1,
-			link_note = link_note + ' . (int) $data['vote_note'] . '
+			link_note = link_note + ' . (int) $data['vote_note'].'
 		WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 
@@ -544,7 +544,7 @@ 
 
 		if ($this->request->is_ajax())
 		{
-			$sql= 'SELECT link_vote, link_note FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $link_id;
+			$sql = 'SELECT link_vote, link_note FROM '.$this->links_table.' WHERE link_id = '.(int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
 
@@ -578,8 +578,8 @@ 
 
 		$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']))
 		{
@@ -622,7 +622,7 @@ 
 		$destination = $this->get_banner_path();
 
 		// Can we upload?
-		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path . $destination) && $this->filesystem->is_writable($this->root_path . $destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path.$destination) && $this->filesystem->is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
 		if ($banner && $can_upload)
 		{
@@ -668,7 +668,7 @@ 
 
 		$file = $upload->handle_upload('files.types.remote', $banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		if (sizeof($file->error))
@@ -699,7 +699,7 @@ 
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
 		{
-			$banner = 'http://' . $banner;
+			$banner = 'http://'.$banner;
 		}
 		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
 		{
@@ -730,8 +730,8 @@ 
 		}
 
 		// Check image type
-		$types		= \phpbb\files\upload::image_types();
-		$extension	= strtolower(\phpbb\files\filespec::get_extension($banner));
+		$types = \phpbb\files\upload::image_types();
+		$extension = strtolower(\phpbb\files\filespec::get_extension($banner));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($banner, 'r'))
@@ -851,7 +851,7 @@ 
 
 			if (file_exists($flag_path.$img_file))
 			{
-				$list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
+				$list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
 			}
 		}
 
@@ -867,8 +867,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= array_filter(explode(',', str_replace(' ', '', $this->config['dir_recent_exclude'])));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = array_filter(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',
@@ -884,7 +884,7 @@ 
 							'ON'	=> 'l.link_cat = c.cat_id'
 						)
 				),
-				'WHERE'		=> 'l.link_active = 1' . (sizeof($exclude_array) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
+				'WHERE'		=> 'l.link_active = 1'.(sizeof($exclude_array) ? ' AND '.$this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
 				'ORDER_BY'	=> 'l.link_time DESC, l.link_id DESC');
 
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -901,7 +901,7 @@ 
 			if (sizeof($rowset))
 			{
 				$this->template->assign_block_vars('block', array(
-					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']) . '%',
+					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']).'%',
 				));
 
 				foreach ($rowset as $row)
@@ -920,7 +920,7 @@ 
 						'COUNT'					  => $row['link_view'],
 						'COMMENT'                 => $row['link_comment'],
 
-						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']),
+						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['link_cat']),
 						'U_COMMENT'               => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])),
 
 						'L_DIR_SEARCH_NB_CLICKS'	=> $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),