ErnadoO / ext-phpbb-directory

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 +12 added lines, -12 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,
@@ -192,15 +192,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . $this->votes_table);
+						$this->db->sql_query('DELETE FROM '.$this->votes_table);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . $this->votes_table);
+						$this->db->sql_query('TRUNCATE TABLE '.$this->votes_table);
 					break;
 				}
 
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_vote = 0, link_note = 0';
 				$this->db->sql_query($sql);
 
@@ -215,15 +215,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);
 
@@ -235,7 +235,7 @@ 
 				break;
 
 			case 'clicks':
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_view = 0';
 				$this->db->sql_query($sql);
 
@@ -289,7 +289,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/categorie.php

Indentation +61 added lines, -61 removed lines

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

Spacing +26 added lines, -26 removed lines

@@ -60,13 +60,13 @@ 
 	*/
 	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\cron\manager $cron)
 	{
-		$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->cron 		= $cron;
 	}
@@ -90,7 +90,7 @@ 
 	public function make_cat_jumpbox()
 	{
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -151,7 +151,7 @@ 
 
 		// This query is identical to the jumpbox one
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -181,7 +181,7 @@ 
 			}
 
 			$selected = (($row['cat_id'] == $select_id) ? ' selected="selected"' : '');
-			$cat_list .= '<option value="' . $row['cat_id'] . '"' . (($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected) . '>' . $padding . $row['cat_name'] . '</option>';
+			$cat_list .= '<option value="'.$row['cat_id'].'"'.(($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected).'>'.$padding.$row['cat_name'].'</option>';
 		}
 		$this->db->sql_freeresult($result);
 		unset($padding_store);
@@ -196,7 +196,7 @@ 
 	*/
 	public function display()
 	{
-		$cat_rows	= $subcats = array();
+		$cat_rows = $subcats = array();
 		$parent_id	= $visible_cats = 0;
 
 		$sql_array = array(
@@ -214,7 +214,7 @@ 
 		else
 		{
 			$root_data = $this->data;
-			$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
+			$sql_where = 'left_id > '.$root_data['left_id'].' AND left_id < '.$root_data['right_id'];
 		}
 
 		$sql = $this->db->sql_build_query('SELECT', array(
@@ -261,7 +261,7 @@ 
 			{
 				foreach ($subcats[$dir_cat_id] as $subcat_id => $subcat_row)
 				{
-					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links']+$subcat_row['links']) : $row['cat_links'];
+					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links'] + $subcat_row['links']) : $row['cat_links'];
 
 					if ($subcat_row['display'] && $subcat_row['parent_id'] == $dir_cat_id)
 					{
@@ -316,7 +316,7 @@ 
 			if ($task->is_ready())
 			{
 				$url = $task->get_url();
-				$this->template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="" />');
+				$this->template->assign_var('RUN_CRON_TASK', '<img src="'.$url.'" width="1" height="1" alt="" />');
 			}
 		}
 	}
@@ -338,10 +338,10 @@ 
 				'LEFT_JOIN'	=> array(
 						array(
 							'FROM'	=> array($this->watch_table	=> 'w'),
-							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = ' . (int) $this->user->data['user_id']
+							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = '.(int) $this->user->data['user_id']
 						),
 				),
-				'WHERE'		=> 'c.cat_id = ' . (int) $cat_id
+				'WHERE'		=> 'c.cat_id = '.(int) $cat_id
 			);
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
 			$result = $this->db->sql_query($sql);
@@ -378,7 +378,7 @@ 
 				$this->template->assign_block_vars('dir_navlinks', array(
 					'FORUM_NAME'	=> $parent_data['cat_name'],
 					'FORUM_ID'		=> $parent_cat_id,
-					'MICRODATA'		=> $microdata_attr . '="' . $parent_cat_id . '"',
+					'MICRODATA'		=> $microdata_attr.'="'.$parent_cat_id.'"',
 					'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $parent_cat_id)),
 				));
 			}
@@ -387,7 +387,7 @@ 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $dir_cat_data['cat_name'],
 			'FORUM_ID'		=> $dir_cat_data['cat_id'],
-			'MICRODATA'		=> $microdata_attr . '="' . $dir_cat_data['cat_id'] . '"',
+			'MICRODATA'		=> $microdata_attr.'="'.$dir_cat_data['cat_id'].'"',
 			'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $dir_cat_data['cat_id'])),
 		));
 
@@ -444,7 +444,7 @@ 
 			{
 				if ($mode == 'unwatch')
 				{
-					$sql = 'DELETE FROM ' . $this->watch_table . "
+					$sql = 'DELETE FROM '.$this->watch_table."
 						WHERE cat_id = $cat_id
 							AND user_id = $user_id";
 					$this->db->sql_query($sql);
@@ -454,7 +454,7 @@ 
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -466,8 +466,8 @@ 
 
 					if ($notify_status != NOTIFY_YES)
 					{
-						$sql = 'UPDATE ' . $this->watch_table . '
-							SET notify_status = ' . NOTIFY_YES . "
+						$sql = 'UPDATE '.$this->watch_table.'
+							SET notify_status = ' . NOTIFY_YES."
 							WHERE cat_id = $cat_id
 								AND user_id = $user_id";
 						$this->db->sql_query($sql);
@@ -478,8 +478,8 @@ 
 			{
 				if ($mode == 'watch')
 				{
-					$sql = 'INSERT INTO ' . $this->watch_table . " (user_id, cat_id, notify_status)
-						VALUES ($user_id, $cat_id, " . NOTIFY_YES . ')';
+					$sql = 'INSERT INTO '.$this->watch_table." (user_id, cat_id, notify_status)
+						VALUES ($user_id, $cat_id, ".NOTIFY_YES.')';
 					$this->db->sql_query($sql);
 
 					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
@@ -487,7 +487,7 @@ 
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -507,10 +507,10 @@ 
 
 		if ($can_watch)
 		{
-			$s_watching['link'] 		= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
+			$s_watching['link'] = $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
 			$s_watching['link_toggle'] 	= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => ((!$is_watching) ? 'unwatch' : 'watch')));
-			$s_watching['title'] 		= $this->language->lang((($is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT');
-			$s_watching['title_toggle'] = $this->language->lang(((!$is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT');
+			$s_watching['title'] = $this->language->lang((($is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT');
+			$s_watching['title_toggle'] = $this->language->lang(((!$is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT');
 			$s_watching['is_watching'] 	= $is_watching;
 		}
 
@@ -530,7 +530,7 @@ 
 		$categories_table = $phpbb_container->getParameter('tables.dir.categories');
 
 		$sql = 'SELECT cat_name
-			FROM ' . $categories_table . '
+			FROM ' . $categories_table.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);

core/cron.php

Indentation +30 added lines, -30 removed lines

@@ -39,17 +39,17 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 	$db					Database object
-	* @param \phpbb\config\config 				$config				Config object
-	* @param \phpbb\log\log						$phpbb_log			Log object
-	* @param \phpbb\user 						$user				User object
-	* @param \phpbb\notification\manager		$notification		Notification 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\log\log						$phpbb_log			Log object
+	 * @param \phpbb\user 						$user				User object
+	 * @param \phpbb\notification\manager		$notification		Notification 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\log\log $phpbb_log, \phpbb\user $user, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -63,11 +63,11 @@ 
 	}
 
 	/**
-	* Method called by cron task.
-	*
-	* @param	array	$cat_data	Information about category, from db
-	* @return	null
-	*/
+	 * Method called by cron task.
+	 *
+	 * @param	array	$cat_data	Information about category, from db
+	 * @return	null
+	 */
 	public function auto_check($cat_data)
 	{
 		$sql = 'SELECT cat_name
@@ -116,14 +116,14 @@ 
 	}
 
 	/**
-	* Check, for website with backlink specified, if backlink is always here.
-	* After $nb_check verification, website is deleted, otherwise, a notification is send to poster
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$nb_check	Number of check before demete a website
-	* @param	int		$next_prune	Date of next auto check
-	* @return	null
-	*/
+	 * Check, for website with backlink specified, if backlink is always here.
+	 * After $nb_check verification, website is deleted, otherwise, a notification is send to poster
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$nb_check	Number of check before demete a website
+	 * @param	int		$next_prune	Date of next auto check
+	 * @return	null
+	 */
 	private function _check($cat_id, $nb_check, $next_prune)
 	{
 		$del_array = $update_array = array();
@@ -171,12 +171,12 @@ 
 	}
 
 	/**
-	* Update website verification number after a missing backlink, and send notificaton
-	*
-	* @param	array	$u_array	Information about website
-	* @param	int		$next_prune	Date of next auto check
-	* @return	null
-	*/
+	 * Update website verification number after a missing backlink, and send notificaton
+	 *
+	 * @param	array	$u_array	Information about website
+	 * @param	int		$next_prune	Date of next auto check
+	 * @return	null
+	 */
 	private function _update_check($u_array, $next_prune)
 	{
 		if (!class_exists('messenger'))

Spacing +14 added lines, -14 removed lines

@@ -52,14 +52,14 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\log\log $phpbb_log, \phpbb\user $user, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
-		$this->phpbb_log		= $phpbb_log;
+		$this->db = $db;
+		$this->config = $config;
+		$this->phpbb_log = $phpbb_log;
 		$this->user				= $user;
-		$this->notification		= $notification;
+		$this->notification = $notification;
 		$this->link				= $link;
-		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	public function auto_check($cat_data)
 	{
 		$sql = 'SELECT cat_name
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $cat_data['cat_id'];
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -83,9 +83,9 @@ 
 
 			$this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
 
-			$sql = 'UPDATE ' . $this->categories_table . "
+			$sql = 'UPDATE '.$this->categories_table."
 			SET cat_cron_next = $next_prune
-			WHERE cat_id = " . (int) $cat_data['cat_id'];
+			WHERE cat_id = ".(int) $cat_data['cat_id'];
 			$this->db->sql_query($sql);
 
 			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), array($row['cat_name']));
@@ -103,7 +103,7 @@ 
 	public function get_cat($cat_id)
 	{
 		$sql = 'SELECT cat_id, cat_cron_enable, cat_cron_next, cat_cron_freq, cat_cron_nb_check
-				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);
@@ -138,7 +138,7 @@ 
 					'ON'	=> 'l.link_user_id = u.user_id'
 				)
 			),
-			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '  . (int) $cat_id);
+			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '.(int) $cat_id);
 
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
 			$result = $this->db->sql_query($sql);
@@ -147,7 +147,7 @@ 
 			{
 				if ($this->link->validate_link_back($row['link_back'], false, true) !== false)
 				{
-					if (!$nb_check || ($row['link_nb_check']+1) >= $nb_check)
+					if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check)
 					{
 						$del_array[] = $row['link_id'];
 					}
@@ -181,7 +181,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);
@@ -190,7 +190,7 @@ 
 		// We need to define it, because we use user->format_date below
 		$this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_nb_check = link_nb_check + 1
 			WHERE ' . $this->db->sql_in_set('link_id', array_keys($u_array));
 		$this->db->sql_query($sql);

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;

core/link.php

Indentation +161 added lines, -161 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 calculate PageRank if needed
-	*
-	* @param	array	$data	Link's data from db
-	* @return	string			Pagerank, 'n/a' or false
-	*/
+	 * Display and calculate PageRank if needed
+	 *
+	 * @param	array	$data	Link's data from db
+	 * @return	string			Pagerank, 'n/a' or false
+	 */
 	public function display_pagerank($data)
 	{
 		if ($this->config['dir_activ_pagerank'])
@@ -507,11 +507,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']))
@@ -549,11 +549,11 @@ 
 	}
 
 	/**
-	* Add a vote in db, for a specifi link
-	*
-	* @param	int		$link_id	Link_id from db
-	* @return	null
-	*/
+	 * Add a vote in db, for a specifi link
+	 *
+	 * @param	int		$link_id	Link_id from db
+	 * @return	null
+	 */
 	public function add_vote($link_id)
 	{
 		$data = array(
@@ -597,11 +597,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'])
@@ -622,12 +622,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)
@@ -642,12 +642,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', '');
@@ -683,13 +683,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 */
@@ -721,13 +721,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))
@@ -835,11 +835,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)))
@@ -852,18 +852,18 @@ 
 	}
 
 	/**
-	* PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
-	*
-	* @copyright 2012 HM2K <hm2k@php.net>
-	* @link http://pagerank.phurix.net/
-	* @author James Wade <hm2k@php.net>
-	* @version $Revision: 2.1 $
-	* @require PHP 4.3.0 (file_get_contents)
-	* @updated 06/10/11
-	*
-	* @param	string		$q	The website URL
-	* @return	string			The calculated pagerank, or -1
-	*/
+	 * PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
+	 *
+	 * @copyright 2012 HM2K <hm2k@php.net>
+	 * @link http://pagerank.phurix.net/
+	 * @author James Wade <hm2k@php.net>
+	 * @version $Revision: 2.1 $
+	 * @require PHP 4.3.0 (file_get_contents)
+	 * @updated 06/10/11
+	 *
+	 * @param	string		$q	The website URL
+	 * @return	string			The calculated pagerank, or -1
+	 */
 	public function pagerank_process($q)
 	{
 		$googleDomains	= array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
@@ -897,12 +897,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 = '';
@@ -937,10 +937,10 @@ 
 	}
 
 	/**
-	* Display recents links added
-	*
-	* @return	null
-	*/
+	 * Display recents links added
+	 *
+	 * @return	null
+	 */
 	public function recents()
 	{
 		if ($this->config['dir_recent_block'])
@@ -1017,13 +1017,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 +53 added lines, -53 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);
 
@@ -486,8 +486,8 @@ 
 			{
 				$pagerank = $this->pagerank_process($data['link_url']);
 
-				$sql = 'UPDATE ' . $this->links_table . '
-					SET link_pagerank = ' . (int) $pagerank . '
+				$sql = 'UPDATE '.$this->links_table.'
+					SET link_pagerank = ' . (int) $pagerank.'
 					WHERE link_id = ' . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 			}
@@ -496,9 +496,9 @@ 
 				$pagerank = (int) $data['link_pagerank'];
 			}
 
-			$prpos=40*$pagerank/10;
-			$prneg=40-$prpos;
-			$html='<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
+			$prpos = 40 * $pagerank / 10;
+			$prneg = 40 - $prpos;
+			$html = '<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
 
 			$pagerank = $pagerank == '-1' ? $this->language->lang('DIR_PAGERANK_NOT_AVAILABLE') : $this->language->lang('DIR_FROM_TEN', $pagerank);
 			return $html.$pagerank;
@@ -543,7 +543,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 '';
 	}
@@ -564,12 +564,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);
 
@@ -577,7 +577,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);
 
@@ -611,8 +611,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']))
 		{
@@ -655,7 +655,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)
 		{
@@ -701,7 +701,7 @@ 
 
 		$file = $upload->handle_upload('files.types.remote', $banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		if (sizeof($file->error))
@@ -732,7 +732,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))
 		{
@@ -763,8 +763,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'))
@@ -866,14 +866,14 @@ 
 	*/
 	public function pagerank_process($q)
 	{
-		$googleDomains	= array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
-		$seed			= $this->language->lang('SEED');
-		$result			= 0x01020345;
+		$googleDomains = array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
+		$seed = $this->language->lang('SEED');
+		$result = 0x01020345;
 		$len			= strlen($q);
 
-		for ($i=0; $i<$len; $i++)
+		for ($i = 0; $i < $len; $i++)
 		{
-			$result ^= ord($seed{$i%strlen($seed)}) ^ ord($q{$i});
+			$result ^= ord($seed{$i % strlen($seed)}) ^ ord($q{$i});
 			$result = (($result >> 23) & 0x1ff) | $result << 9;
 		}
 
@@ -884,10 +884,10 @@ 
 
 		$ch		= sprintf('8%x', $result);
 		$url	= 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
-		$host	= 'toolbarqueries.google'.$googleDomains[mt_rand(0,count($googleDomains)-1)];
+		$host = 'toolbarqueries.google'.$googleDomains[mt_rand(0, count($googleDomains) - 1)];
 
-		$url	= sprintf($url,$host,$ch,$q);
-		@$pr	= trim(file_get_contents($url,false));
+		$url	= sprintf($url, $host, $ch, $q);
+		@$pr	= trim(file_get_contents($url, false));
 
 		if (is_numeric(substr(strrchr($pr, ':'), 1)))
 		{
@@ -929,7 +929,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>';
 			}
 		}
 
@@ -945,8 +945,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
 			$sql_array = array(
 				'SELECT'	=> 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
@@ -979,7 +979,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)

notification/type/directory_website.php

Spacing +3 added lines, -3 removed lines

@@ -122,9 +122,9 @@
 		$users = array();
 
 		$sql = 'SELECT user_id
-			FROM ' . $this->watch_table . '
-			WHERE cat_id = ' . (int) $data['cat_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
+			FROM ' . $this->watch_table.'
+			WHERE cat_id = ' . (int) $data['cat_id'].'
+				AND notify_status = ' . NOTIFY_YES.'
 				AND user_id <> ' . (int) $data['user_from'];
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))

Indentation +62 added lines, -62 removed lines

@@ -24,11 +24,11 @@ 
 	protected $watch_table;
 
 	/**
-	* Set the controller helper
-	*
-	* @param \phpbb\controller\helper $helper
-	* @return null
-	*/
+	 * Set the controller helper
+	 *
+	 * @param \phpbb\controller\helper $helper
+	 * @return null
+	 */
 	public function set_controller_helper(\phpbb\controller\helper $helper)
 	{
 		$this->helper = $helper;
@@ -46,21 +46,21 @@ 
 	}
 
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website';
 	}
 
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE',
 		'group'	=> 'NOTIFICATION_DIR_UCP',
@@ -75,31 +75,31 @@ 
 	}
 
 	/**
-	* Is available
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is available
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
 	}
 
 	/**
-	* Get link id
-	*
-	* @param array $data The data from the link
-	* @return int
-	*/
+	 * Get link id
+	 *
+	 * @param array $data The data from the link
+	 * @return int
+	 */
 	static public function get_item_id($data)
 	{
 		return (int) $data['link_id'];
 	}
 
 	/**
-	* Get parent id - it's not used
-	*
-	* @param array $data The data from the link
-	*/
+	 * Get parent id - it's not used
+	 *
+	 * @param array $data The data from the link
+	 */
 	static public function get_item_parent_id($data)
 	{
 		// No parent
@@ -107,12 +107,12 @@ 
 	}
 
 	/**
-	* Find the users who want to receive notifications
-	*
-	* @param	array	$data		Data from submit link
-	* @param	array	$options	Options for finding users for notification
-	* @return	array
-	*/
+	 * Find the users who want to receive notifications
+	 *
+	 * @param	array	$data		Data from submit link
+	 * @param	array	$options	Options for finding users for notification
+	 * @return	array
+	 */
 	public function find_users_for_notification($data, $options = array())
 	{
 		$options = array_merge(array(
@@ -144,8 +144,8 @@ 
 	}
 
 	/**
-	* Get the user's avatar
-	*/
+	 * Get the user's avatar
+	 */
 	public function get_avatar()
 	{
 		return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
@@ -153,10 +153,10 @@ 
 
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 
 	public function get_title()
 	{
@@ -169,20 +169,20 @@ 
 
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -194,33 +194,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $this->get_data('cat_id')));
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array($this->get_data('user_from'));
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param	array	$data				Data from submit link
-	* @param	array	$pre_create_data	Data from pre_create_insert_array()
-	* @return	array						Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param	array	$data				Data from submit link
+	 * @param	array	$pre_create_data	Data from pre_create_insert_array()
+	 * @return	array						Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('link_name', $data['link_name']);

textreparser/plugins/cat_description.php

Indentation +2 added lines, -2 removed lines

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

textreparser/plugins/link_description.php

Indentation +2 added lines, -2 removed lines

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