@@ -75,7 +75,7 @@ discard block |
||
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.pagination_generate_page_link' => 'pagination_generate_page_link', |
80 | 80 | 'core.search_modify_tpl_ary' => 'search_modify_tpl_ary', |
81 | 81 | 'core.viewforum_modify_topicrow' => 'viewforum_modify_topicrow', |
@@ -97,9 +97,9 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function append_sid($event) |
99 | 99 | { |
100 | - if ($this->in_viewtopic && preg_match('#./../viewtopic.' . $this->php_ext . '#', $event['url'])) |
|
100 | + if ($this->in_viewtopic && preg_match('#./../viewtopic.'.$this->php_ext.'#', $event['url'])) |
|
101 | 101 | { |
102 | - $url = '../viewtopic.' . $this->php_ext ; |
|
102 | + $url = '../viewtopic.'.$this->php_ext; |
|
103 | 103 | $event['url'] = $url; |
104 | 104 | } |
105 | 105 | if (isset($event['params']['redirect'])) |
@@ -140,9 +140,9 @@ discard block |
||
140 | 140 | $forum_rows = $event['forum_rows']; |
141 | 141 | if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time']) |
142 | 142 | { |
143 | - $forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name']; |
|
144 | - $forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id']; |
|
145 | - $forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title']; |
|
143 | + $forum_rows[$event['parent_id']]['forum_name_last_post'] = $event['row']['forum_name']; |
|
144 | + $forum_rows[$event['parent_id']]['topic_id_last_post'] = $event['row']['topic_id']; |
|
145 | + $forum_rows[$event['parent_id']]['topic_title_last_post'] = $event['row']['topic_title']; |
|
146 | 146 | $event['forum_rows'] = $forum_rows; |
147 | 147 | } |
148 | 148 | } |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | |
172 | 172 | // Update the image source in forums |
173 | 173 | $img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']); |
174 | - $forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']); |
|
174 | + $forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="'.$img.'" alt', $forum_row['FORUM_IMAGE']); |
|
175 | 175 | |
176 | 176 | // Rewrite links to topics, posts and forums |
177 | 177 | $replies = $this->base->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1; |
178 | 178 | $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']); |
179 | - $forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']); |
|
179 | + $forum_row['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $url).'#p'.$event['row']['forum_last_post_id']); |
|
180 | 180 | $forum_row['U_VIEWFORUM'] = append_sid($this->base->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME'])); |
181 | 181 | |
182 | 182 | $event['subforums_row'] = $subforums_row; |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | foreach ($navlinks_parents as $id => $data) |
215 | 215 | { |
216 | - $navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME'])); |
|
216 | + $navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($data['FORUM_ID'], $data['FORUM_NAME'])); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | $navlinks['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name'])); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $row = $event['row']; |
229 | 229 | foreach ($tpl_ary as $id => $data) |
230 | 230 | { |
231 | - $tpl_ary[$id]['LINK'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name'])); |
|
231 | + $tpl_ary[$id]['LINK'] = append_sid($this->base->generate_forum_link($row['forum_id'], $row['forum_name'])); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | $event['tpl_ary'] = $tpl_ary; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | $u_view_topic = $this->base->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']); |
276 | 276 | |
277 | 277 | $tpl_ary = $event['tpl_ary']; |
278 | - $tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']); |
|
278 | + $tpl_ary['U_LAST_POST'] = append_sid($this->base->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']); |
|
279 | 279 | $tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic); |
280 | 280 | $tpl_ary['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name'])); |
281 | 281 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | $u_view_topic = $this->base->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title); |
301 | 301 | $topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic); |
302 | 302 | $topic_row['U_VIEW_FORUM'] = append_sid($this->base->generate_forum_link($this->forum_id, $this->forum_title)); |
303 | - $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']); |
|
303 | + $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']); |
|
304 | 304 | |
305 | 305 | $event['topic_row'] = $topic_row; |
306 | 306 | } |
@@ -332,9 +332,9 @@ discard block |
||
332 | 332 | { |
333 | 333 | $data = $event['topic_data']; |
334 | 334 | $this->template->assign_vars(array( |
335 | - 'U_VIEW_TOPIC' => append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
336 | - 'U_VIEW_FORUM' => append_sid($this->base->generate_forum_link($event['forum_id'] , $data['forum_name'])), |
|
337 | - 'S_POLL_ACTION' => append_sid($this->base->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
335 | + 'U_VIEW_TOPIC' => append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
336 | + 'U_VIEW_FORUM' => append_sid($this->base->generate_forum_link($event['forum_id'], $data['forum_name'])), |
|
337 | + 'S_POLL_ACTION' => append_sid($this->base->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
338 | 338 | )); |
339 | 339 | } |
340 | 340 | |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | $row = $event['post_row']; |
387 | 387 | $start = $this->request->variable('start', 0); |
388 | 388 | $data = $event['topic_data']; |
389 | - $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']); |
|
389 | + $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']); |
|
390 | 390 | $event['post_row'] = $row; |
391 | 391 | } |
392 | 392 | } |