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';
 		}

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 +7 added lines, -7 removed lines

@@ -53,9 +53,9 @@ 
 		$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']));
-		$tpl_ary['U_NEWEST_POST'] = $u_view_topic . '?view=unread#unread';
+		$tpl_ary['U_NEWEST_POST'] = $u_view_topic.'?view=unread#unread';
 
 		$event['tpl_ary'] = $tpl_ary;
 	}
@@ -75,14 +75,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']))
 			{
@@ -108,10 +108,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;
 	}
 
@@ -142,7 +142,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;
 	}
 }

tests/functional/phpbb_functional_test.php

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

event/listener.php

Braces +1 added lines, -2 removed lines

@@ -256,8 +256,7 @@
 		if (!empty($this->topic_data) && isset($param['f']) && isset($param['t']))
 		{
 			$event['generate_page_link_override'] = append_sid($this->base->generate_topic_link($this->topic_data['forum_id'], $this->topic_data['forum_name'], $this->topic_data['topic_id'], $this->topic_data['topic_title'], $start));
-		}
-		else if (!empty($this->forum_data) && isset($param['f']))
+		} else if (!empty($this->forum_data) && isset($param['f']))
 		{
 			$event['generate_page_link_override'] = append_sid($this->base->generate_forum_link($this->forum_data['forum_id'], $this->forum_data['forum_name'], $start));
 		}

Spacing +19 added lines, -19 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.memberlist_view_profile'							=> 'memberlist_view_profile',
 			'core.pagination_generate_page_link'					=> 'pagination_generate_page_link',
 			'core.search_modify_tpl_ary'							=> 'search_modify_tpl_ary',
@@ -98,9 +98,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']))
@@ -141,9 +141,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;
 		}
 	}
@@ -172,14 +172,14 @@ 
 
 		// 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']));
-		$forum_row['U_NEWEST_POST'] = $url . '?view=unread#unread';
+		$forum_row['U_NEWEST_POST'] = $url.'?view=unread#unread';
 
 		$event['subforums_row'] = $subforums_row;
 		$event['forum_row'] = $forum_row;
@@ -215,7 +215,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']));
@@ -230,7 +230,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;
@@ -293,10 +293,10 @@ 
 		$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']));
-		$tpl_ary['U_NEWEST_POST'] = $u_view_topic . '?view=unread#unread';
+		$tpl_ary['U_NEWEST_POST'] = $u_view_topic.'?view=unread#unread';
 
 		$event['tpl_ary'] = $tpl_ary;
 	}
@@ -323,8 +323,8 @@ 
 		$u_view_topic = $this->base->generate_topic_link($topic_row['FORUM_ID'], $topic_row['FORUM_NAME'], $topic_row['TOPIC_ID'], $topic_row['TOPIC_TITLE']);
 		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
 		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($topic_row['FORUM_ID'], $topic_row['FORUM_NAME']));
-		$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_NEWEST_POST'] = $u_view_topic . '?view=unread#unread';
+		$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_NEWEST_POST'] = $u_view_topic.'?view=unread#unread';
 
 		$event['topic_row'] = $topic_row;
 	}
@@ -362,9 +362,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'])),
 		));
 	}
 
@@ -419,7 +419,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;
 	}
 }