1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00

Issue #1309. e_BASE."user.php" replaced with SEF URL.

This commit is contained in:
Jimmi08 2016-01-27 11:56:59 +01:00
parent a16ae500bb
commit 5750b91b91
13 changed files with 79 additions and 22 deletions

View File

@ -72,7 +72,10 @@ if(!class_exists('chatbox_shortcodes'))
list($cb_uid, $cb_nick) = explode(".", $this->var['cb_nick'], 2);
if($this->var['user_name'])
{
$cb_nick = "<a href='".e_HTTP."user.php?id.{$cb_uid}'>".$this->var['user_name']."</a>";
//$cb_nick = "<a href='".e_HTTP."user.php?id.{$cb_uid}'>".$this->var['user_name']."</a>";
$uparams = array('id' => $cb_uid, 'name' => $this->var['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$cb_nick = "<a href='".$link."'>".$this->var['user_name']."</a>";
}
else
{

View File

@ -50,9 +50,13 @@ class list_chatbox_menu
$cb_nick = substr($row['cb_nick'] , (strpos($row['cb_nick'] , ".")+1));
$cb_message = ($row['cb_blocked'] ? CHATBOX_L6 : str_replace("<br />", " ", $tp->toHTML($row['cb_message'])));
$rowheading = $this->parent->parse_heading($cb_message);
//<a href='".e_BASE."user.php?id.$cb_id'>".$cb_nick."</a>
$uparams = array('id' => $cb_id, 'name' => $cb_nick);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$cb_nick."</a>";
$record['icon'] = $bullet;
$record['heading'] = $rowheading;
$record['author'] = ($this->parent->settings['author'] ? ($cb_id != 0 ? "<a href='".e_BASE."user.php?id.$cb_id'>".$cb_nick."</a>" : $cb_nick) : "");
$record['author'] = ($this->parent->settings['author'] ? ($cb_id != 0 ? $userlink : $cb_nick) : "");
$record['category'] = "";
$record['date'] = ($this->parent->settings['date'] ? ($row['cb_datestamp'] ? $this->parent->getListDate($row['cb_datestamp']) : "") : "");
$record['info'] = "";

View File

@ -364,8 +364,12 @@ if ($action == "uopt")
foreach($activeUploads as $row)
{
$post_author_id = substr($row['upload_poster'], 0, strpos($row['upload_poster'], "."));
$post_author_name = substr($row['upload_poster'], (strpos($row['upload_poster'], ".")+1));
$poster = (!$post_author_id ? "<b>".$post_author_name."</b>" : "<a href='".e_BASE."user.php?id.".$post_author_id."'><b>".$post_author_name."</b></a>");
$post_author_name = substr($row['upload_poster'], (strpos($row['upload_poster'], ".")+1));
// $poster = (!$post_author_id ? "<b>".$post_author_name."</b>" : "<a href='".e_BASE."user.php?id.".$post_author_id."'><b>".$post_author_name."</b></a>");
$uparams = array('id' => $post_author_id, 'name' => $post_author_name);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'><b>".$post_author_name."</b></a>";
$poster = (!$post_author_id ? "<b>".$post_author_name."</b>" : $userlink);
$upload_datestamp = $gen->convert_date($row['upload_datestamp'], "short");
$text .= "
<tr>

View File

@ -101,7 +101,10 @@ class list_forum
$LASTPOST = "";
if($lp_name)
{
$LASTPOST = "<a href='".e_HTTP."user.php ?id.{$thread_lastuser}'>$lp_name</a>";
//$LASTPOST = "<a href='".e_HTTP."user.php ?id.{$thread_lastuser}'>$lp_name</a>";
$uparams = array('id' => $thread_lastuser, 'name' => $lp_name);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$LASTPOST = "<a href='".$link."'>".$lp_name."</a>";
}
else
{
@ -128,9 +131,12 @@ class list_forum
}
$rowheading = $this->parent->parse_heading($parent_name);
$lnk = ($parent_id ? $thread_id.".post" : $thread_id);
//"<a href='".e_HTTP."user.php ?id.$thread_user'>$user_name</a>"
$uparams = array('id' => $thread_user, 'name' => $user_name);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$user_name."</a>";
$record['heading'] = "<a href='".$path."forum_viewtopic.php?$lnk'>".$rowheading."</a>";
$record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : "<a href='".e_HTTP."user.php ?id.$thread_user'>$user_name</a>") : "");
$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['date'] = ($this->parent->settings['date'] ? $this->parent->getListDate($thread_datestamp) : "");
$record['icon'] = $bullet;

View File

@ -266,7 +266,10 @@ class forumStats
{
if($ma['user_name'])
{
$uinfo = "<a href='".e_HTTP."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 .
$uparams = array('id' => $ma['user_id'], 'name' => $ma['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$uinfo = "<a href='".$link."'>".$ma['user_name']."</a>";
}
else
{
@ -312,7 +315,10 @@ class forumStats
{
if($ma['user_name'])
{
$uinfo = "<a href='".e_HTTP."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 .
$uparams = array('id' => $ma['user_id'], 'name' => $ma['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$uinfo = "<a href='".$link."'>".$ma['user_name']."</a>";
}
else
{

View File

@ -63,12 +63,16 @@ function search_forum($row)
$link_id = $row['thread_id'];
//<a href='user.php?id.".$row['user_id']."'>".$row['user_name']."</a>
$uparams = array('id' => $row['user_id'], 'name' => $row['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'><b>".$row['user_name']."</b></a>";
$res['link'] = e_PLUGIN."forum/forum_viewtopic.php?".$link_id.".post";
$res['pre_title'] = $title ? FOR_SCH_LAN_5.": " : "";
$res['title'] = $title ? $title : LAN_SEARCH_9;
$res['pre_summary'] = "<div class='smalltext' style='padding: 2px 0px'><a href='".e_PLUGIN."forum/forum.php'>".LAN_PLUGIN_FORUM_NAME."</a> -> <a href='".e_PLUGIN."forum/forum_viewforum.php?".$row['forum_id']."'>".$row['forum_name']."</a></div>";
$res['summary'] = $row['post_entry'];
$res['detail'] = LAN_SEARCH_7."<a href='user.php?id.".$row['user_id']."'>".$row['user_name']."</a>".LAN_SEARCH_8.$datestamp;
$res['detail'] = LAN_SEARCH_7.$userlink.LAN_SEARCH_8.$datestamp;
return $res;
}

View File

@ -48,10 +48,14 @@ class list_members
{
while($row = $this->parent->e107->sql->fetch())
{
$record = array();
$record = array();
$rowheading = $this->parent->parse_heading($row['user_name']);
//<a href='".e_BASE."user.php?id.".$row['user_id']."'>".$rowheading."</a>
$uparams = array('id' => $row['user_id'], 'name' => $rowheading);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$rowheading."</a>";
$record['icon'] = $bullet;
$record['heading'] = (USER ? "<a href='".e_BASE."user.php?id.".$row['user_id']."'>".$rowheading."</a>" : $rowheading);
$record['heading'] = (USER ? $userlink : $rowheading);
$record['category'] = '';
$record['author'] = '';
$record['date'] = (vartrue($this->parent->settings['date']) ? $this->parent->getListDate($row['user_join']) : "");

View File

@ -82,7 +82,10 @@ class list_news
{
if(vartrue($row['news_author_name']))
{
$record['author'] = "<a href='".e_BASE."user.php?id.".$row['news_author_id']."'>".$row['news_author_name']."</a>";
//$record['author'] = "<a href='".e_BASE."user.php?id.".$row['news_author_id']."'>".$row['news_author_name']."</a>";
$uparams = array('id' => $row['news_author_id'], 'name' => $row['news_author_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$record['author'] = "<a href='".$link."'>".$row['news_author_name']."</a>";
}
}
}

View File

@ -110,7 +110,10 @@ foreach ($forumArray as $forumInfo)
$tmp = explode(".", $thread_lastuser, 2);
if($lp_name)
{
$LASTPOST = "<a href='".e_BASE."user.php?id.{$tmp[0]}'>$lp_name</a>";
//$LASTPOST = "<a href='".e_BASE."user.php?id.{$tmp[0]}'>$lp_name</a>";
$uparams = array('id' => $tmp[0], 'name' => $lp_name]);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$LASTPOST = "<a href='".$link."'>".$lp_name."</a>";
}
else
{

View File

@ -654,10 +654,14 @@ class newsletter
$nl_sql -> db_Select("user", "*", "user_id=".$val);
if($nl_row = $nl_sql-> db_Fetch())
{
//<a href='".e_BASE."user.php?id.{$val}'>".$nl_row['user_name']."</a>
$uparams = array('id' => $val, 'name' => $nl_row['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$nl_row['user_name']"</a>";
$vs_text .= "
<tr>
<td>".$val."</td>
<td><a href='".e_BASE."user.php?id.{$val}'>".$nl_row['user_name']."</a></td>
<td>".$userlink."</td>
<td>".$nl_row['user_email']."</td>
<td><a href='".e_SELF."?remove.{$p_id}.{$val}'>".ADMIN_DELETE_ICON."</a>".(($nl_row['user_ban'] > 0) ? NLLAN_62 : "")."</td>
</tr>";

View File

@ -110,7 +110,10 @@ class online_shortcodes
{
$newest_member_sql = $sql->select('user', 'user_id, user_name', "user_ban='0' ORDER BY user_join DESC LIMIT 1");
$row = $sql->fetch();
$ret = "<a href='".e_HTTP."user.php?id.".$row['user_id']."'>".$row['user_name']."</a>";
//$ret = "<a href='".e_HTTP."user.php?id.".$row['user_id']."'>".$row['user_name']."</a>";
$uparams = array('id' => $row['user_id'], 'name' => $row['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$ret = "<a href='".$link."'>".$row['user_name']."</a>";
$this->e107->ecache->set('online_menu_member_newest', $ret);
}
return $ret;
@ -169,7 +172,10 @@ class online_shortcodes
function sc_online_member_user()
{
return "<a href='".e_HTTP."user.php?id.{$this->currentMember['oid']}'>{$this->currentMember['oname']}</a>";
//return "<a href='".e_HTTP."user.php?id.{$this->currentMember['oid']}'>{$this->currentMember['oname']}</a>";
$uparams = array('id' => $this->currentMember['oid'], 'name' => $this->currentMember['oname']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
return "<a href='".$link."'>".$this->currentMember['oname']."</a>";
}

View File

@ -54,12 +54,15 @@ if(e_QUERY)
$start_datestamp = $gen->convert_date($poll_datestamp, "long");
$end_datestamp = $gen->convert_date($poll_end_datestamp, "long");
//<a href='".e_BASE."user.php?id.{$user_id}'>".$user_name."</a>
$uparams = array('id' => $user_id, 'name' => $user_name);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$user_name."</a>";
$text = "<table style='".USER_WIDTH."'>
<tr>
<td colspan='2' class='mediumtext' style='text-align:center'>
<b>".$tp -> toHTML($poll_title,TRUE,'TITLE')."</b>
<div class='smalltext'>".POLLAN_35." <a href='".e_BASE."user.php?id.{$user_id}'>".$user_name."</a>.<br /> ".POLLAN_37." ".$start_datestamp." ".POLLAN_38." ".$end_datestamp.".<br />".POLLAN_26.": {$voteTotal}</div>
<div class='smalltext'>".POLLAN_35." ".$userlink."<br /> ".POLLAN_37." ".$start_datestamp." ".POLLAN_38." ".$end_datestamp.".<br />".POLLAN_26.": {$voteTotal}</div>
<br />
</td>
@ -149,10 +152,13 @@ foreach($oldpollArray as $oldpoll)
$to = $gen->convert_date($poll_end_datestamp, "short");
$poll_title = $tp->e_bb->parseBBCodes($poll_title, 0,TRUE,TRUE); // Strip bbcodes
//<a href='".e_BASE."user.php?id.{$poll_admin_id}'>{$user_name}</a>
$uparams = array('id' => $poll_admin_id, 'name' => $user_name);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$user_name."</a>";
$text .= "<tr>
<td class='forumheader3' style='width: 55%;'><a href='".e_SELF."?{$poll_id}'>{$poll_title}</a></td>
<td class='forumheader3' style='width: 15%;'><a href='".e_BASE."user.php?id.{$poll_admin_id}'>{$user_name}</a></td>
<td class='forumheader3' style='width: 15%;'>".$userlink."</td>
<td class='forumheader3' style='width: 30%;'>{$from} ".POLLAN_38." {$to}</td>
</tr>\n";
}

View File

@ -461,7 +461,11 @@ class poll
$OLDPOLLS = ($type == 'menu' ? "<a href='".e_PLUGIN_ABS."poll/oldpolls.php'>".POLLAN_28."</a>" : "");
}
$AUTHOR = POLLAN_35." ".($type == 'preview' || $type == 'forum' ? USERNAME : "<a href='".e_HTTP."user.php?id.".$pollArray['poll_admin_id']."'>".$pollArray['user_name']."</a>");
//"<a href='".e_HTTP."user.php?id.".$pollArray['poll_admin_id']."'>".$pollArray['user_name']."</a>"
$uparams = array('id' => $pollArray['poll_admin_id'], 'name' => $pollArray['user_name']);
$link = e107::getUrl()->create('user/profile/view', $uparams);
$userlink = "<a href='".$link."'>".$pollArray['user_name']."</a>";
$AUTHOR = POLLAN_35." ".($type == 'preview' || $type == 'forum' ? USERNAME : $userlink);