mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Issue #2980 Tablerender ID - Forum fixes

Browse Source
This commit is contained in:
Cameron
2018-01-16 13:53:09 -08:00
parent 4d6825dc51
commit 3f5a18fb01
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_plugins/forum/forum.php
View File

@@ -367,7 +367,7 @@ $sc->newFlagList = $newflag_list;
if (!$forumList) if (!$forumList)
{ {
$ns->tablerender(LAN_PLUGIN_FORUM_NAME, "<div style='text-align:center'>".LAN_FORUM_0067.'</div>', array('forum', '51')); $ns->tablerender(LAN_PLUGIN_FORUM_NAME, LAN_FORUM_0067, 'forum-empty');
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -647,7 +647,7 @@ if (e_QUERY == 'new')
if ($forum->prefs->get('enclose')) if ($forum->prefs->get('enclose'))
{ {
$ns->tablerender($forum->prefs->get('title'), $forum_new_start.$forum_newstring.$forum_new_end, array('forum', 'main2')); $ns->tablerender($forum->prefs->get('title'), $forum_new_start.$forum_newstring.$forum_new_end, 'forum');
} }
else else
{ {
@@ -731,7 +731,7 @@ function forum_rules($action = 'check')
$text .= "<div id='forum-rules'>".$rules_text."</div>"; $text .= "<div id='forum-rules'>".$rules_text."</div>";
$text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>"; $text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>";
e107::getRender()->tablerender(LAN_FORUM_0016, $text, array('forum', 'forum_rules')); e107::getRender()->tablerender(LAN_FORUM_0016, $text, 'forum-rules');
} }
@@ -866,10 +866,11 @@ function forum_track()
$text .= $tracktext; $text .= $tracktext;
$text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>"; $text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>";
e107::getRender()->tablerender(LAN_FORUM_0030, $text, array('forum', 'forum_track'));
e107::getRender()->tablerender(LAN_FORUM_0030, $text, 'forum-track');
} }
?> ?>

24
e107_plugins/forum/forum_post.php
View File

@@ -313,7 +313,7 @@ class forum_post_handler
".LAN_FORUM_2019.": ".USERNAME. "\n" . $report_add; ".LAN_FORUM_2019.": ".USERNAME. "\n" . $report_add;
$subject = LAN_FORUM_2020." ". SITENAME; $subject = LAN_FORUM_2020." ". SITENAME;
e107::getNotify()->send('forum_post_rep', $subject, $report); e107::getNotify()->send('forum_post_rep', $subject, $report);
e107::getRender()->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report')); e107::getRender()->tablerender(LAN_FORUM_2023, $text, 'forum-post-report');
} }
@@ -343,7 +343,7 @@ class forum_post_handler
require_once(HEADERF); require_once(HEADERF);
$mes->addError(LAN_FORUM_3001); $mes->addError(LAN_FORUM_3001);
$mes->addDebug(print_a($this->data, true)); $mes->addDebug(print_a($this->data, true));
$ns->tablerender(LAN_FORUM_1001, $mes->render()); $ns->tablerender(LAN_FORUM_1001, $mes->render(), 'forum-post-unauthorized');
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -354,7 +354,7 @@ class forum_post_handler
{ {
require_once(HEADERF); require_once(HEADERF);
$mes->addError(LAN_FORUM_3002); $mes->addError(LAN_FORUM_3002);
$ns->tablerender(LAN_FORUM_1001, $mes->render()); $ns->tablerender(LAN_FORUM_1001, $mes->render(), 'forum-post-locked');
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -732,7 +732,7 @@ class forum_post_handler
</form>"; </form>";
$ns->tablerender(LAN_FORUM_3052, $text); $ns->tablerender(LAN_FORUM_3052, $text, 'forum-post-split');
} }
@@ -850,7 +850,7 @@ class forum_post_handler
</form>"; </form>";
$ns->tablerender(LAN_FORUM_5019, $text); $ns->tablerender(LAN_FORUM_5019, $text, 'forum-post-move');
@@ -965,7 +965,7 @@ class forum_post_handler
} }
e107::getRender()->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report2')); e107::getRender()->tablerender(LAN_FORUM_2023, $text, 'forum-post-report');
@@ -986,7 +986,7 @@ class forum_post_handler
{ {
$caption = (!empty($caption)) ? $caption : $this->forumObj->prefs->get('title'); $caption = (!empty($caption)) ? $caption : $this->forumObj->prefs->get('title');
$ns->tablerender($caption, $text); $ns->tablerender($caption, $text, 'forum-post');
} }
else else
{ {
@@ -1066,10 +1066,10 @@ class forum_post_handler
if ($poll_text) if ($poll_text)
{ {
$ns->tablerender($_POST['poll_title'], $poll_text); $ns->tablerender($_POST['poll_title'], $poll_text, 'forum-post-preview-poll');
} }
$ns->tablerender(LAN_FORUM_3005, $text); $ns->tablerender(LAN_FORUM_3005, $text, 'forum-post-preview');
/* /*
if ($this->action == 'edit') if ($this->action == 'edit')
@@ -1230,7 +1230,7 @@ class forum_post_handler
require_once(HEADERF); require_once(HEADERF);
$message = LAN_FORUM_3006."<br ><a class='btn btn-default' href='".$_SERVER['HTTP_REFERER']."'>".LAN_FORUM_8028."</a>"; $message = LAN_FORUM_3006."<br ><a class='btn btn-default' href='".$_SERVER['HTTP_REFERER']."'>".LAN_FORUM_8028."</a>";
$text = e107::getMessage()->addError($message)->render(); $text = e107::getMessage()->addError($message)->render();
e107::getRender()->tablerender(LAN_PLUGIN_FORUM_NAME, $text); // change to forum-title pref. e107::getRender()->tablerender(LAN_PLUGIN_FORUM_NAME, $text, 'forum-post-duplicate'); // change to forum-title pref.
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -1282,7 +1282,7 @@ class forum_post_handler
$txt = e107::getParser()->parseTemplate($txt,true, $SHORTCODES); $txt = e107::getParser()->parseTemplate($txt,true, $SHORTCODES);
e107::getRender()->tablerender(e_PAGETITLE, e107::getMessage()->render().$txt); e107::getRender()->tablerender(e_PAGETITLE, e107::getMessage()->render().$txt, 'forum-post');
require_once(FOOTERF); require_once(FOOTERF);
exit; exit;
} }
@@ -1417,7 +1417,7 @@ class forum_post_handler
$text .= e107::getMessage()->render(); $text .= e107::getMessage()->render();
e107::getRender()->tablerender(LAN_FORUM_3052, $text); e107::getRender()->tablerender(LAN_FORUM_3052, $text, 'forum-post-split');
} }

6
e107_plugins/forum/forum_stats.php
View File

@@ -479,7 +479,7 @@ class forumStats
$text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>"; $text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>";
$ns -> tablerender(LAN_FORUM_6013, $text); $ns -> tablerender(LAN_FORUM_6013, $text, 'forum-stats');
} }
@@ -566,7 +566,7 @@ class forumStats
$text .= "<div class='nextprev'>".$tp->parseTemplate("{NEXTPREV={$parms}}").'</div>'; $text .= "<div class='nextprev'>".$tp->parseTemplate("{NEXTPREV={$parms}}").'</div>';
} }
$ns->tablerender(TOP_LAN_0, $text); $ns->tablerender(TOP_LAN_0, $text, 'forum-stats-top');
} }
@@ -656,7 +656,7 @@ class forumStats
$parms = "{$ftotal},{$this->view},{$this->from},".e_SELF.'?[FROM].active.forum.'.$this->view; $parms = "{$ftotal},{$this->view},{$this->from},".e_SELF.'?[FROM].active.forum.'.$this->view;
$text .= "<div class='nextprev'>".$tp->parseTemplate("{NEXTPREV={$parms}}").'</div>'; $text .= "<div class='nextprev'>".$tp->parseTemplate("{NEXTPREV={$parms}}").'</div>';
$ns->tablerender(LAN_7, $text, 'nfp'); $ns->tablerender(LAN_7, $text, 'forum-stats-active');
} }

2
e107_plugins/forum/forum_viewforum.php
View File

@@ -582,7 +582,7 @@ if ($forum->prefs->get('enclose'))
// $forum_view_subs???? // $forum_view_subs????
$caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, true, $sc) : $forum->prefs->get('title'); $caption = varset($FORUM_VIEW_CAPTION) ? $tp->parseTemplate($FORUM_VIEW_CAPTION, true, $sc) : $forum->prefs->get('title');
$ns->tablerender($caption, $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, array('forum_viewforum', 'main1')); $ns->tablerender($caption, $forum_view_start.$forum_view_subs.$forum_view_forum.$forum_view_end, 'forum-viewforum');
} }
else else
{ {

2
e107_plugins/forum/forum_viewtopic.php
View File

@@ -618,7 +618,7 @@ require_once (HEADERF);
if ($forum->prefs->get('enclose')) if ($forum->prefs->get('enclose'))
{ {
$forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, true, $sc); $forumTitle = empty($FORUMCAPTION) ? e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME) : $tp->parseTemplate($FORUMCAPTION, true, $sc);
$ns->tablerender($forumTitle, $mes->render().$forumstring, array('forum_viewtopic', 'main')); $ns->tablerender($forumTitle, $mes->render().$forumstring, 'forum-viewtopic');
} }
else else
{ {