1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 09:04:38 +02: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

@@ -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);