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

Issue #1174 - Forum "user profile" link fixes.

Browse Source
This commit is contained in:
Cameron
2015-09-02 08:59:49 -07:00
parent 519e1f3f7e
commit e55e305d0c
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/forum/e_list.php
View File

@@ -101,7 +101,7 @@ class list_forum
$LASTPOST = "";
if($lp_name)
{
$LASTPOST = "<a href='".e_BASE."user.php?id.{$thread_lastuser}'>$lp_name</a>";
$LASTPOST = "<a href='".e_HTTP."user.php ?id.{$thread_lastuser}'>$lp_name</a>";
}
else
{
@@ -130,7 +130,7 @@ class list_forum
$lnk = ($parent_id ? $thread_id.".post" : $thread_id);
$record['heading'] = "<a href='".$path."forum_viewtopic.php?$lnk'>".$rowheading."</a>";
$record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : "<a href='".e_BASE."user.php?id.$thread_user'>$user_name</a>") : "");
$record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : "<a href='".e_HTTP."user.php ?id.$thread_user'>$user_name</a>") : "");
$record['category'] = ($this->parent->settings['category'] ? "<a href='".$path."forum_viewforum.php?$forum_id'>$forum_name</a>" : "");
$record['date'] = ($this->parent->settings['date'] ? $this->parent->getListDate($thread_datestamp) : "");
$record['icon'] = $bullet;

6
e107_plugins/forum/forum.php
View File

@@ -79,7 +79,7 @@ $rules_text = forum_rules('check');
$fVars->USERINFO = "<a href='".e_BASE."top.php?0.top.forum.10'>".LAN_FORUM_0010."</a> | <a href='".e_BASE."top.php?0.active'>".LAN_FORUM_0011."</a>";
if(USER)
{
$fVars->USERINFO .= " | <a href='".e_BASE.'userposts.php?0.forums.'.USERID."'>".LAN_FORUM_0012."</a> | <a href='".e_BASE."usersettings.php'>".LAN_FORUM_0013."</a> | <a href='".e_BASE."user.php?id.".USERID."'>".LAN_FORUM_0014."</a>";
$fVars->USERINFO .= " | <a href='".e_BASE.'userposts.php?0.forums.'.USERID."'>".LAN_FORUM_0012."</a> | <a href='".e_BASE."usersettings.php'>".LAN_FORUM_0013."</a> | <a href='".e_HTTP."user.php ?id.".USERID."'>".LAN_FORUM_0014."</a>";
if($forum->prefs->get('attach') && (check_class($pref['upload_class']) || getperms('0')))
{
$fVars->USERINFO .= " | <a href='".e_PLUGIN."forum/forum_uploads.php'>".LAN_FORUM_0015."</a>";
@@ -126,7 +126,7 @@ if(!defined('e_TRACKING_DISABLED'))
{
list($oid, $oname) = explode(".", $uinfo, 2);
$c ++;
$fVars->USERLIST .= "<a href='".e_BASE."user.php?id.$oid'>$oname</a>".($c == MEMBERS_ONLINE ? "." :", ");
$fVars->USERLIST .= "<a href='".e_HTTP."user.php ?id.$oid'>$oname</a>".($c == MEMBERS_ONLINE ? "." :", ");
}
}
$fVars->USERLIST .= "<br /><a rel='external' href='".e_BASE."online.php'>".LAN_FORUM_0037."</a> ".LAN_FORUM_0038;
@@ -231,7 +231,7 @@ if (USER && vartrue($forum->prefs->get('track')) && e_QUERY != 'track')
$fVars->FORUMINFO =
str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_topics ".($total_topics == 1 ? LAN_FORUM_0032 : LAN_FORUM_0033).", $total_replies ".($total_replies == 1 ? LAN_FORUM_0034 : LAN_FORUM_0035).")
".(!defined("e_TRACKING_DISABLED") ? "" : "<br />".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")<br />".LAN_FORUM_0066." ".$total_members."<br />".LAN_FORUM_0065." <a href='".e_BASE."user.php?id.".$nuser_id."'>".$nuser_name."</a>.\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref?
".(!defined("e_TRACKING_DISABLED") ? "" : "<br />".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")<br />".LAN_FORUM_0066." ".$total_members."<br />".LAN_FORUM_0065." <a href='".e_HTTP."user.php ?id.".$nuser_id."'>".$nuser_name."</a>.\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref?
if (!isset($FORUM_MAIN_START))
{

4
e107_plugins/forum/forum_admin.php
View File

@@ -2508,7 +2508,7 @@ class forumAdmin
</colgroup>
<tr>
<td>".FORLAN_171.":</td>
<td><a href='".e_PLUGIN."forum/forum_viewtopic.php?".$row['gen_intdata'].".post' rel='external'>#".$row['gen_intdata']."</a></td>
<td><a href='".e_PLUGIN_ABS."forum/forum_viewtopic.php?".$row['gen_intdata'].".post' rel='external'>#".$row['gen_intdata']."</a></td>
</tr>
<tr>
<td>".FORLAN_173.":</td>
@@ -2516,7 +2516,7 @@ class forumAdmin
</tr>
<tr>
<td>".FORLAN_174.":</td>
<td><a href='".e_BASE."user.php?id.".$user['user_id']."'>".$user['user_name']."</a>
<td><a href='".e107::getUrl()->create('user/profile/view', $user)."'>".$user['user_name']."</a>
</td>
</tr>
<tr>

10
e107_plugins/forum/forum_stats.php
View File

@@ -264,7 +264,7 @@ class forumStats
{
if($ma['user_name'])
{
$uinfo = "<a href='".e_BASE."user.php?id.{$ma['user_id']}'>{$ma['user_name']}</a>"; //TODO SEf Url .
$uinfo = "<a href='".e_HTTP."user.php ?id.{$ma['user_id']}'>{$ma['user_name']}</a>"; //TODO SEf Url .
}
else
{
@@ -310,7 +310,7 @@ class forumStats
{
if($ma['user_name'])
{
$uinfo = "<a href='".e_BASE."user.php?id.{$ma['user_id']}'>".$ma['user_name']."</a>"; //TODO SEf Url .
$uinfo = "<a href='".e_HTTP."user.php ?id.{$ma['user_id']}'>".$ma['user_name']."</a>"; //TODO SEf Url .
}
else
{
@@ -360,7 +360,7 @@ class forumStats
//TODO SEf Url .
$text_3 .= "<tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e_BASE."user.php?id.".$ma['user_id']."'>".$ma['user_name']."</a></td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>".$ma['user_name']."</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$user_forums</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$percentage%</td>
<td style='width: 50%;' class='forumheader3'>".$this->showBar($percentage)."
@@ -398,7 +398,7 @@ class forumStats
$text_4 .= "<tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e_BASE."user.php?id.$user_id'>$user_name</a></td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>$user_name</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$user_forums</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$percentage%</td>
<td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($percentage)."</td>
@@ -432,7 +432,7 @@ class forumStats
$text_5 .= "
<tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e_BASE."user.php?id.$user_id'>$user_name</a></td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>$user_name</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$user_forums</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>$percentage%</td>
<td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($percentage)."</td>

6
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -454,10 +454,12 @@ class plugin_forum_view_shortcodes extends e_shortcode
$ue = $tp->parseTemplate("{USER_EXTENDED=location.text_value}",true);
$username = (empty($this->postInfo['user_name'])) ? LAN_ANONYMOUS : $this->postInfo['user_name'];
$userUrl = empty($this->postInfo['post_user']) ? '#' : e107::getUrl()->create('user/profile/view', array('user_id'=>$this->postInfo['post_user'], 'user_name'=>$username));
// e_HTTP.'user.php?id.'.$this->postInfo['post_user']
$text = '<div class="btn-group btn-block ">
<a class="btn btn-default btn-sm col-sm-10 btn-small" href="'.e_BASE.'user.php?id.'.$this->postInfo['post_user'].'">'.$username.'</a>
<a class="btn btn-default btn-sm col-sm-10 btn-small" href="'.$userUrl.'">'.$username.'</a>
<button class="btn btn-default btn-sm col-sm-2 btn-small dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>