ErnadoO / ext-phpbb-directory

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;

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(

core/helper.php

Indentation +43 added lines, -43 removed lines

@@ -37,37 +37,37 @@ 
 	private $ext_name = 'ernadoo/phpbbdirectory';
 
 	/**
-	* Set the extension manager
-	*
-	* @param \phpbb\extension\manager	$phpbb_extension_manager
-	* @return null
-	*/
+	 * Set the extension manager
+	 *
+	 * @param \phpbb\extension\manager	$phpbb_extension_manager
+	 * @return null
+	 */
 	public function set_extension_manager(\phpbb\extension\manager $phpbb_extension_manager)
 	{
 		$this->extension_manager	= $phpbb_extension_manager;
 	}
 
 	/**
-	* Set the path helper
-	*
-	* @param \phpbb\path_helper	$path_helper
-	* @return null
-	*/
+	 * Set the path helper
+	 *
+	 * @param \phpbb\path_helper	$path_helper
+	 * @return null
+	 */
 	public function set_path_helper(\phpbb\path_helper $path_helper)
 	{
 		$this->path_helper = $path_helper;
 	}
 
 	/**
-	* Set the tables names
-	*
-	* @param string	$categories_table
-	* @param string	$comments_table
-	* @param string	$links_table
-	* @param string	$votes_table
-	* @param string	$watch_table
-	* @return null
-	*/
+	 * Set the tables names
+	 *
+	 * @param string	$categories_table
+	 * @param string	$comments_table
+	 * @param string	$links_table
+	 * @param string	$votes_table
+	 * @param string	$watch_table
+	 * @return null
+	 */
 	public function set_tables($categories_table, $comments_table, $links_table, $votes_table, $watch_table)
 	{
 		$this->comments_table		= $comments_table;
@@ -77,48 +77,48 @@ 
 		$this->categories_table		= $categories_table;
 	}
 	/**
-	* Return ext name
-	*
-	* @param	bool	$web_root_path Whether the path should be relative to web root
-	* @return	string					Path to an extension
-	*/
+	 * Return ext name
+	 *
+	 * @param	bool	$web_root_path Whether the path should be relative to web root
+	 * @return	string					Path to an extension
+	 */
 	public function get_ext_name($web_root_path = false)
 	{
 		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '') . $this->extension_manager->get_extension_path($this->ext_name);
 	}
 
 	/**
-	* Return path to resource image
-	*
-	* @param	string $type	is ressource type (flags|icons)
-	* @param	string $image	is the resource to display
-	* @return	string			The relative path to ressource
-	*/
+	 * Return path to resource image
+	 *
+	 * @param	string $type	is ressource type (flags|icons)
+	 * @param	string $image	is the resource to display
+	 * @return	string			The relative path to ressource
+	 */
 	public function get_img_path($type, $image = '')
 	{
 		return $this->get_ext_name(true) . 'images/' . $type . '/' . $image;
 	}
 
 	/**
-	* Return path to banner
-	*
-	* @param	string	$banner	is the physical name
-	* @return	string			The relative path to banner
-	*/
+	 * Return path to banner
+	 *
+	 * @param	string	$banner	is the physical name
+	 * @return	string			The relative path to banner
+	 */
 	public function get_banner_path($banner = '')
 	{
 		return 'files/' . $this->get_ext_name() . 'banners/' . $banner;
 	}
 
 	/**
-	* Return array entries that match the pattern
-	*
-	* @link http://php.net/manual/fr/function.preg-grep.php#95787
-	*
-	* @param 	string	$pattern	The pattern to search for
-	* @param	array	$input		The input array
-	* @return	array	$vals		Returns an array indexed using the keys from the input array
-	*/
+	 * Return array entries that match the pattern
+	 *
+	 * @link http://php.net/manual/fr/function.preg-grep.php#95787
+	 *
+	 * @param 	string	$pattern	The pattern to search for
+	 * @param	array	$input		The input array
+	 * @return	array	$vals		Returns an array indexed using the keys from the input array
+	 */
 	public function preg_grep_keys($pattern, $input)
 	{
 		$keys = preg_grep($pattern, array_keys($input));

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
 	*/
 	public function set_extension_manager(\phpbb\extension\manager $phpbb_extension_manager)
 	{
-		$this->extension_manager	= $phpbb_extension_manager;
+		$this->extension_manager = $phpbb_extension_manager;
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	*/
 	public function set_tables($categories_table, $comments_table, $links_table, $votes_table, $watch_table)
 	{
-		$this->comments_table		= $comments_table;
+		$this->comments_table = $comments_table;
 		$this->links_table			= $links_table;
 		$this->votes_table			= $votes_table;
 		$this->watch_table			= $watch_table;
-		$this->categories_table		= $categories_table;
+		$this->categories_table = $categories_table;
 	}
 	/**
 	* Return ext name
@@ -84,7 +84,7 @@ 
 	*/
 	public function get_ext_name($web_root_path = false)
 	{
-		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '') . $this->extension_manager->get_extension_path($this->ext_name);
+		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '').$this->extension_manager->get_extension_path($this->ext_name);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	*/
 	public function get_img_path($type, $image = '')
 	{
-		return $this->get_ext_name(true) . 'images/' . $type . '/' . $image;
+		return $this->get_ext_name(true).'images/'.$type.'/'.$image;
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	*/
 	public function get_banner_path($banner = '')
 	{
-		return 'files/' . $this->get_ext_name() . 'banners/' . $banner;
+		return 'files/'.$this->get_ext_name().'banners/'.$banner;
 	}
 
 	/**

event/listener.php

Indentation +40 added lines, -40 removed lines

@@ -37,16 +37,16 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface		$db				Database object
-	* @param \phpbb\controller\helper				$helper			Controller helper object
-	* @param \phpbb\language\language				$language		Language object
-	* @param \phpbb\template\template				$template		Template object
-	* @param string									$table_prefix 	prefix table
-	* @param string									$php_ext 		phpEx
-	* @access public
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface		$db				Database object
+	 * @param \phpbb\controller\helper				$helper			Controller helper object
+	 * @param \phpbb\language\language				$language		Language object
+	 * @param \phpbb\template\template				$template		Template object
+	 * @param string									$table_prefix 	prefix table
+	 * @param string									$php_ext 		phpEx
+	 * @access public
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\template\template $template, $table_prefix, $php_ext)
 	{
 		$this->db			= $db;
@@ -58,12 +58,12 @@ 
 	}
 
 	/**
-	* Assign functions defined in this class to event listeners in the core
-	*
-	* @return	array
-	* @static
-	* @access	public
-	*/
+	 * Assign functions defined in this class to event listeners in the core
+	 *
+	 * @return	array
+	 * @static
+	 * @access	public
+	 */
 	static public function getSubscribedEvents()
 	{
 		return array(
@@ -76,10 +76,10 @@ 
 	}
 
 	/**
-	* Display links to Directory
-	*
-	* @return null
-	*/
+	 * Display links to Directory
+	 *
+	 * @return null
+	 */
 	public function add_page_header_variables()
 	{
 		$ext_theme_path		= $this->get_ext_name() . '/styles/prosilver/theme/';
@@ -99,11 +99,11 @@ 
 	}
 
 	/**
-	* Show users as viewing Directory on Who Is Online page
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Show users as viewing Directory on Who Is Online page
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function add_page_viewonline($event)
 	{
 		if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/directory') === 0)
@@ -114,11 +114,11 @@ 
 	}
 
 	/**
-	* Load common language files during user setup
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Load common language files during user setup
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function load_language_on_setup($event)
 	{
 		$lang_set_ext = $event['lang_set_ext'];
@@ -130,11 +130,11 @@ 
 	}
 
 	/**
-	* Add administrative permissions to manage Directory
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Add administrative permissions to manage Directory
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function permissions_add_directory($event)
 	{
 		$event->update_subarray('categories', 'dir',	'ACL_CAT_DIRECTORY');
@@ -155,11 +155,11 @@ 
 	}
 
 	/**
-	* Update Directory tables if needed, after deleted an user
-	*
-	* @param	object $event The event object
-	* @return	null
-	*/
+	 * Update Directory tables if needed, after deleted an user
+	 *
+	 * @param	object $event The event object
+	 * @return	null
+	 */
 	public function update_links_with_anonymous($event)
 	{
 		$user_ids = $event['user_ids'];

Spacing +28 added lines, -28 removed lines

@@ -49,12 +49,12 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\template\template $template, $table_prefix, $php_ext)
 	{
-		$this->db			= $db;
-		$this->helper 		= $helper;
+		$this->db = $db;
+		$this->helper = $helper;
 		$this->language		= $language;
 		$this->template 	= $template;
 		$this->table_prefix = $table_prefix;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -82,11 +82,11 @@ 
 	*/
 	public function add_page_header_variables()
 	{
-		$ext_theme_path		= $this->get_ext_name() . '/styles/prosilver/theme/';
+		$ext_theme_path		= $this->get_ext_name().'/styles/prosilver/theme/';
 		$theme_lang_path	= $this->language->get_used_language();
 
 		// Prevent 'Twig_Error_Loader' if user's lang directory doesn't exist
-		if (!file_exists($ext_theme_path . $theme_lang_path . '/directory.css'))
+		if (!file_exists($ext_theme_path.$theme_lang_path.'/directory.css'))
 		{
 			// Fallback to English language.
 			$theme_lang_path = \phpbb\language\language::FALLBACK_LANGUAGE;
@@ -106,10 +106,10 @@ 
 	*/
 	public function add_page_viewonline($event)
 	{
-		if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/directory') === 0)
+		if (strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/directory') === 0)
 		{
-			$event['location']		= $this->language->lang('DIRECTORY');
-			$event['location_url']	= $this->helper->route('ernadoo_phpbbdirectory_base_controller');
+			$event['location'] = $this->language->lang('DIRECTORY');
+			$event['location_url'] = $this->helper->route('ernadoo_phpbbdirectory_base_controller');
 		}
 	}
 
@@ -137,21 +137,21 @@ 
 	*/
 	public function permissions_add_directory($event)
 	{
-		$event->update_subarray('categories', 'dir',	'ACL_CAT_DIRECTORY');
-
-		$event->update_subarray('permissions', 'm_delete_dir',			array('lang' => 'ACL_M_DELETE_DIR', 		'cat' => 'dir'));
-		$event->update_subarray('permissions', 'm_delete_comment_dir',	array('lang' => 'ACL_M_DELETE_COMMENT_DIR',	'cat' => 'dir'));
-		$event->update_subarray('permissions', 'm_edit_dir',			array('lang' => 'ACL_M_EDIT_DIR',			'cat' => 'dir'));
-		$event->update_subarray('permissions', 'm_edit_comment_dir',	array('lang' => 'ACL_M_EDIT_COMMENT_DIR',	'cat' => 'dir'));
-
-		$event->update_subarray('permissions', 'u_comment_dir',			array('lang' => 'ACL_U_COMMENT_DIR',		'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_delete_dir',			array('lang' => 'ACL_U_DELETE_DIR',			'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_delete_comment_dir',	array('lang' => 'ACL_U_DELETE_COMMENT_DIR',	'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_edit_dir',			array('lang' => 'ACL_U_EDIT_DIR',			'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_edit_comment_dir',	array('lang' => 'ACL_U_EDIT_COMMENT_DIR',	'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_search_dir',			array('lang' => 'ACL_U_SEARCH_DIR',			'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_submit_dir',			array('lang' => 'ACL_U_SUBMIT_DIR',			'cat' => 'dir'));
-		$event->update_subarray('permissions', 'u_vote_dir',			array('lang' => 'ACL_U_VOTE_DIR',			'cat' => 'dir'));
+		$event->update_subarray('categories', 'dir', 'ACL_CAT_DIRECTORY');
+
+		$event->update_subarray('permissions', 'm_delete_dir', array('lang' => 'ACL_M_DELETE_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'm_delete_comment_dir', array('lang' => 'ACL_M_DELETE_COMMENT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'm_edit_dir', array('lang' => 'ACL_M_EDIT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'm_edit_comment_dir', array('lang' => 'ACL_M_EDIT_COMMENT_DIR', 'cat' => 'dir'));
+
+		$event->update_subarray('permissions', 'u_comment_dir', array('lang' => 'ACL_U_COMMENT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_delete_dir', array('lang' => 'ACL_U_DELETE_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_delete_comment_dir', array('lang' => 'ACL_U_DELETE_COMMENT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_edit_dir', array('lang' => 'ACL_U_EDIT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_edit_comment_dir', array('lang' => 'ACL_U_EDIT_COMMENT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_search_dir', array('lang' => 'ACL_U_SEARCH_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_submit_dir', array('lang' => 'ACL_U_SUBMIT_DIR', 'cat' => 'dir'));
+		$event->update_subarray('permissions', 'u_vote_dir', array('lang' => 'ACL_U_VOTE_DIR', 'cat' => 'dir'));
 	}
 
 	/**
@@ -169,17 +169,17 @@ 
 			$user_ids = array($user_ids);
 		}
 
-		$sql = 'UPDATE ' . $this->comments_table . '
-			SET comment_user_id = ' . ANONYMOUS . '
+		$sql = 'UPDATE '.$this->comments_table.'
+			SET comment_user_id = ' . ANONYMOUS.'
 			WHERE ' . $this->db->sql_in_set('comment_user_id', $user_ids);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET link_user_id = ' . ANONYMOUS . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET link_user_id = ' . ANONYMOUS.'
 			WHERE ' . $this->db->sql_in_set('link_user_id', $user_ids);
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->watch_table . '
+		$sql = 'DELETE FROM '.$this->watch_table.'
 			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
 		$this->db->sql_query($sql);
 	}

cron/task/core/prune_categorie.php

Indentation +35 added lines, -35 removed lines

@@ -22,11 +22,11 @@ 
 	private $cat_data;
 
 	/**
-	* Constructor.
-	*
-	* @param \phpbb\config\config 				$config			Config object
-	* @param \ernadoo\phpbbdirectory\core\cron	$directory_cron	PhpBB Directory extension link object
-	*/
+	 * Constructor.
+	 *
+	 * @param \phpbb\config\config 				$config			Config object
+	 * @param \ernadoo\phpbbdirectory\core\cron	$directory_cron	PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\config\config $config, \ernadoo\phpbbdirectory\core\cron $directory_cron)
 	{
 		$this->config 		= $config;
@@ -34,66 +34,66 @@ 
 	}
 
 	/**
-	* Manually set categorie data.
-	*
-	* @param array $cat_data Information about a category to be pruned.
-	*/
+	 * Manually set categorie data.
+	 *
+	 * @param array $cat_data Information about a category to be pruned.
+	 */
 	public function set_categorie_data($cat_data)
 	{
 		$this->cat_data = $cat_data;
 	}
 
 	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
+	 * Runs this cron task.
+	 *
+	 * @return null
+	 */
 	public function run()
 	{
 		$this->dir_cron->auto_check($this->cat_data);
 	}
 
 	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* @return bool
-	*/
+	 * Returns whether this cron task can run, given current board configuration.
+	 *
+	 * @return bool
+	 */
 	public function is_runnable()
 	{
 		return !$this->config['use_system_cron'] && !empty($this->cat_data);
 	}
 
 	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* @return bool
-	*/
+	 * Returns whether this cron task should run now, because enough time
+	 * has passed since it was last run.
+	 *
+	 * @return bool
+	 */
 	public function should_run()
 	{
 		return $this->cat_data['cat_cron_enable'] && $this->cat_data['cat_cron_next'] < time();
 	}
 
 	/**
-	* Returns parameters of this cron task as an array.
-	* The array has one key, c, whose value is id of the category to be pruned.
-	*
-	* @return array
-	*/
+	 * Returns parameters of this cron task as an array.
+	 * The array has one key, c, whose value is id of the category to be pruned.
+	 *
+	 * @return array
+	 */
 	public function get_parameters()
 	{
 		return array('c' => $this->cat_data['cat_id']);
 	}
 
 	/**
-	* Parses parameters found in $request, which is an instance of
-	* \phpbb\request\request_interface.
-	*
-	* It is expected to have a key f whose value is id of the forum to be pruned.
-	*
-	* @param	\phpbb\request\request_interface	$request Request object.
-	* @return	null
-	*/
+	 * Parses parameters found in $request, which is an instance of
+	 * \phpbb\request\request_interface.
+	 *
+	 * It is expected to have a key f whose value is id of the forum to be pruned.
+	 *
+	 * @param	\phpbb\request\request_interface	$request Request object.
+	 * @return	null
+	 */
 	public function parse_parameters(\phpbb\request\request_interface $request)
 	{
 		$this->cat_data = array();

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 	*/
 	public function __construct(\phpbb\config\config $config, \ernadoo\phpbbdirectory\core\cron $directory_cron)
 	{
-		$this->config 		= $config;
-		$this->dir_cron 	= $directory_cron;
+		$this->config = $config;
+		$this->dir_cron = $directory_cron;
 	}
 
 	/**

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_dynamic_route_' . $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']);

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 	*/
 	public function get_url()
 	{
-		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
+		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$this->get_data('cat_id'));
 	}
 
 	/**

notification/type/directory_website.php

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_dynamic_route_' . $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 +4 added lines, -4 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))
@@ -200,7 +200,7 @@ 
 	*/
 	public function get_url()
 	{
-		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
+		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$this->get_data('cat_id'));
 	}
 
 	/**