tas2580 / seourls

event/listener.php

Braces +3 added lines, -6 removed lines

@@ -225,8 +225,7 @@ 
 		if (!empty($this->topic_title))
 		{
 			$event['generate_page_link_override'] = append_sid($this->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->generate_forum_link($this->forum_id, $this->forum_title, $start));
 		}
@@ -378,8 +377,7 @@ 
 			if (isset($row['topic_id']))
 			{
 				$url_data[$id]['url'] = $this->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->generate_forum_link($row['forum_id'], $row['forum_name'], $data['start'], true);
 			}
@@ -498,8 +496,7 @@ 
 			{
 				$last_post_link = $url . '-s' . $j . '.html';
 			}
-		}
-		else
+		} else
 		{
 			$last_post_link = $url . '.html';
 		}

Spacing +28 added lines, -28 removed lines

@@ -83,7 +83,7 @@ 
 			'core.display_forums_modify_forum_rows'		=> 'display_forums_modify_forum_rows',
 			'core.display_forums_modify_sql'			=> 'display_forums_modify_sql',
 			'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',
@@ -110,9 +110,9 @@ 
 	 */
 	public function append_sid($event)
 	{
-		if (preg_match('#./../viewtopic.' . $this->php_ext  . '#', $event['url']))
+		if (preg_match('#./../viewtopic.'.$this->php_ext.'#', $event['url']))
 		{
-			$url = $this->phpbb_root_path . 'viewtopic.' . $this->php_ext ;
+			$url = $this->phpbb_root_path.'viewtopic.'.$this->php_ext;
 			$event['url'] = $url;
 		}
 	}
@@ -147,9 +147,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;
 		}
 	}
@@ -179,12 +179,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->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
 		$url = $this->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->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']);
+		$forum_row['U_LAST_POST'] = append_sid($this->generate_lastpost_link($replies, $url).'#p'.$event['row']['forum_last_post_id']);
 		$forum_row['U_VIEWFORUM'] = append_sid($this->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME']));
 		$event['forum_row'] = $forum_row;
 	}
@@ -204,7 +204,7 @@ 
 
 		foreach ($navlinks_parents as $id => $data)
 		{
-			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME']));
+			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($data['FORUM_ID'], $data['FORUM_NAME']));
 		}
 
 		$navlinks['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name']));
@@ -220,7 +220,7 @@ 
 		foreach ($tpl_ary as $id => $data)
 		{
 
-			$tpl_ary[$id]['LINK']	 = append_sid($this->generate_forum_link($row['forum_id'], $row['forum_name']));
+			$tpl_ary[$id]['LINK'] = append_sid($this->generate_forum_link($row['forum_id'], $row['forum_name']));
 		}
 
 		$event['tpl_ary'] = $tpl_ary;
@@ -267,7 +267,7 @@ 
 		$u_view_topic = $this->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->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$tpl_ary['U_LAST_POST'] = append_sid($this->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->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
 
@@ -292,7 +292,7 @@ 
 		$u_view_topic = $this->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->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->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->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 
 		$event['topic_row'] = $topic_row;
 	}
@@ -326,8 +326,8 @@ 
 	{
 		$data = $event['topic_data'];
 		$this->template->assign_vars(array(
-			'U_VIEW_TOPIC'		=> append_sid($this->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
-			'U_VIEW_FORUM'	=> append_sid($this->generate_forum_link($event['forum_id'] , $data['forum_name'])),
+			'U_VIEW_TOPIC'		=> append_sid($this->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
+			'U_VIEW_FORUM'	=> append_sid($this->generate_forum_link($event['forum_id'], $data['forum_name'])),
 		));
 	}
 
@@ -374,7 +374,7 @@ 
 		$row = $event['post_row'];
 		$start = $this->request->variable('start', 0);
 		$data = $event['topic_data'];
-		$row['U_MINI_POST'] = append_sid($this->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->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;
 	}
 
@@ -393,14 +393,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->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'],  $data['start'], true);
+				$url_data[$id]['url'] = $this->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'], $data['start'], true);
 			}
 			else if (isset($row['forum_id']))
 			{
@@ -426,10 +426,10 @@ 
 		$this->topic_id = $event['row']['topic_id'];
 
 		$topic_row = $event['topic_row'];
-		$u_view_topic= $this->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title);
+		$u_view_topic = $this->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->generate_forum_link($this->forum_id, $this->forum_title));
-		$topic_row['U_LAST_POST'] = append_sid($this->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->generate_lastpost_link($topic_row['TOPIC_REPLIES'], $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$event['topic_row'] = $topic_row;
 	}
 
@@ -460,7 +460,7 @@ 
 		$tpl_ary = $event['tpl_ary'];
 		$replies = $this->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
 		$u_view_topic = $this->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->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
+		$tpl_ary['U_TOPIC'] = append_sid($this->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
 		$event['tpl_ary'] = $tpl_ary;
 	}
 
@@ -480,9 +480,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';
 	}
 
 	/**
@@ -499,9 +499,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' : '');
 	}
 
 	/**
@@ -519,12 +519,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;
 	}
@@ -563,10 +563,10 @@ 
 	{
 		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'];
 	}
 
 }