ErnadoO / ext-phpbb-directory

controller/acp/settings.php

Indentation +27 added lines, -27 removed lines

@@ -40,15 +40,15 @@ 
 	private $display_vars;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\config\config		$config		Config 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
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config		$config		Config 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
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->config	= $config;
@@ -62,10 +62,10 @@ 
 	}
 
 	/**
-	* Display config page
-	*
-	* @return null
-	*/
+	 * Display config page
+	 *
+	 * @return null
+	 */
 	public function display_config()
 	{
 		// Output relevant page
@@ -111,10 +111,10 @@ 
 	}
 
 	/**
-	* Validate config vars and update config table if needed
-	*
-	* @return null
-	*/
+	 * Validate config vars and update config table if needed
+	 *
+	 * @return null
+	 */
 	public function process()
 	{
 		$submit	= ($this->request->is_set_post('submit')) ? true : false;
@@ -167,22 +167,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;
 	}
 
 	/**
-	* Build config matrice
-	*
-	* @return null
-	*/
+	 * Build config matrice
+	 *
+	 * @return null
+	 */
 	private function _generate_config()
 	{
 		$this->display_vars = array(

controller/search.php

Indentation +26 added lines, -26 removed lines

@@ -50,21 +50,21 @@ 
 	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\search\fulltext_directory	$search			PhpBB Directory extension search object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie		PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link			PhpBB Directory extension link object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 					$db				Database object
+	 * @param \phpbb\config\config 								$config			Config object
+	 * @param \phpbb\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\search\fulltext_directory	$search			PhpBB Directory extension search object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie		PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link			PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\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\search\fulltext_directory $search, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
 		$this->db			= $db;
@@ -90,12 +90,12 @@ 
 	}
 
 	/**
-	* Search controller
-	*
-	* @param	int	$page	Page number taken from the URL
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Search controller
+	 *
+	 * @param	int	$page	Page number taken from the URL
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function main($page)
 	{
 		if (!$this->auth->acl_get('u_search_dir'))
@@ -319,11 +319,11 @@ 
 	}
 
 	/**
-	*
-	* @param	array	$search_category
-	* @param	bool	$search_child
-	* @return	array	Categories to exclude from search
-	*/
+	 *
+	 * @param	array	$search_category
+	 * @param	bool	$search_child
+	 * @return	array	Categories to exclude from search
+	 */
 	private function _get_exclude_categories(&$search_category, $search_child)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id

migrations/converter/convert_module.php

Indentation +10 added lines, -10 removed lines

@@ -16,11 +16,11 @@ 
 class convert_module extends \phpbb\db\migration\migration
 {
 	/**
-	* Skip this migration if an ACP_DIRECTORY module does not exist
-	*
-	* @return	bool	True if table does not exist
-	* @access	public
-	*/
+	 * Skip this migration if an ACP_DIRECTORY module does not exist
+	 *
+	 * @return	bool	True if table does not exist
+	 * @access	public
+	 */
 	public function effectively_installed()
 	{
 		$sql = 'SELECT module_id
@@ -37,11 +37,11 @@ 
 	}
 
 	/**
-	* Add or update data in the database
-	*
-	* @return	array Array of table data
-	* @access	public
-	*/
+	 * Add or update data in the database
+	 *
+	 * @return	array Array of table data
+	 * @access	public
+	 */
 	public function update_data()
 	{
 		return array(

migrations/converter/convert_notifications.php

Indentation +14 added lines, -14 removed lines

@@ -16,11 +16,11 @@ 
 class convert_notifications extends \phpbb\db\migration\migration
 {
 	/**
-	* Skip this migration if phpbb_directory_notifications table does not exist
-	*
-	* @return	bool	True if table does not exist
-	* @access	public
-	*/
+	 * Skip this migration if phpbb_directory_notifications table does not exist
+	 *
+	 * @return	bool	True if table does not exist
+	 * @access	public
+	 */
 	public function effectively_installed()
 	{
 		return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications');
@@ -34,11 +34,11 @@ 
 	}
 
 	/**
-	* Add or update data in the database
-	*
-	* @return	array Array of table data
-	* @access	public
-	*/
+	 * Add or update data in the database
+	 *
+	 * @return	array Array of table data
+	 * @access	public
+	 */
 	public function update_data()
 	{
 		return array(
@@ -47,10 +47,10 @@ 
 	}
 
 	/**
-	* Copy category track from 3.0.x table
-	*
-	* @return null
-	*/
+	 * Copy category track from 3.0.x table
+	 *
+	 * @return null
+	 */
 	public function copy_from_notifications()
 	{
 		$sql = 'SELECT n_user_id, n_cat_id

migrations/v10x/v1_0_0.php

Indentation +17 added lines, -17 removed lines

@@ -259,10 +259,10 @@ 
 	}
 
 	/**
-	* Create directories for banners/icons uploaded
-	*
-	* @return null
-	*/
+	 * Create directories for banners/icons uploaded
+	 *
+	 * @return null
+	 */
 	public function create_directories()
 	{
 		$directories = array(
@@ -281,10 +281,10 @@ 
 	}
 
 	/**
-	* Remove directories for banners/icons uploaded
-	*
-	* @return null
-	*/
+	 * Remove directories for banners/icons uploaded
+	 *
+	 * @return null
+	 */
 	public function remove_directories()
 	{
 		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
@@ -293,15 +293,15 @@ 
 	}
 
 	/**
-	* Attempts to remove recursively the directory named by dirname.
-	*
-	* @author Mehdi Kabab <http://pioupioum.fr>
-	* @copyright Copyright (C) 2009 Mehdi Kabab
-	* @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
-	*
-	* @param	string	$dirname		Path to the directory.
-	* @return	null
-	*/
+	 * Attempts to remove recursively the directory named by dirname.
+	 *
+	 * @author Mehdi Kabab <http://pioupioum.fr>
+	 * @copyright Copyright (C) 2009 Mehdi Kabab
+	 * @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
+	 *
+	 * @param	string	$dirname		Path to the directory.
+	 * @return	null
+	 */
 	private function _recursive_rmdir($dirname)
 	{
 		if (is_dir($dirname) && !is_link($dirname))

notification/type/directory_website_disapproved.php

Indentation +59 added lines, -59 removed lines

@@ -18,21 +18,21 @@ 
 class directory_website_disapproved extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved';
 	}
 
 	/**
-	* 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(
 		'id'	=> 'dir_moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
@@ -40,17 +40,17 @@ 
 	);
 
 	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
+	 * Permission to check for (in find_users_for_notification)
+	 *
+	 * @var string Permission name
+	 */
 	protected $permission = array('a_', 'm_');
 
 	/**
-	* 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()
 	{
 		$has_permission = $this->auth->acl_gets($this->permission, true);
@@ -59,21 +59,21 @@ 
 	}
 
 	/**
-	* 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
@@ -81,12 +81,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(
@@ -103,10 +103,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()
 	{
 		$link_name = $this->get_data('link_name');
@@ -116,20 +116,20 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_disapproved';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -138,33 +138,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return '';
 	}
 
 	/**
-	* 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();
 	}
 
 	/**
-	* 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']);

notification/type/directory_website_error_cron.php

Indentation +61 added lines, -61 removed lines

@@ -18,52 +18,52 @@ 
 class directory_website_error_cron extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron';
 	}
 
 	/**
-	* 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_ERROR_CHECK',
 		'group'	=> 'NOTIFICATION_DIR_UCP',
 	);
 
 	/**
-	* 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
@@ -71,12 +71,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())
 	{
 		$users = array();
@@ -104,10 +104,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()
 	{
 		$link_name = $this->get_data('link_name');
@@ -117,20 +117,20 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_error_cron';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -142,33 +142,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return '';
 	}
 
 	/**
-	* 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();
 	}
 
 	/**
-	* 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']);
@@ -182,12 +182,12 @@ 
 	}
 
 	/**
-	* Function for preparing the data for update in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	* @return array Array of data ready to be updated in the database
-	*/
+	 * Function for preparing the data for update in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param array $type_data Data unique to this notification type
+	 * @return array Array of data ready to be updated in the database
+	 */
 	public function create_update_array($type_data)
 	{
 		$data = $this->create_insert_array($type_data);

notification/type/directory_website_in_queue.php

Indentation +61 added lines, -61 removed lines

@@ -18,31 +18,31 @@ 
 class directory_website_in_queue extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
 	}
 
 	/**
-	* 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_IN_MODERATION_QUEUE',
 		'group'	=> 'NOTIFICATION_DIR_UCP',
 	);
 
 	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
+	 * Permission to check for (in find_users_for_notification)
+	 *
+	 * @var string Permission name
+	 */
 	protected $permission = 'a_';
 
 	/** @var \phpbb\user_loader */
@@ -54,10 +54,10 @@ 
 	}
 
 	/**
-	* 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()
 	{
 		$has_permission = $this->auth->acl_get($this->permission, true);
@@ -66,21 +66,21 @@ 
 	}
 
 	/**
-	* 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
@@ -88,12 +88,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(
@@ -113,18 +113,18 @@ 
 	}
 
 	/**
-	* 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);
 	}
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 	public function get_title()
 	{
 		$link_name = $this->get_data('link_name');
@@ -134,30 +134,30 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_in_queue';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array();
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		global $phpbb_admin_path;
@@ -166,23 +166,23 @@ 
 	}
 
 	/**
-	* 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('user_from', $data['user_from']);

search/fulltext_directory.php

Indentation +20 added lines, -20 removed lines

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