tas2580 / seourls

event/base.php

Spacing +8 added lines, -8 removed lines

@@ -55,9 +55,9 @@ 
 	{
 		if ($full)
 		{
-			return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
+			return generate_board_url().'/'.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.$this->title_to_url($topic_title).'-t'.$topic_id.($start ? '-s'.$start : '').'.html';
 		}
-		return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
+		return $this->phpbb_root_path.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.$this->title_to_url($topic_title).'-t'.$topic_id.($start ? '-s'.$start : '').'.html';
 	}
 
 	/**
@@ -74,9 +74,9 @@ 
 	{
 		if ($full)
 		{
-			return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
+			return generate_board_url().'/'.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.($start ? 'index-s'.$start.'.html' : '');
 		}
-		return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
+		return $this->phpbb_root_path.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.($start ? 'index-s'.$start.'.html' : '');
 	}
 
 	/**
@@ -95,12 +95,12 @@ 
 		{
 			for ($j = 0; $j < $replies + 1; $j += $per_page)
 			{
-				$last_post_link = $url . '-s' . $j . '.html';
+				$last_post_link = $url.'-s'.$j.'.html';
 			}
 		}
 		else
 		{
-			$last_post_link = $url . '.html';
+			$last_post_link = $url.'.html';
 		}
 		return $last_post_link;
 	}
@@ -139,9 +139,9 @@ 
 	{
 		if (!$this->auth->acl_get('m_approve', $forum_id))
 		{
-			return (int) $data[$mode . '_approved'];
+			return (int) $data[$mode.'_approved'];
 		}
 
-		return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
+		return (int) $data[$mode.'_approved'] + (int) $data[$mode.'_unapproved'] + (int) $data[$mode.'_softdeleted'];
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
 			{
 				$last_post_link = $url . '-s' . $j . '.html';
 			}
-		}
-		else
+		} else
 		{
 			$last_post_link = $url . '.html';
 		}

Indentation +118 added lines, -118 removed lines

@@ -15,133 +15,133 @@
 class base
 {
 
-	/** @var \phpbb\auth\auth */
-	protected $auth;
+    /** @var \phpbb\auth\auth */
+    protected $auth;
 
-	/** @var \phpbb\config\config */
-	protected $config;
+    /** @var \phpbb\config\config */
+    protected $config;
 
-	/** @var string phpbb_root_path */
-	protected $phpbb_root_path;
+    /** @var string phpbb_root_path */
+    protected $phpbb_root_path;
 
-	/**
-	 * Constructor
-	 *
-	 * @param \phpbb\auth\auth				auth					Authentication object
-	 * @param \phpbb\config\config			$config					Config Object
-	 * @param string						$phpbb_root_path		phpbb_root_path
-	 * @access public
-	 */
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path)
-	{
-		$this->auth = $auth;
-		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-	}
+    /**
+     * Constructor
+     *
+     * @param \phpbb\auth\auth				auth					Authentication object
+     * @param \phpbb\config\config			$config					Config Object
+     * @param string						$phpbb_root_path		phpbb_root_path
+     * @access public
+     */
+    public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path)
+    {
+        $this->auth = $auth;
+        $this->config = $config;
+        $this->phpbb_root_path = $phpbb_root_path;
+    }
 
-	/**
-	 * Generate the SEO link for a topic
-	 *
-	 * @param	int		$forum_id		The ID of the forum
-	 * @param	string	$forum_name		The title of the forum
-	 * @param	int		$topic_id		The ID if the topic
-	 * @param	string	$topic_title	The title of the topic
-	 * @param	int		$start			Optional start parameter
-	 * @param	bool	$full			Return the full URL
-	 * @return	string	The SEO URL
-	 * @access private
-	 */
-	public function generate_topic_link($forum_id, $forum_name, $topic_id, $topic_title, $start = 0, $full = false)
-	{
-		if ($full)
-		{
-			return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
-		}
-		return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
-	}
+    /**
+     * Generate the SEO link for a topic
+     *
+     * @param	int		$forum_id		The ID of the forum
+     * @param	string	$forum_name		The title of the forum
+     * @param	int		$topic_id		The ID if the topic
+     * @param	string	$topic_title	The title of the topic
+     * @param	int		$start			Optional start parameter
+     * @param	bool	$full			Return the full URL
+     * @return	string	The SEO URL
+     * @access private
+     */
+    public function generate_topic_link($forum_id, $forum_name, $topic_id, $topic_title, $start = 0, $full = false)
+    {
+        if ($full)
+        {
+            return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
+        }
+        return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . $this->title_to_url($topic_title) . '-t' . $topic_id . ($start ? '-s' . $start : '') . '.html';
+    }
 
-	/**
-	 * Generate the SEO link for a forum
-	 *
-	 * @param	int		$forum_id		The ID of the forum
-	 * @param	string	$forum_name		The title of the forum
-	 * @param	int		$start			Optional start parameter
-	 * @param	bool	$full			Return the full URL
-	 * @return	string	The SEO URL
-	 * @access private
-	 */
-	public function generate_forum_link($forum_id, $forum_name, $start = 0, $full = false)
-	{
-		if ($full)
-		{
-			return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
-		}
-		return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
-	}
+    /**
+     * Generate the SEO link for a forum
+     *
+     * @param	int		$forum_id		The ID of the forum
+     * @param	string	$forum_name		The title of the forum
+     * @param	int		$start			Optional start parameter
+     * @param	bool	$full			Return the full URL
+     * @return	string	The SEO URL
+     * @access private
+     */
+    public function generate_forum_link($forum_id, $forum_name, $start = 0, $full = false)
+    {
+        if ($full)
+        {
+            return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
+        }
+        return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : '');
+    }
 
-	/**
-	 *
-	 * @global	type	$_SID
-	 * @param	int		$replies	Replays in the topic
-	 * @param	string	$url		URL oft the topic
-	 * @return	string				The URL with start included
-	 */
-	public function generate_lastpost_link($replies, $url)
-	{
-		$url = str_replace('.html', '', $url);
-		$per_page = ($this->config['posts_per_page'] <= 0) ? 1 : $this->config['posts_per_page'];
-		$last_post_link = '';
-		if (($replies + 1) > $per_page)
-		{
-			for ($j = 0; $j < $replies + 1; $j += $per_page)
-			{
-				$last_post_link = $url . '-s' . $j . '.html';
-			}
-		}
-		else
-		{
-			$last_post_link = $url . '.html';
-		}
-		return $last_post_link;
-	}
+    /**
+     *
+     * @global	type	$_SID
+     * @param	int		$replies	Replays in the topic
+     * @param	string	$url		URL oft the topic
+     * @return	string				The URL with start included
+     */
+    public function generate_lastpost_link($replies, $url)
+    {
+        $url = str_replace('.html', '', $url);
+        $per_page = ($this->config['posts_per_page'] <= 0) ? 1 : $this->config['posts_per_page'];
+        $last_post_link = '';
+        if (($replies + 1) > $per_page)
+        {
+            for ($j = 0; $j < $replies + 1; $j += $per_page)
+            {
+                $last_post_link = $url . '-s' . $j . '.html';
+            }
+        }
+        else
+        {
+            $last_post_link = $url . '.html';
+        }
+        return $last_post_link;
+    }
 
-	/**
-	 * Replace letters to use title in URL
-	 *
-	 * @param	string	$title	The title to use in the URL
-	 * @return	string	Title to use in URLs
-	 */
-	public static function title_to_url($title)
-	{
-		$url = strtolower(censor_text(utf8_normalize_nfc(strip_tags($title))));
+    /**
+     * Replace letters to use title in URL
+     *
+     * @param	string	$title	The title to use in the URL
+     * @return	string	Title to use in URLs
+     */
+    public static function title_to_url($title)
+    {
+        $url = strtolower(censor_text(utf8_normalize_nfc(strip_tags($title))));
 
-		// Let's replace
-		$url_search = array(' ', 'í', 'ý', 'ß', 'ö', 'ô', 'ó', 'ò', 'ä', 'â', 'à', 'á', 'é', 'è', 'ü', 'ú', 'ù', 'ñ', 'ß', '²', '³', '@', '€', '$');
-		$url_replace = array('-', 'i', 'y', 's', 'oe', 'o', 'o', 'o', 'ae', 'a', 'a', 'a', 'e', 'e', 'ue', 'u', 'u', 'n', 'ss', '2', '3', 'at', 'eur', 'usd');
-		$url = str_replace($url_search, $url_replace, $url);
-		$url_search = array('&amp;', '&quot;', '&', '"', "'", '¸', '`', '(', ')', '[', ']', '<', '>', '{', '}', '.', ':', ',', ';', '!', '?', '+', '*', '/', '=', 'µ', '#', '~', '"', '§', '%', '|', '°', '^', '„', '“');
-		$url = str_replace($url_search, '-', $url);
-		$url = str_replace(array('----', '---', '--'), '-', $url);
+        // Let's replace
+        $url_search = array(' ', 'í', 'ý', 'ß', 'ö', 'ô', 'ó', 'ò', 'ä', 'â', 'à', 'á', 'é', 'è', 'ü', 'ú', 'ù', 'ñ', 'ß', '²', '³', '@', '€', '$');
+        $url_replace = array('-', 'i', 'y', 's', 'oe', 'o', 'o', 'o', 'ae', 'a', 'a', 'a', 'e', 'e', 'ue', 'u', 'u', 'n', 'ss', '2', '3', 'at', 'eur', 'usd');
+        $url = str_replace($url_search, $url_replace, $url);
+        $url_search = array('&amp;', '&quot;', '&', '"', "'", '¸', '`', '(', ')', '[', ']', '<', '>', '{', '}', '.', ':', ',', ';', '!', '?', '+', '*', '/', '=', 'µ', '#', '~', '"', '§', '%', '|', '°', '^', '„', '“');
+        $url = str_replace($url_search, '-', $url);
+        $url = str_replace(array('----', '---', '--'), '-', $url);
 
-		$url = substr($url, 0, 50); // Max length for a title in URL
-		return urlencode($url);
-	}
+        $url = substr($url, 0, 50); // Max length for a title in URL
+        return urlencode($url);
+    }
 
-	/**
-	 * Get the topics post count or the forums post/topic count based on permissions
-	 *
-	 * @param $mode            string    One of topic_posts, forum_posts or forum_topics
-	 * @param $data            array    Array with the topic/forum data to calculate from
-	 * @param $forum_id        int        The forum id is used for permission checks
-	 * @return int    Number of posts/topics the user can see in the topic/forum
-	 */
-	public function get_count($mode, $data, $forum_id)
-	{
-		if (!$this->auth->acl_get('m_approve', $forum_id))
-		{
-			return (int) $data[$mode . '_approved'];
-		}
+    /**
+     * Get the topics post count or the forums post/topic count based on permissions
+     *
+     * @param $mode            string    One of topic_posts, forum_posts or forum_topics
+     * @param $data            array    Array with the topic/forum data to calculate from
+     * @param $forum_id        int        The forum id is used for permission checks
+     * @return int    Number of posts/topics the user can see in the topic/forum
+     */
+    public function get_count($mode, $data, $forum_id)
+    {
+        if (!$this->auth->acl_get('m_approve', $forum_id))
+        {
+            return (int) $data[$mode . '_approved'];
+        }
 
-		return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
-	}
+        return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
+    }
 }

event/extensions.php

Braces +1 added lines, -2 removed lines

@@ -71,8 +71,7 @@
 			if (isset($row['topic_id']))
 			{
 				$url_data[$id]['url'] = $this->base->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'],  $data['start'], true);
-			}
-			else if (isset($row['forum_id']))
+			} else if (isset($row['forum_id']))
 			{
 				$url_data[$id]['url'] = $this->base->generate_forum_link($row['forum_id'], $row['forum_name'], $data['start'], true);
 			}

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
 		$tpl_ary = $event['tpl_ary'];
 		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
 		$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
-		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($tpl_ary['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($tpl_ary['REPLIES'], $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
 
 		$event['tpl_ary'] = $tpl_ary;
@@ -74,14 +74,14 @@ 
 			return;
 		}
 
-		$url_data =$event['url_data'] ;
+		$url_data = $event['url_data'];
 
 		foreach ($url_data as $id => $data)
 		{
 			$row = $data['row'];
 			if (isset($row['topic_id']))
 			{
-				$url_data[$id]['url'] = $this->base->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'],  $data['start'], true);
+				$url_data[$id]['url'] = $this->base->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'], $data['start'], true);
 			}
 			else if (isset($row['forum_id']))
 			{
@@ -107,10 +107,10 @@ 
 		$this->topic_id = $event['row']['topic_id'];
 
 		$topic_row = $event['topic_row'];
-		$u_view_topic= $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
+		$u_view_topic = $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
 		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
 		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($topic_row['TOPIC_REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($topic_row['TOPIC_REPLIES'], $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$event['topic_row'] = $topic_row;
 	}
 
@@ -141,7 +141,7 @@ 
 		$tpl_ary = $event['tpl_ary'];
 		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
 		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
-		$tpl_ary['U_TOPIC'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$tpl_ary['U_TOPIC'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$event['tpl_ary'] = $tpl_ary;
 	}
 }

Indentation +116 added lines, -116 removed lines

@@ -16,132 +16,132 @@
  */
 class extensions implements EventSubscriberInterface
 {
-	/** @var \tas2580\seourls\event\base */
-	protected $base;
+    /** @var \tas2580\seourls\event\base */
+    protected $base;
 
-	/**
-	 * Constructor
-	 *
-	 * @param \tas2580\seourls\event\base		$base
-	 * @access public
-	 */
-	public function __construct(\tas2580\seourls\event\base $base)
-	{
-		$this->base = $base;
-	}
+    /**
+     * Constructor
+     *
+     * @param \tas2580\seourls\event\base		$base
+     * @access public
+     */
+    public function __construct(\tas2580\seourls\event\base $base)
+    {
+        $this->base = $base;
+    }
 
-	/**
-	 * Assign functions defined in this class to event listeners in the core
-	 *
-	 * @return array
-	 * @static
-	 * @access public
-	 */
-	public static function getSubscribedEvents()
-	{
-		return array(
-			'rmcgirr83.topfive.sql_pull_topics_data'	=> 'topfive_sql_pull_topics_data',
-			'rmcgirr83.topfive.modify_tpl_ary'			=> 'topfive_modify_tpl_ary',
-			'tas2580.sitemap.modify_before_output'		=> 'sitemap_modify_before_output',
-			'vse.similartopics.modify_topicrow'			=> 'similartopics_modify_topicrow',
-			'paybas.recenttopics.modify_tpl_ary'		=> 'recenttopics_modify_tpl_ary'
-		);
-	}
+    /**
+     * Assign functions defined in this class to event listeners in the core
+     *
+     * @return array
+     * @static
+     * @access public
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'rmcgirr83.topfive.sql_pull_topics_data'	=> 'topfive_sql_pull_topics_data',
+            'rmcgirr83.topfive.modify_tpl_ary'			=> 'topfive_modify_tpl_ary',
+            'tas2580.sitemap.modify_before_output'		=> 'sitemap_modify_before_output',
+            'vse.similartopics.modify_topicrow'			=> 'similartopics_modify_topicrow',
+            'paybas.recenttopics.modify_tpl_ary'		=> 'recenttopics_modify_tpl_ary'
+        );
+    }
 
-	public function recenttopics_modify_tpl_ary($event)
-	{
-		$tpl_ary = $event['tpl_ary'];
-		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
-		$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
-		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($tpl_ary['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
-		$tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
+    public function recenttopics_modify_tpl_ary($event)
+    {
+        $tpl_ary = $event['tpl_ary'];
+        $u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
+        $tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
+        $tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($tpl_ary['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+        $tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
 
-		$event['tpl_ary'] = $tpl_ary;
-	}
+        $event['tpl_ary'] = $tpl_ary;
+    }
 
-	/**
-	 * Rewrite URLs in tas2580 Sitemap Extension
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function sitemap_modify_before_output($event)
-	{
-		// Nothing to rewrite in the sitemap index
-		if ($event['type'] == 'sitemapindex')
-		{
-			return;
-		}
+    /**
+     * Rewrite URLs in tas2580 Sitemap Extension
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function sitemap_modify_before_output($event)
+    {
+        // Nothing to rewrite in the sitemap index
+        if ($event['type'] == 'sitemapindex')
+        {
+            return;
+        }
 
-		$url_data =$event['url_data'] ;
+        $url_data =$event['url_data'] ;
 
-		foreach ($url_data as $id => $data)
-		{
-			$row = $data['row'];
-			if (isset($row['topic_id']))
-			{
-				$url_data[$id]['url'] = $this->base->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'],  $data['start'], true);
-			}
-			else if (isset($row['forum_id']))
-			{
-				$url_data[$id]['url'] = $this->base->generate_forum_link($row['forum_id'], $row['forum_name'], $data['start'], true);
-			}
-		}
+        foreach ($url_data as $id => $data)
+        {
+            $row = $data['row'];
+            if (isset($row['topic_id']))
+            {
+                $url_data[$id]['url'] = $this->base->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'],  $data['start'], true);
+            }
+            else if (isset($row['forum_id']))
+            {
+                $url_data[$id]['url'] = $this->base->generate_forum_link($row['forum_id'], $row['forum_name'], $data['start'], true);
+            }
+        }
 
-		$event['url_data'] = $url_data;
-	}
+        $event['url_data'] = $url_data;
+    }
 
-	/**
-	 * Rewrite URLs in Similar Topics Extension
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function similartopics_modify_topicrow($event)
-	{
-		$this->forum_title = $event['row']['forum_name'];
-		$this->forum_id = $event['row']['forum_id'];
-		$this->topic_title = $event['row']['topic_title'];
-		$this->topic_id = $event['row']['topic_id'];
+    /**
+     * Rewrite URLs in Similar Topics Extension
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function similartopics_modify_topicrow($event)
+    {
+        $this->forum_title = $event['row']['forum_name'];
+        $this->forum_id = $event['row']['forum_id'];
+        $this->topic_title = $event['row']['topic_title'];
+        $this->topic_id = $event['row']['topic_id'];
 
-		$topic_row = $event['topic_row'];
-		$u_view_topic= $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
-		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
-		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($topic_row['TOPIC_REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
-		$event['topic_row'] = $topic_row;
-	}
+        $topic_row = $event['topic_row'];
+        $u_view_topic= $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
+        $topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
+        $topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
+        $topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($topic_row['TOPIC_REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+        $event['topic_row'] = $topic_row;
+    }
 
-	/**
-	 * Rewrite URLs in Top 5 Extension
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function topfive_sql_pull_topics_data($event)
-	{
-		$sql_array = $event['sql_array'];
-		$sql_array['SELECT'] = array_merge($sql_array, array('SELECT' => 'f.forum_name'));
-		$sql_array['LEFT_JOIN'] = array_merge($sql_array['LEFT_JOIN'], array('FROM' => array(FORUMS_TABLE => 'f'), 'ON' => 'f.forum_id = t.forum_id'));
-		$event['sql_array'] = $sql_array;
-	}
+    /**
+     * Rewrite URLs in Top 5 Extension
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function topfive_sql_pull_topics_data($event)
+    {
+        $sql_array = $event['sql_array'];
+        $sql_array['SELECT'] = array_merge($sql_array, array('SELECT' => 'f.forum_name'));
+        $sql_array['LEFT_JOIN'] = array_merge($sql_array['LEFT_JOIN'], array('FROM' => array(FORUMS_TABLE => 'f'), 'ON' => 'f.forum_id = t.forum_id'));
+        $event['sql_array'] = $sql_array;
+    }
 
-	/**
-	 * Rewrite URLs in Top 5 Extension
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function topfive_modify_tpl_ary($event)
-	{
-		$tpl_ary = $event['tpl_ary'];
-		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
-		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
-		$tpl_ary['U_TOPIC'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
-		$event['tpl_ary'] = $tpl_ary;
-	}
+    /**
+     * Rewrite URLs in Top 5 Extension
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function topfive_modify_tpl_ary($event)
+    {
+        $tpl_ary = $event['tpl_ary'];
+        $replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
+        $u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
+        $tpl_ary['U_TOPIC'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+        $event['tpl_ary'] = $tpl_ary;
+    }
 }

event/listener.php

Braces +1 added lines, -2 removed lines

@@ -228,8 +228,7 @@
 		if (!empty($this->topic_title))
 		{
 			$event['generate_page_link_override'] = append_sid($this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title, $start));
-		}
-		else if (!empty($this->forum_title))
+		} else if (!empty($this->forum_title))
 		{
 			$event['generate_page_link_override'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title, $start));
 		}

Indentation +373 added lines, -373 removed lines

@@ -16,377 +16,377 @@
  */
 class listener implements EventSubscriberInterface
 {
-	/** @var \tas2580\seourls\event\base */
-	protected $base;
-
-	/** @var \phpbb\template\template */
-	protected $template;
-
-	/** @var \phpbb\request\request */
-	protected $request;
-
-	/** @var \phpbb\path_helper */
-	protected $path_helper;
-
-	/** @var string phpbb_root_path */
-	protected $phpbb_root_path;
-
-	/** @var string php_ext */
-	protected $php_ext;
-
-	private $in_viewforum;
-
-	/**
-	 * Constructor
-	 *
-	 * @param \tas2580\seourls\event\base	$base
-	 * @param \phpbb\template\template		$template				Template object
-	 * @param \phpbb\request\request		$request				Request object
-	 * @param \phpbb\path_helper			$path_helper			Controller helper object
-	 * @param string						$phpbb_root_path		phpbb_root_path
-	 * @param string						$php_ext				php_ext
-	 * @access public
-	 */
-	public function __construct(\tas2580\seourls\event\base $base, \phpbb\template\template $template, \phpbb\request\request $request, \phpbb\path_helper $path_helper, $phpbb_root_path, $php_ext)
-	{
-		$this->base = $base;
-		$this->template = $template;
-		$this->request = $request;
-		$this->path_helper = $path_helper;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->in_viewtopic = false;
-	}
-
-	/**
-	 * Assign functions defined in this class to event listeners in the core
-	 *
-	 * @return array
-	 * @static
-	 * @access public
-	 */
-	public static function getSubscribedEvents()
-	{
-		return array(
-			'core.append_sid'										=> 'append_sid',
-			'core.display_forums_modify_sql'						=> 'display_forums_modify_sql',
-			'core.display_forums_modify_template_vars'				=> 'display_forums_modify_template_vars',
-			'core.display_forums_modify_forum_rows'					=> 'display_forums_modify_forum_rows',
-			'core.display_forums_modify_category_template_vars'		=> 'display_forums_modify_category_template_vars',
-			'core.generate_forum_nav'								=> 'generate_forum_nav',
-			'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary',				// Not in phpBB
-			'core.pagination_generate_page_link'					=> 'pagination_generate_page_link',
-			'core.search_modify_tpl_ary'							=> 'search_modify_tpl_ary',
-			'core.viewforum_modify_topicrow'						=> 'viewforum_modify_topicrow',
-			'core.viewforum_get_topic_data'							=> 'viewforum_get_topic_data',
-			'core.viewtopic_assign_template_vars_before'			=> 'viewtopic_assign_template_vars_before',
-			'core.viewtopic_before_f_read_check'					=> 'viewtopic_before_f_read_check',
-			'core.viewtopic_modify_page_title'						=> 'viewtopic_modify_page_title',
-			'core.viewtopic_modify_post_row'						=> 'viewtopic_modify_post_row',
-			'core.viewtopic_get_post_data'							=> 'viewtopic_get_post_data',
-		);
-	}
-
-	/**
-	 * Correct the path of $viewtopic_url
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function append_sid($event)
-	{
-		if ($this->in_viewtopic && preg_match('#./../viewtopic.' . $this->php_ext  . '#', $event['url']))
-		{
-			$url = '../viewtopic.' . $this->php_ext ;
-			$event['url'] = $url;
-		}
-		if (isset($event['params']['redirect']))
-		{
-			$params = $event['params'];
-			$params['redirect'] = str_replace('..', '.', $event['params']['redirect']);
-			$event['params'] = $params;
-		}
-	}
-
-	/**
-	 * Get informations for the last post from Database
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function display_forums_modify_sql($event)
-	{
-		$sql_array = $event['sql_ary'];
-		$sql_array['LEFT_JOIN'][] = array(
-			'FROM' => array(TOPICS_TABLE => 't'),
-			'ON' => "f.forum_last_post_id = t.topic_last_post_id"
-		);
-		$sql_array['SELECT'] .= ', t.topic_title, t.topic_id, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted';
-		$event['sql_ary'] = $sql_array;
-	}
-
-	/**
-	 * Store informations for the last post in forum_rows array
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function display_forums_modify_forum_rows($event)
-	{
-		$forum_rows = $event['forum_rows'];
-		if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time'])
-		{
-			$forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name'];
-			$forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id'];
-			$forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title'];
-			$event['forum_rows'] = $forum_rows;
-		}
-	}
-
-	/**
-	 * Rewrite links to forums and subforums in forum index
-	 * also correct the path of the forum images if we are in a forum
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function display_forums_modify_template_vars($event)
-	{
-		$subforums_row = $event['subforums_row'];
-		$forum_row = $event['forum_row'];
-
-		// Rewrite URLs of sub forums
-		foreach ($subforums_row as $i => $subforum)
-		{
-			// A little bit a dirty way, but there is no better solution
-			$query = str_replace('&', '&', parse_url($subforum['U_SUBFORUM'], PHP_URL_QUERY));
-			parse_str($query, $id);
-			$subforums_row[$i]['U_SUBFORUM'] = append_sid($this->base->generate_forum_link($id['f'], $subforum['SUBFORUM_NAME']));
-		}
-
-		// Update the image source in forums
-		$img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']);
-		$forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']);
-
-		// Rewrite links to topics, posts and forums
-		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
-		$url = $this->base->generate_topic_link($event['row']['forum_id_last_post'], $event['row']['forum_name_last_post'], $event['row']['topic_id_last_post'], $event['row']['topic_title_last_post']);
-		$forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']);
-		$forum_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME']));
-
-		$event['subforums_row'] = $subforums_row;
-		$event['forum_row'] = $forum_row;
-	}
-
-	/**
-	 * Rewrite the categorie links
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function display_forums_modify_category_template_vars($event)
-	{
-		$cat_row = $event['cat_row'];
-		$row = $event['row'];
-		$cat_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
-		$event['cat_row'] = $cat_row;
-	}
-
-	/**
-	 * Rewrite links in breadcrumbs
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function generate_forum_nav($event)
-	{
-		$forum_data = $event['forum_data'];
-		$navlinks = $event['navlinks'];
-		$navlinks_parents = $event['navlinks_parents'];
-
-		foreach ($navlinks_parents as $id => $data)
-		{
-			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME']));
-		}
-
-		$navlinks['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name']));
-		$event['navlinks'] = $navlinks;
-		$event['navlinks_parents'] = $navlinks_parents;
-	}
-
-	// Not in phpBB
-	public function make_jumpbox_modify_tpl_ary($event)
-	{
-		$tpl_ary = $event['tpl_ary'];
-		$row = $event['row'];
-		foreach ($tpl_ary as $id => $data)
-		{
-			$tpl_ary[$id]['LINK']	 = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
-		}
-
-		$event['tpl_ary'] = $tpl_ary;
-	}
-
-	/**
-	 * Rewrite pagination links
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function pagination_generate_page_link($event)
-	{
-		// If we have a sort key we do not rewrite the URL
-		$query = str_replace('&', '&', parse_url($event['base_url'], PHP_URL_QUERY));
-		parse_str($query, $param);
-		if (isset($param['sd']) || isset($param['sk']) || isset($param['st']))
-		{
-			return;
-		}
-
-		$start = (($event['on_page'] - 1) * $event['per_page']);
-		if (!empty($this->topic_title))
-		{
-			$event['generate_page_link_override'] = append_sid($this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title, $start));
-		}
-		else if (!empty($this->forum_title))
-		{
-			$event['generate_page_link_override'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title, $start));
-		}
-	}
-
-	/**
-	 * Rewrite links in the search result
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function search_modify_tpl_ary($event)
-	{
-		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
-		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
-
-		$tpl_ary = $event['tpl_ary'];
-		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
-		$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
-		$tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
-
-		$event['tpl_ary'] = $tpl_ary;
-	}
-
-	/**
-	 * Rewrite links to topics in forum view
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewforum_modify_topicrow($event)
-	{
-		$topic_row = $event['topic_row'];
-		$this->forum_title = $topic_row['FORUM_NAME'];
-		$this->forum_id = $topic_row['FORUM_ID'];
-		$this->topic_title = $topic_row['TOPIC_TITLE'];
-		$this->topic_id = $topic_row['TOPIC_ID'];
-
-		$u_view_topic = $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
-		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
-		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
-
-		$event['topic_row'] = $topic_row;
-	}
-
-	/**
-	 * Rewrite the canonical URL on viewforum.php
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewforum_get_topic_data($event)
-	{
-		$start = $this->request->variable('start', 0);
-		$this->template->assign_vars(array(
-			'U_VIEW_FORUM'	=> append_sid($this->base->generate_forum_link($event['forum_data']['forum_id'], $event['forum_data']['forum_name'], $start)),
-			'U_CANONICAL'		=> $this->base->generate_forum_link($event['forum_data']['forum_id'], $event['forum_data']['forum_name'], $start, true),
-		));
-	}
-
-	/**
-	 * Rewrite the topic URL for the headline of the topic page and the link back to forum
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewtopic_get_post_data($event)
-	{
-		$data = $event['topic_data'];
-		$this->template->assign_vars(array(
-			'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
-			'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'] , $data['forum_name'])),
-			'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
-		));
-	}
-
-	/**
-	 * Assign topic data to global variables for pagination
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewtopic_assign_template_vars_before($event)
-	{
-		$this->forum_title = $event['topic_data']['forum_name'];
-		$this->forum_id = $event['topic_data']['forum_id'];
-		$this->topic_title = $event['topic_data']['topic_title'];
-		$this->topic_id = $event['topic_data']['topic_id'];
-	}
-
-	public function viewtopic_before_f_read_check()
-	{
-		$this->in_viewtopic = true;
-	}
-
-	/**
-	 * Rewrite the canonical URL on viewtopic.php
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewtopic_modify_page_title($event)
-	{
-		$start = $this->request->variable('start', 0);
-		$data = $event['topic_data'];
-		$this->template->assign_vars(array(
-			'U_CANONICAL'		=> $this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start, true),
-		));
-	}
-
-	/**
-	 * Rewrite mini post img link
-	 *
-	 * @param	object	$event	The event object
-	 * @return	null
-	 * @access	public
-	 */
-	public function viewtopic_modify_post_row($event)
-	{
-		$row = $event['post_row'];
-		$start = $this->request->variable('start', 0);
-		$data = $event['topic_data'];
-		$row['U_MINI_POST'] = append_sid($this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start) . '#p' . $event['row']['post_id']);
-		$event['post_row'] = $row;
-	}
+    /** @var \tas2580\seourls\event\base */
+    protected $base;
+
+    /** @var \phpbb\template\template */
+    protected $template;
+
+    /** @var \phpbb\request\request */
+    protected $request;
+
+    /** @var \phpbb\path_helper */
+    protected $path_helper;
+
+    /** @var string phpbb_root_path */
+    protected $phpbb_root_path;
+
+    /** @var string php_ext */
+    protected $php_ext;
+
+    private $in_viewforum;
+
+    /**
+     * Constructor
+     *
+     * @param \tas2580\seourls\event\base	$base
+     * @param \phpbb\template\template		$template				Template object
+     * @param \phpbb\request\request		$request				Request object
+     * @param \phpbb\path_helper			$path_helper			Controller helper object
+     * @param string						$phpbb_root_path		phpbb_root_path
+     * @param string						$php_ext				php_ext
+     * @access public
+     */
+    public function __construct(\tas2580\seourls\event\base $base, \phpbb\template\template $template, \phpbb\request\request $request, \phpbb\path_helper $path_helper, $phpbb_root_path, $php_ext)
+    {
+        $this->base = $base;
+        $this->template = $template;
+        $this->request = $request;
+        $this->path_helper = $path_helper;
+        $this->phpbb_root_path = $phpbb_root_path;
+        $this->php_ext = $php_ext;
+
+        $this->in_viewtopic = false;
+    }
+
+    /**
+     * Assign functions defined in this class to event listeners in the core
+     *
+     * @return array
+     * @static
+     * @access public
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'core.append_sid'										=> 'append_sid',
+            'core.display_forums_modify_sql'						=> 'display_forums_modify_sql',
+            'core.display_forums_modify_template_vars'				=> 'display_forums_modify_template_vars',
+            'core.display_forums_modify_forum_rows'					=> 'display_forums_modify_forum_rows',
+            'core.display_forums_modify_category_template_vars'		=> 'display_forums_modify_category_template_vars',
+            'core.generate_forum_nav'								=> 'generate_forum_nav',
+            'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary',				// Not in phpBB
+            'core.pagination_generate_page_link'					=> 'pagination_generate_page_link',
+            'core.search_modify_tpl_ary'							=> 'search_modify_tpl_ary',
+            'core.viewforum_modify_topicrow'						=> 'viewforum_modify_topicrow',
+            'core.viewforum_get_topic_data'							=> 'viewforum_get_topic_data',
+            'core.viewtopic_assign_template_vars_before'			=> 'viewtopic_assign_template_vars_before',
+            'core.viewtopic_before_f_read_check'					=> 'viewtopic_before_f_read_check',
+            'core.viewtopic_modify_page_title'						=> 'viewtopic_modify_page_title',
+            'core.viewtopic_modify_post_row'						=> 'viewtopic_modify_post_row',
+            'core.viewtopic_get_post_data'							=> 'viewtopic_get_post_data',
+        );
+    }
+
+    /**
+     * Correct the path of $viewtopic_url
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function append_sid($event)
+    {
+        if ($this->in_viewtopic && preg_match('#./../viewtopic.' . $this->php_ext  . '#', $event['url']))
+        {
+            $url = '../viewtopic.' . $this->php_ext ;
+            $event['url'] = $url;
+        }
+        if (isset($event['params']['redirect']))
+        {
+            $params = $event['params'];
+            $params['redirect'] = str_replace('..', '.', $event['params']['redirect']);
+            $event['params'] = $params;
+        }
+    }
+
+    /**
+     * Get informations for the last post from Database
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function display_forums_modify_sql($event)
+    {
+        $sql_array = $event['sql_ary'];
+        $sql_array['LEFT_JOIN'][] = array(
+            'FROM' => array(TOPICS_TABLE => 't'),
+            'ON' => "f.forum_last_post_id = t.topic_last_post_id"
+        );
+        $sql_array['SELECT'] .= ', t.topic_title, t.topic_id, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted';
+        $event['sql_ary'] = $sql_array;
+    }
+
+    /**
+     * Store informations for the last post in forum_rows array
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function display_forums_modify_forum_rows($event)
+    {
+        $forum_rows = $event['forum_rows'];
+        if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time'])
+        {
+            $forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name'];
+            $forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id'];
+            $forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title'];
+            $event['forum_rows'] = $forum_rows;
+        }
+    }
+
+    /**
+     * Rewrite links to forums and subforums in forum index
+     * also correct the path of the forum images if we are in a forum
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function display_forums_modify_template_vars($event)
+    {
+        $subforums_row = $event['subforums_row'];
+        $forum_row = $event['forum_row'];
+
+        // Rewrite URLs of sub forums
+        foreach ($subforums_row as $i => $subforum)
+        {
+            // A little bit a dirty way, but there is no better solution
+            $query = str_replace('&', '&', parse_url($subforum['U_SUBFORUM'], PHP_URL_QUERY));
+            parse_str($query, $id);
+            $subforums_row[$i]['U_SUBFORUM'] = append_sid($this->base->generate_forum_link($id['f'], $subforum['SUBFORUM_NAME']));
+        }
+
+        // Update the image source in forums
+        $img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']);
+        $forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']);
+
+        // Rewrite links to topics, posts and forums
+        $replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
+        $url = $this->base->generate_topic_link($event['row']['forum_id_last_post'], $event['row']['forum_name_last_post'], $event['row']['topic_id_last_post'], $event['row']['topic_title_last_post']);
+        $forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']);
+        $forum_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME']));
+
+        $event['subforums_row'] = $subforums_row;
+        $event['forum_row'] = $forum_row;
+    }
+
+    /**
+     * Rewrite the categorie links
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function display_forums_modify_category_template_vars($event)
+    {
+        $cat_row = $event['cat_row'];
+        $row = $event['row'];
+        $cat_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
+        $event['cat_row'] = $cat_row;
+    }
+
+    /**
+     * Rewrite links in breadcrumbs
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function generate_forum_nav($event)
+    {
+        $forum_data = $event['forum_data'];
+        $navlinks = $event['navlinks'];
+        $navlinks_parents = $event['navlinks_parents'];
+
+        foreach ($navlinks_parents as $id => $data)
+        {
+            $navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME']));
+        }
+
+        $navlinks['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name']));
+        $event['navlinks'] = $navlinks;
+        $event['navlinks_parents'] = $navlinks_parents;
+    }
+
+    // Not in phpBB
+    public function make_jumpbox_modify_tpl_ary($event)
+    {
+        $tpl_ary = $event['tpl_ary'];
+        $row = $event['row'];
+        foreach ($tpl_ary as $id => $data)
+        {
+            $tpl_ary[$id]['LINK']	 = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
+        }
+
+        $event['tpl_ary'] = $tpl_ary;
+    }
+
+    /**
+     * Rewrite pagination links
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function pagination_generate_page_link($event)
+    {
+        // If we have a sort key we do not rewrite the URL
+        $query = str_replace('&', '&', parse_url($event['base_url'], PHP_URL_QUERY));
+        parse_str($query, $param);
+        if (isset($param['sd']) || isset($param['sk']) || isset($param['st']))
+        {
+            return;
+        }
+
+        $start = (($event['on_page'] - 1) * $event['per_page']);
+        if (!empty($this->topic_title))
+        {
+            $event['generate_page_link_override'] = append_sid($this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title, $start));
+        }
+        else if (!empty($this->forum_title))
+        {
+            $event['generate_page_link_override'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title, $start));
+        }
+    }
+
+    /**
+     * Rewrite links in the search result
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function search_modify_tpl_ary($event)
+    {
+        $replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
+        $u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
+
+        $tpl_ary = $event['tpl_ary'];
+        $tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+        $tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
+        $tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
+
+        $event['tpl_ary'] = $tpl_ary;
+    }
+
+    /**
+     * Rewrite links to topics in forum view
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewforum_modify_topicrow($event)
+    {
+        $topic_row = $event['topic_row'];
+        $this->forum_title = $topic_row['FORUM_NAME'];
+        $this->forum_id = $topic_row['FORUM_ID'];
+        $this->topic_title = $topic_row['TOPIC_TITLE'];
+        $this->topic_id = $topic_row['TOPIC_ID'];
+
+        $u_view_topic = $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
+        $topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
+        $topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
+        $topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+
+        $event['topic_row'] = $topic_row;
+    }
+
+    /**
+     * Rewrite the canonical URL on viewforum.php
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewforum_get_topic_data($event)
+    {
+        $start = $this->request->variable('start', 0);
+        $this->template->assign_vars(array(
+            'U_VIEW_FORUM'	=> append_sid($this->base->generate_forum_link($event['forum_data']['forum_id'], $event['forum_data']['forum_name'], $start)),
+            'U_CANONICAL'		=> $this->base->generate_forum_link($event['forum_data']['forum_id'], $event['forum_data']['forum_name'], $start, true),
+        ));
+    }
+
+    /**
+     * Rewrite the topic URL for the headline of the topic page and the link back to forum
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewtopic_get_post_data($event)
+    {
+        $data = $event['topic_data'];
+        $this->template->assign_vars(array(
+            'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
+            'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'] , $data['forum_name'])),
+            'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
+        ));
+    }
+
+    /**
+     * Assign topic data to global variables for pagination
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewtopic_assign_template_vars_before($event)
+    {
+        $this->forum_title = $event['topic_data']['forum_name'];
+        $this->forum_id = $event['topic_data']['forum_id'];
+        $this->topic_title = $event['topic_data']['topic_title'];
+        $this->topic_id = $event['topic_data']['topic_id'];
+    }
+
+    public function viewtopic_before_f_read_check()
+    {
+        $this->in_viewtopic = true;
+    }
+
+    /**
+     * Rewrite the canonical URL on viewtopic.php
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewtopic_modify_page_title($event)
+    {
+        $start = $this->request->variable('start', 0);
+        $data = $event['topic_data'];
+        $this->template->assign_vars(array(
+            'U_CANONICAL'		=> $this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start, true),
+        ));
+    }
+
+    /**
+     * Rewrite mini post img link
+     *
+     * @param	object	$event	The event object
+     * @return	null
+     * @access	public
+     */
+    public function viewtopic_modify_post_row($event)
+    {
+        $row = $event['post_row'];
+        $start = $this->request->variable('start', 0);
+        $data = $event['topic_data'];
+        $row['U_MINI_POST'] = append_sid($this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start) . '#p' . $event['row']['post_id']);
+        $event['post_row'] = $row;
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -75,7 +75,7 @@ 
 			'core.display_forums_modify_forum_rows'					=> 'display_forums_modify_forum_rows',
 			'core.display_forums_modify_category_template_vars'		=> 'display_forums_modify_category_template_vars',
 			'core.generate_forum_nav'								=> 'generate_forum_nav',
-			'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary',				// Not in phpBB
+			'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary', // Not in phpBB
 			'core.pagination_generate_page_link'					=> 'pagination_generate_page_link',
 			'core.search_modify_tpl_ary'							=> 'search_modify_tpl_ary',
 			'core.viewforum_modify_topicrow'						=> 'viewforum_modify_topicrow',
@@ -97,9 +97,9 @@ 
 	 */
 	public function append_sid($event)
 	{
-		if ($this->in_viewtopic && preg_match('#./../viewtopic.' . $this->php_ext  . '#', $event['url']))
+		if ($this->in_viewtopic && preg_match('#./../viewtopic.'.$this->php_ext.'#', $event['url']))
 		{
-			$url = '../viewtopic.' . $this->php_ext ;
+			$url = '../viewtopic.'.$this->php_ext;
 			$event['url'] = $url;
 		}
 		if (isset($event['params']['redirect']))
@@ -140,9 +140,9 @@ 
 		$forum_rows = $event['forum_rows'];
 		if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time'])
 		{
-			$forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name'];
-			$forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id'];
-			$forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title'];
+			$forum_rows[$event['parent_id']]['forum_name_last_post'] = $event['row']['forum_name'];
+			$forum_rows[$event['parent_id']]['topic_id_last_post'] = $event['row']['topic_id'];
+			$forum_rows[$event['parent_id']]['topic_title_last_post'] = $event['row']['topic_title'];
 			$event['forum_rows'] = $forum_rows;
 		}
 	}
@@ -171,12 +171,12 @@ 
 
 		// Update the image source in forums
 		$img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']);
-		$forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']);
+		$forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="'.$img.'" alt', $forum_row['FORUM_IMAGE']);
 
 		// Rewrite links to topics, posts and forums
 		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
 		$url = $this->base->generate_topic_link($event['row']['forum_id_last_post'], $event['row']['forum_name_last_post'], $event['row']['topic_id_last_post'], $event['row']['topic_title_last_post']);
-		$forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']);
+		$forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url).'#p'.$event['row']['forum_last_post_id']);
 		$forum_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME']));
 
 		$event['subforums_row'] = $subforums_row;
@@ -213,7 +213,7 @@ 
 
 		foreach ($navlinks_parents as $id => $data)
 		{
-			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME']));
+			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'], $data['FORUM_NAME']));
 		}
 
 		$navlinks['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name']));
@@ -228,7 +228,7 @@ 
 		$row = $event['row'];
 		foreach ($tpl_ary as $id => $data)
 		{
-			$tpl_ary[$id]['LINK']	 = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
+			$tpl_ary[$id]['LINK'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
 		}
 
 		$event['tpl_ary'] = $tpl_ary;
@@ -275,7 +275,7 @@ 
 		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
 
 		$tpl_ary = $event['tpl_ary'];
-		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
 		$tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
 
@@ -300,7 +300,7 @@ 
 		$u_view_topic = $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
 		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
 		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$topic_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 
 		$event['topic_row'] = $topic_row;
 	}
@@ -332,9 +332,9 @@ 
 	{
 		$data = $event['topic_data'];
 		$this->template->assign_vars(array(
-			'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
-			'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'] , $data['forum_name'])),
-			'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
+			'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
+			'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'], $data['forum_name'])),
+			'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
 		));
 	}
 
@@ -386,7 +386,7 @@ 
 		$row = $event['post_row'];
 		$start = $this->request->variable('start', 0);
 		$data = $event['topic_data'];
-		$row['U_MINI_POST'] = append_sid($this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start) . '#p' . $event['row']['post_id']);
+		$row['U_MINI_POST'] = append_sid($this->base->generate_topic_link($data['forum_id'], $data['forum_name'], $data['topic_id'], $data['topic_title'], $start).'#p'.$event['row']['post_id']);
 		$event['post_row'] = $row;
 	}
 }

tests/base/database_test.php

Indentation +11 added lines, -11 removed lines

@@ -4,15 +4,15 @@
 
 abstract class database_test extends \phpbb_database_test_case
 {
-	static protected function setup_extensions()
-	{
-		return array('tas2580/seourls');
-	}
-	protected $db;
-	public function setUp()
-	{
-		parent::setUp();
-		global $db;
-		$db = $this->db = $this->new_dbal();
-	}
+    static protected function setup_extensions()
+    {
+        return array('tas2580/seourls');
+    }
+    protected $db;
+    public function setUp()
+    {
+        parent::setUp();
+        global $db;
+        $db = $this->db = $this->new_dbal();
+    }
 }
\ No newline at end of file

tests/base/functional_test.php

Indentation +4 added lines, -4 removed lines

@@ -3,8 +3,8 @@
 namespace tas2580\seourls\tests\base;
 abstract class functional_test extends \phpbb_functional_test_case
 {
-	static protected function setup_extensions()
-	{
-		return array('tas2580/seourls');
-	}
+    static protected function setup_extensions()
+    {
+        return array('tas2580/seourls');
+    }
 }

tests/functional/phpbb_functional_test.php

Indentation +12 added lines, -12 removed lines

@@ -5,16 +5,16 @@
  */
 class phpbb_functional_test extends \tas2580\seourls\tests\base\functional_test
 {
-	public function test_version_check()
-	{
-		// Log in to the ACP
-		$this->login();
-		$this->admin_login();
-		$this->add_lang('acp/extensions');
-		// Load the Pages extension details
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=tas2580%2Fseourls&sid=' . $this->sid);
-		// Assert extension is up to date
-		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
-		$this->assertContains($this->lang('UP_TO_DATE', 'SEO URLs'), $crawler->text());
-	}
+    public function test_version_check()
+    {
+        // Log in to the ACP
+        $this->login();
+        $this->admin_login();
+        $this->add_lang('acp/extensions');
+        // Load the Pages extension details
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=tas2580%2Fseourls&sid=' . $this->sid);
+        // Assert extension is up to date
+        $this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
+        $this->assertContains($this->lang('UP_TO_DATE', 'SEO URLs'), $crawler->text());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 		$this->admin_login();
 		$this->add_lang('acp/extensions');
 		// Load the Pages extension details
-		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=tas2580%2Fseourls&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=tas2580%2Fseourls&sid='.$this->sid);
 		// Assert extension is up to date
 		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
 		$this->assertContains($this->lang('UP_TO_DATE', 'SEO URLs'), $crawler->text());