Completed
Push — master ( 2940c2...33c804 )
by Tobias
04:35
created
event/listener.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 			'core.display_forums_modify_forum_rows'					=> 'display_forums_modify_forum_rows',
76 76
 			'core.display_forums_modify_category_template_vars'		=> 'display_forums_modify_category_template_vars',
77 77
 			'core.generate_forum_nav'								=> 'generate_forum_nav',
78
-			'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary',				// Not in phpBB
78
+			'core.make_jumpbox_modify_tpl_ary'						=> 'make_jumpbox_modify_tpl_ary', // Not in phpBB
79 79
 			'core.memberlist_view_profile'							=> 'memberlist_view_profile',
80 80
 			'core.pagination_generate_page_link'					=> 'pagination_generate_page_link',
81 81
 			'core.search_modify_tpl_ary'							=> 'search_modify_tpl_ary',
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 	 */
99 99
 	public function append_sid($event)
100 100
 	{
101
-		if ($this->in_viewtopic && preg_match('#./../viewtopic.' . $this->php_ext  . '#', $event['url']))
101
+		if ($this->in_viewtopic && preg_match('#./../viewtopic.'.$this->php_ext.'#', $event['url']))
102 102
 		{
103
-			$url = '../viewtopic.' . $this->php_ext ;
103
+			$url = '../viewtopic.'.$this->php_ext;
104 104
 			$event['url'] = $url;
105 105
 		}
106 106
 		if (isset($event['params']['redirect']))
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
 		$forum_rows = $event['forum_rows'];
142 142
 		if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time'])
143 143
 		{
144
-			$forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name'];
145
-			$forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id'];
146
-			$forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title'];
144
+			$forum_rows[$event['parent_id']]['forum_name_last_post'] = $event['row']['forum_name'];
145
+			$forum_rows[$event['parent_id']]['topic_id_last_post'] = $event['row']['topic_id'];
146
+			$forum_rows[$event['parent_id']]['topic_title_last_post'] = $event['row']['topic_title'];
147 147
 			$event['forum_rows'] = $forum_rows;
148 148
 		}
149 149
 	}
@@ -172,14 +172,14 @@  discard block
 block discarded – undo
172 172
 
173 173
 		// Update the image source in forums
174 174
 		$img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']);
175
-		$forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']);
175
+		$forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="'.$img.'" alt', $forum_row['FORUM_IMAGE']);
176 176
 
177 177
 		// Rewrite links to topics, posts and forums
178 178
 		$replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1;
179 179
 		$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']);
180
-		$forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']);
180
+		$forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url).'#p'.$event['row']['forum_last_post_id']);
181 181
 		$forum_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME']));
182
-		$forum_row['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#unread');
182
+		$forum_row['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url).'#unread');
183 183
 
184 184
 		$event['subforums_row'] = $subforums_row;
185 185
 		$event['forum_row'] = $forum_row;
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 
216 216
 		foreach ($navlinks_parents as $id => $data)
217 217
 		{
218
-			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME']));
218
+			$navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'], $data['FORUM_NAME']));
219 219
 		}
220 220
 
221 221
 		$navlinks['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name']));
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 		$row = $event['row'];
231 231
 		foreach ($tpl_ary as $id => $data)
232 232
 		{
233
-			$tpl_ary[$id]['LINK']	 = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
233
+			$tpl_ary[$id]['LINK'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name']));
234 234
 		}
235 235
 
236 236
 		$event['tpl_ary'] = $tpl_ary;
@@ -293,10 +293,10 @@  discard block
 block discarded – undo
293 293
 		$u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']);
294 294
 
295 295
 		$tpl_ary = $event['tpl_ary'];
296
-		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']);
296
+		$tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']);
297 297
 		$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic);
298 298
 		$tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name']));
299
-		$tpl_ary['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#unread');
299
+		$tpl_ary['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic).'#unread');
300 300
 
301 301
 		$event['tpl_ary'] = $tpl_ary;
302 302
 	}
@@ -323,8 +323,8 @@  discard block
 block discarded – undo
323 323
 		$u_view_topic = $this->base->generate_topic_link($topic_row['FORUM_ID'], $topic_row['FORUM_TITLE'], $topic_row['TOPIC_ID'], $topic_row['TOPIC_TITLE']);
324 324
 		$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic);
325 325
 		$topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($topic_row['FORUM_ID'], $topic_row['FORUM_NAME']));
326
-		$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']);
327
-		$topic_row['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic) . '#unread');
326
+		$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']);
327
+		$topic_row['U_NEWEST_POST'] = append_sid($this->base->generate_lastpost_link($event['topic_row']['REPLIES'], $u_view_topic).'#unread');
328 328
 
329 329
 		$event['topic_row'] = $topic_row;
330 330
 	}
@@ -362,9 +362,9 @@  discard block
 block discarded – undo
362 362
 	{
363 363
 		$data = $event['topic_data'];
364 364
 		$this->template->assign_vars(array(
365
-			'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
366
-			'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'] , $data['forum_name'])),
367
-			'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
365
+			'U_VIEW_TOPIC'		=> append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
366
+			'U_VIEW_FORUM'		=> append_sid($this->base->generate_forum_link($event['forum_id'], $data['forum_name'])),
367
+			'S_POLL_ACTION'		=> append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])),
368 368
 		));
369 369
 	}
370 370
 
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 		$row = $event['post_row'];
420 420
 		$start = $this->request->variable('start', 0);
421 421
 		$data = $event['topic_data'];
422
-		$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']);
422
+		$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']);
423 423
 		$event['post_row'] = $row;
424 424
 	}
425 425
 }
Please login to merge, or discard this patch.