|
@@ -77,7 +77,7 @@ discard block |
|
|
block discarded – undo |
|
77
|
77
|
'core.display_forums_modify_forum_rows' => 'display_forums_modify_forum_rows', |
|
78
|
78
|
'core.display_forums_modify_sql' => 'display_forums_modify_sql', |
|
79
|
79
|
'core.generate_forum_nav' => 'generate_forum_nav', |
|
80
|
|
- 'core.make_jumpbox_modify_tpl_ary' => 'make_jumpbox_modify_tpl_ary', // Not in phpBB |
|
|
80
|
+ 'core.make_jumpbox_modify_tpl_ary' => 'make_jumpbox_modify_tpl_ary', // Not in phpBB |
|
81
|
81
|
'core.pagination_generate_page_link' => 'pagination_generate_page_link', |
|
82
|
82
|
'core.search_modify_tpl_ary' => 'search_modify_tpl_ary', |
|
83
|
83
|
'core.viewforum_modify_topicrow' => 'viewforum_modify_topicrow', |
|
@@ -125,9 +125,9 @@ discard block |
|
|
block discarded – undo |
|
125
|
125
|
$forum_rows = $event['forum_rows']; |
|
126
|
126
|
if ($event['row']['forum_last_post_time'] == $forum_rows[$event['parent_id']]['forum_last_post_time']) |
|
127
|
127
|
{ |
|
128
|
|
- $forum_rows[$event['parent_id']]['forum_name_last_post'] =$event['row']['forum_name']; |
|
129
|
|
- $forum_rows[$event['parent_id']]['topic_id_last_post'] =$event['row']['topic_id']; |
|
130
|
|
- $forum_rows[$event['parent_id']]['topic_title_last_post'] =$event['row']['topic_title']; |
|
|
128
|
+ $forum_rows[$event['parent_id']]['forum_name_last_post'] = $event['row']['forum_name']; |
|
|
129
|
+ $forum_rows[$event['parent_id']]['topic_id_last_post'] = $event['row']['topic_id']; |
|
|
130
|
+ $forum_rows[$event['parent_id']]['topic_title_last_post'] = $event['row']['topic_title']; |
|
131
|
131
|
$event['forum_rows'] = $forum_rows; |
|
132
|
132
|
} |
|
133
|
133
|
} |
|
@@ -157,12 +157,12 @@ discard block |
|
|
block discarded – undo |
|
157
|
157
|
|
|
158
|
158
|
// Update the image source in forums |
|
159
|
159
|
$img = $this->path_helper->update_web_root_path($forum_row['FORUM_IMAGE_SRC']); |
|
160
|
|
- $forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="' . $img . '" alt', $forum_row['FORUM_IMAGE']); |
|
|
160
|
+ $forum_row['FORUM_IMAGE'] = preg_replace('#img src=\"(.*)\" alt#', 'img src="'.$img.'" alt', $forum_row['FORUM_IMAGE']); |
|
161
|
161
|
|
|
162
|
162
|
// Rewrite links to topics, posts and forums |
|
163
|
163
|
$replies = $this->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1; |
|
164
|
164
|
$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']); |
|
165
|
|
- $forum_row['U_LAST_POST'] = append_sid($this->generate_lastpost_link($replies, $url) . '#p' . $event['row']['forum_last_post_id']); |
|
|
165
|
+ $forum_row['U_LAST_POST'] = append_sid($this->generate_lastpost_link($replies, $url).'#p'.$event['row']['forum_last_post_id']); |
|
166
|
166
|
$forum_row['U_VIEWFORUM'] = append_sid($this->generate_forum_link($forum_row['FORUM_ID'], $forum_row['FORUM_NAME'])); |
|
167
|
167
|
$event['forum_row'] = $forum_row; |
|
168
|
168
|
} |
|
@@ -182,7 +182,7 @@ discard block |
|
|
block discarded – undo |
|
182
|
182
|
|
|
183
|
183
|
foreach ($navlinks_parents as $id => $data) |
|
184
|
184
|
{ |
|
185
|
|
- $navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($data['FORUM_ID'] , $data['FORUM_NAME'])); |
|
|
185
|
+ $navlinks_parents[$id]['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($data['FORUM_ID'], $data['FORUM_NAME'])); |
|
186
|
186
|
} |
|
187
|
187
|
|
|
188
|
188
|
$navlinks['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($forum_data['forum_id'], $forum_data['forum_name'])); |
|
@@ -198,7 +198,7 @@ discard block |
|
|
block discarded – undo |
|
198
|
198
|
foreach ($tpl_ary as $id => $data) |
|
199
|
199
|
{ |
|
200
|
200
|
|
|
201
|
|
- $tpl_ary[$id]['LINK'] = append_sid($this->generate_forum_link($row['forum_id'], $row['forum_name'])); |
|
|
201
|
+ $tpl_ary[$id]['LINK'] = append_sid($this->generate_forum_link($row['forum_id'], $row['forum_name'])); |
|
202
|
202
|
} |
|
203
|
203
|
|
|
204
|
204
|
$event['tpl_ary'] = $tpl_ary; |
|
@@ -245,7 +245,7 @@ discard block |
|
|
block discarded – undo |
|
245
|
245
|
$u_view_topic = $this->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']); |
|
246
|
246
|
|
|
247
|
247
|
$tpl_ary = $event['tpl_ary']; |
|
248
|
|
- $tpl_ary['U_LAST_POST'] = append_sid($this->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']); |
|
|
248
|
+ $tpl_ary['U_LAST_POST'] = append_sid($this->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']); |
|
249
|
249
|
$tpl_ary['U_VIEW_TOPIC'] = append_sid($u_view_topic); |
|
250
|
250
|
$tpl_ary['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($event['row']['forum_id'], $event['row']['forum_name'])); |
|
251
|
251
|
|
|
@@ -270,7 +270,7 @@ discard block |
|
|
block discarded – undo |
|
270
|
270
|
$u_view_topic = $this->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title); |
|
271
|
271
|
$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic); |
|
272
|
272
|
$topic_row['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($this->forum_id, $this->forum_title)); |
|
273
|
|
- $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']); |
|
|
273
|
+ $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']); |
|
274
|
274
|
|
|
275
|
275
|
$event['topic_row'] = $topic_row; |
|
276
|
276
|
} |
|
@@ -304,8 +304,8 @@ discard block |
|
|
block discarded – undo |
|
304
|
304
|
{ |
|
305
|
305
|
$data = $event['topic_data']; |
|
306
|
306
|
$this->template->assign_vars(array( |
|
307
|
|
- 'U_VIEW_TOPIC' => append_sid($this->generate_topic_link($event['forum_id'] , $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
308
|
|
- 'U_VIEW_FORUM' => append_sid($this->generate_forum_link($event['forum_id'] , $data['forum_name'])), |
|
|
307
|
+ 'U_VIEW_TOPIC' => append_sid($this->generate_topic_link($event['forum_id'], $data['forum_name'], $event['topic_id'], $data['topic_title'], $event['start'])), |
|
|
308
|
+ 'U_VIEW_FORUM' => append_sid($this->generate_forum_link($event['forum_id'], $data['forum_name'])), |
|
309
|
309
|
)); |
|
310
|
310
|
} |
|
311
|
311
|
|
|
@@ -352,7 +352,7 @@ discard block |
|
|
block discarded – undo |
|
352
|
352
|
$row = $event['post_row']; |
|
353
|
353
|
$start = $this->request->variable('start', 0); |
|
354
|
354
|
$data = $event['topic_data']; |
|
355
|
|
- $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']); |
|
|
355
|
+ $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']); |
|
356
|
356
|
$event['post_row'] = $row; |
|
357
|
357
|
} |
|
358
|
358
|
|
|
@@ -371,14 +371,14 @@ discard block |
|
|
block discarded – undo |
|
371
|
371
|
return; |
|
372
|
372
|
} |
|
373
|
373
|
|
|
374
|
|
- $url_data =$event['url_data'] ; |
|
|
374
|
+ $url_data = $event['url_data']; |
|
375
|
375
|
|
|
376
|
376
|
foreach ($url_data as $id => $data) |
|
377
|
377
|
{ |
|
378
|
378
|
$row = $data['row']; |
|
379
|
379
|
if (isset($row['topic_id'])) |
|
380
|
380
|
{ |
|
381
|
|
- $url_data[$id]['url'] = $this->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'], $data['start'], true); |
|
|
381
|
+ $url_data[$id]['url'] = $this->generate_topic_link($row['forum_id'], $row['forum_name'], $row['topic_id'], $row['topic_title'], $data['start'], true); |
|
382
|
382
|
} |
|
383
|
383
|
else if (isset($row['forum_id'])) |
|
384
|
384
|
{ |
|
@@ -404,10 +404,10 @@ discard block |
|
|
block discarded – undo |
|
404
|
404
|
$this->topic_id = $event['row']['topic_id']; |
|
405
|
405
|
|
|
406
|
406
|
$topic_row = $event['topic_row']; |
|
407
|
|
- $u_view_topic= $this->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title); |
|
|
407
|
+ $u_view_topic = $this->generate_topic_link($this->forum_id, $this->forum_title, $this->topic_id, $this->topic_title); |
|
408
|
408
|
$topic_row['U_VIEW_TOPIC'] = append_sid($u_view_topic); |
|
409
|
409
|
$topic_row['U_VIEW_FORUM'] = append_sid($this->generate_forum_link($this->forum_id, $this->forum_title)); |
|
410
|
|
- $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']); |
|
|
410
|
+ $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']); |
|
411
|
411
|
$event['topic_row'] = $topic_row; |
|
412
|
412
|
} |
|
413
|
413
|
|
|
@@ -438,7 +438,7 @@ discard block |
|
|
block discarded – undo |
|
438
|
438
|
$tpl_ary = $event['tpl_ary']; |
|
439
|
439
|
$replies = $this->get_count('topic_posts', $event['row'], $event['row']['forum_id']) - 1; |
|
440
|
440
|
$u_view_topic = $this->generate_topic_link($event['row']['forum_id'], $event['row']['forum_name'], $event['row']['topic_id'], $event['row']['topic_title']); |
|
441
|
|
- $tpl_ary['U_TOPIC'] = append_sid($this->generate_lastpost_link($replies, $u_view_topic) . '#p' . $event['row']['topic_last_post_id']); |
|
|
441
|
+ $tpl_ary['U_TOPIC'] = append_sid($this->generate_lastpost_link($replies, $u_view_topic).'#p'.$event['row']['topic_last_post_id']); |
|
442
|
442
|
$event['tpl_ary'] = $tpl_ary; |
|
443
|
443
|
} |
|
444
|
444
|
|
|
@@ -458,9 +458,9 @@ discard block |
|
|
block discarded – undo |
|
458
|
458
|
{ |
|
459
|
459
|
if ($full) |
|
460
|
460
|
{ |
|
461
|
|
- 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'; |
|
|
461
|
+ 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'; |
|
462
|
462
|
} |
|
463
|
|
- 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'; |
|
|
463
|
+ 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'; |
|
464
|
464
|
} |
|
465
|
465
|
|
|
466
|
466
|
/** |
|
@@ -477,9 +477,9 @@ discard block |
|
|
block discarded – undo |
|
477
|
477
|
{ |
|
478
|
478
|
if ($full) |
|
479
|
479
|
{ |
|
480
|
|
- return generate_board_url() . '/' . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : ''); |
|
|
480
|
+ return generate_board_url().'/'.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.($start ? 'index-s'.$start.'.html' : ''); |
|
481
|
481
|
} |
|
482
|
|
- return $this->phpbb_root_path . $this->title_to_url($forum_name) . '-f' . $forum_id . '/' . ($start ? 'index-s' . $start . '.html' : ''); |
|
|
482
|
+ return $this->phpbb_root_path.$this->title_to_url($forum_name).'-f'.$forum_id.'/'.($start ? 'index-s'.$start.'.html' : ''); |
|
483
|
483
|
} |
|
484
|
484
|
|
|
485
|
485
|
/** |
|
@@ -497,12 +497,12 @@ discard block |
|
|
block discarded – undo |
|
497
|
497
|
{ |
|
498
|
498
|
for ($j = 0; $j < $replies + 1; $j += $per_page) |
|
499
|
499
|
{ |
|
500
|
|
- $last_post_link = $url . '-s' . $j . '.html'; |
|
|
500
|
+ $last_post_link = $url.'-s'.$j.'.html'; |
|
501
|
501
|
} |
|
502
|
502
|
} |
|
503
|
503
|
else |
|
504
|
504
|
{ |
|
505
|
|
- $last_post_link = $url . '.html'; |
|
|
505
|
+ $last_post_link = $url.'.html'; |
|
506
|
506
|
} |
|
507
|
507
|
return $last_post_link; |
|
508
|
508
|
} |
|
@@ -541,10 +541,10 @@ discard block |
|
|
block discarded – undo |
|
541
|
541
|
{ |
|
542
|
542
|
if (!$this->auth->acl_get('m_approve', $forum_id)) |
|
543
|
543
|
{ |
|
544
|
|
- return (int) $data[$mode . '_approved']; |
|
|
544
|
+ return (int) $data[$mode.'_approved']; |
|
545
|
545
|
} |
|
546
|
546
|
|
|
547
|
|
- return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted']; |
|
|
547
|
+ return (int) $data[$mode.'_approved'] + (int) $data[$mode.'_unapproved'] + (int) $data[$mode.'_softdeleted']; |
|
548
|
548
|
} |
|
549
|
549
|
|
|
550
|
550
|
} |