mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3613 from SimSync/fix_3601

Browse Source 
Fixes #3601 wrong user link
This commit is contained in:
Cameron
2019-01-16 10:00:58 -08:00
committed by GitHub
parent 58efb74d4d 54a46dc98c
commit 3dd186592f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_plugins/forum/e_list.php
View File

@@ -31,7 +31,7 @@ class list_forum
$lvisit = $this->parent->getlvisit(); $lvisit = $this->parent->getlvisit();
$qry = " $qry = "
SELECT t.thread_name AS parent_name, t.thread_id as parent_id, SELECT t.thread_name AS parent_name, t.thread_id as parent_id,
f.forum_id, f.forum_name, f.forum_class, f.forum_id, f.forum_name, f.forum_class, f.forum_sef,
u.user_name, lp.user_name AS lp_name, u.user_name, lp.user_name AS lp_name,
t.thread_id, t.thread_views as tviews, t.thread_name, t.thread_datestamp, t.thread_user, t.thread_id, t.thread_views as tviews, t.thread_name, t.thread_datestamp, t.thread_user,
tp.post_thread, tp.post_user, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies tp.post_thread, tp.post_user, t.thread_lastpost, t.thread_lastuser, t.thread_total_replies
@@ -49,7 +49,7 @@ class list_forum
{ // Most recently updated threads up to limit { // Most recently updated threads up to limit
$qry = " $qry = "
SELECT t.thread_id, t.thread_name AS parent_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost, SELECT t.thread_id, t.thread_name AS parent_name, t.thread_datestamp, t.thread_user, t.thread_views, t.thread_lastpost,
t.thread_lastuser, t.thread_total_replies, f.forum_id, f.forum_name, f.forum_class, u.user_name, lp.user_name AS lp_name t.thread_lastuser, t.thread_total_replies, f.forum_id, f.forum_name, f.forum_class, f.forum_sef, u.user_name, lp.user_name AS lp_name
FROM #forum_thread AS t FROM #forum_thread AS t
LEFT JOIN #forum AS f ON f.forum_id = t.thread_forum_id LEFT JOIN #forum AS f ON f.forum_id = t.thread_forum_id
LEFT JOIN #user AS u ON t.thread_user = u.user_id LEFT JOIN #user AS u ON t.thread_user = u.user_id
@@ -73,7 +73,9 @@ class list_forum
extract($forumInfo); extract($forumInfo);
$record = array(); $record = array();
/* Fixes #3601 Removed unused vars, fixed userid extraction
//last user //last user
$r_id = substr($thread_lastuser, 0, strpos($thread_lastuser, ".")); $r_id = substr($thread_lastuser, 0, strpos($thread_lastuser, "."));
$r_name = substr($thread_lastuser, (strpos($thread_lastuser, ".")+1)); $r_name = substr($thread_lastuser, (strpos($thread_lastuser, ".")+1));
@@ -87,12 +89,16 @@ class list_forum
$u_id = substr($thread_user, 0, strpos($thread_user, ".")); $u_id = substr($thread_user, 0, strpos($thread_user, "."));
$u_name = substr($thread_user, (strpos($thread_user, ".")+1)); $u_name = substr($thread_user, (strpos($thread_user, ".")+1));
$thread_user = $u_id; $thread_user = $u_id;
*/
if (isset($thread_anon)) if (isset($thread_anon))
{ {
/*
$tmp = explode(chr(1), $thread_anon); $tmp = explode(chr(1), $thread_anon);
$thread_user = $tmp[0]; $thread_user = $tmp[0];
$thread_user_ip = $tmp[1]; $thread_user_ip = $tmp[1];
*/
$thread_user = $thread_anon;
} }
$gen = new convert; $gen = new convert;
@@ -131,14 +137,16 @@ class list_forum
$parent_name = $thread_name; $parent_name = $thread_name;
} }
$rowheading = $this->parent->parse_heading($parent_name); $rowheading = $this->parent->parse_heading($parent_name);
$lnk = ($parent_id ? $thread_id.".post" : $thread_id); //$lnk = ($parent_id ? $thread_id.".post" : $thread_id);
//"<a href='".e_HTTP."user.php ?id.$thread_user'>$user_name</a>" //"<a href='".e_HTTP."user.php ?id.$thread_user'>$user_name</a>"
$uparams = array('id' => $thread_user, 'name' => $user_name); $uparams = array('id' => $thread_user, 'name' => $user_name);
$link = e107::getUrl()->create('user/profile/view', $uparams); $link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$user_name."</a>"; $userlink = "<a href='".$link."'>".$user_name."</a>";
$record['heading'] = "<a href='".$path."forum_viewtopic.php?$lnk'>".$rowheading."</a>"; //$record['heading'] = "<a href='".$path."forum_viewtopic.php?$lnk'>".$rowheading."</a>";
$record['heading'] = '<a href="'.e107::url('forum', 'topic', array('thread_id' => $thread_id, 'thread_sef' => eHelper::title2sef($parent_name), 'forum_sef' => $forum_sef)).'">'.$rowheading.'</a>';
$record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : $userlink) : ""); $record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : $userlink) : "");
$record['category'] = ($this->parent->settings['category'] ? "<a href='".$path."forum_viewforum.php?$forum_id'>$forum_name</a>" : ""); //$record['category'] = ($this->parent->settings['category'] ? "<a href='".$path."forum_viewforum.php?$forum_id'>$forum_name</a>" : "");
$record['category'] = ($this->parent->settings['category'] ? '<a href="'.e107::url('forum', 'forum', array('forum_sef' => $forum_sef)).'">'.$forum_name.'</a>' : "");
$record['date'] = ($this->parent->settings['date'] ? $this->parent->getListDate($thread_datestamp) : ""); $record['date'] = ($this->parent->settings['date'] ? $this->parent->getListDate($thread_datestamp) : "");
$record['icon'] = $bullet; $record['icon'] = $bullet;
$VIEWS = $thread_views; $VIEWS = $thread_views;