ErnadoO / ext-phpbb-directory

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\upload								$files_upload		Upload 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\notification\manager						$notification		Notification object
+	 * @param \phpbb\filesystem\filesystem_interface				$filesystem			phpBB filesystem helper
+	 * @param \FastImageSize\FastImageSize						$imagesize 			FastImageSize class
+	 * @param \phpbb\files\upload								$files_upload		Upload 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\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\upload $files_upload, $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)
 	{
 		$old_banner = $this->root_path  . $this->get_banner_path($file);
@@ -821,12 +821,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 = '';
@@ -861,10 +861,10 @@ 
 	}
 
 	/**
-	* Display recents links added
-	*
-	* @return	null
-	*/
+	 * Display recents links added
+	 *
+	 * @return	null
+	 */
 	public function recents()
 	{
 		if ($this->config['dir_recent_block'])
@@ -941,13 +941,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)

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)
@@ -421,15 +421,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?
@@ -515,11 +515,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;