ErnadoO / ext-phpbb-directory

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))

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'COLUMNS' => array(
 						'cat_id'				=> array('UINT', null, 'auto_increment'),
 						'parent_id'				=> array('UINT', 0),
@@ -57,7 +57,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_comments' => array(
+				$this->table_prefix.'directory_comments' => array(
 					'COLUMNS' => array(
 						'comment_id' 		=> array('UINT', null, 'auto_increment'),
 						'comment_date' 		=> array('TIMESTAMP', 0),
@@ -73,7 +73,7 @@ 
 					'PRIMARY_KEY'	=> array('comment_id'),
 				),
 
-				$this->table_prefix . 'directory_links' => array(
+				$this->table_prefix.'directory_links' => array(
 					'COLUMNS' => array(
 						'link_id'			=> array('UINT', null, 'auto_increment'),
 						'link_time' 		=> array('TIMESTAMP', 0),
@@ -110,7 +110,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_watch' => array(
+				$this->table_prefix.'directory_watch' => array(
 					'COLUMNS' => array(
 						'cat_id'		=> array('UINT', 0),
 						'user_id'		=> array('UINT', 0),
@@ -125,7 +125,7 @@ 
 
 				),
 
-				$this->table_prefix . 'directory_votes' => array(
+				$this->table_prefix.'directory_votes' => array(
 					'COLUMNS' => array(
 						'vote_id'			=> array('UINT', null, 'auto_increment'),
 						'vote_link_id'		=> array('UINT', 0),
@@ -148,11 +148,11 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'directory_cats',
-				$this->table_prefix . 'directory_comments',
-				$this->table_prefix . 'directory_links',
-				$this->table_prefix . 'directory_votes',
-				$this->table_prefix . 'directory_watch',
+				$this->table_prefix.'directory_cats',
+				$this->table_prefix.'directory_comments',
+				$this->table_prefix.'directory_links',
+				$this->table_prefix.'directory_votes',
+				$this->table_prefix.'directory_watch',
 			),
 		);
 	}
@@ -272,10 +272,10 @@ 
 
 		foreach ($directories as $dir)
 		{
-			if (!file_exists($this->phpbb_root_path . $dir))
+			if (!file_exists($this->phpbb_root_path.$dir))
 			{
-				@mkdir($this->phpbb_root_path . $dir, 0777, true);
-				phpbb_chmod($this->phpbb_root_path . $dir, CHMOD_READ | CHMOD_WRITE);
+				@mkdir($this->phpbb_root_path.$dir, 0777, true);
+				phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	*/
 	public function remove_directories()
 	{
-		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
+		$dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
 
 		$this->_recursive_rmdir($dir);
 	}

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();

Spacing +9 added lines, -9 removed lines

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

notification/type/directory_website.php

Indentation +62 added lines, -62 removed lines

@@ -21,32 +21,32 @@ 
 	protected $helper;
 
 	/**
-	* 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;
 	}
 
 	/**
-	* 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',
@@ -61,31 +61,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
@@ -93,12 +93,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(
@@ -130,8 +130,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);
@@ -139,10 +139,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()
 	{
@@ -155,20 +155,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(
@@ -180,33 +180,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']);

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))

notification/type/directory_website_approved.php

Indentation +64 added lines, -64 removed lines

@@ -21,32 +21,32 @@ 
 	protected $helper;
 
 	/**
-	* 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;
 	}
 
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_approved';
 	}
 
 	/**
-	* 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',
@@ -54,17 +54,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);
@@ -73,21 +73,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
@@ -95,12 +95,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(
@@ -116,10 +116,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');
@@ -129,20 +129,20 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_approved';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -151,33 +151,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();
 	}
 
 	/**
-	* 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']);

migrations/v20x/v2_0_0.php

Indentation +4 added lines, -4 removed lines

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

Spacing +2 added lines, -2 removed lines

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

textreparser/plugins/comment_text.php

Indentation +2 added lines, -2 removed lines

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