Skip to content

Commit

Permalink
Reverted links to profile to point to old profile page again
Browse files Browse the repository at this point in the history
  • Loading branch information
diptobi1 committed Nov 22, 2021
1 parent 4c4e4d6 commit 5572459
Show file tree
Hide file tree
Showing 21 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion admin/adminAdvancedAccessLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class UserData
{
if (($checkIPs=='checked' and $values->IPCount > 0) or ($chCookies=='checked' and $values->CookieCount > 0))
{
print '<TR><TD class= "modTools"><a href="userprofile.php?userID='.$values->userID.'">'.$values->username.'</a></TD>';
print '<TR><TD class= "modTools"><a href="profile.php?userID='.$values->userID.'">'.$values->username.'</a></TD>';
print '<TD class= "modTools">'.$values->email.'</TD>';
print '<TD class= "modTools">'.gmstrftime("%d %b / %I:%M %p",$values->timeJoined).'</TD>';

Expand Down
4 changes: 2 additions & 2 deletions admin/adminMultiFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public function findbUserIDs()
*/
public function printCheckSummary()
{
print '<p>'.l_t('Checking %s %s %s (userID=%s)','<a href="userprofile.php?userID='.$this->aUserID.'">'.$this->aUser->username.'</a>',
print '<p>'.l_t('Checking %s %s %s (userID=%s)','<a href="profile.php?userID='.$this->aUserID.'">'.$this->aUser->username.'</a>',
'('.$this->aUser->points.' '.libHTML::points().')',
'RR: '.$this->aUser->reliabilityRating,$this->aUserID)
.($this->aUser->type['Banned'] ? '<img src="'.l_s('images/icons/cross.png').'" alt="X" title="'.l_t('Banned').'" />' : '').'
Expand Down Expand Up @@ -722,7 +722,7 @@ public function compare(User $bUser)
$info .= ' (played '.$bUserGames.' games)';

print '<ul>';
print '<li><a href="userprofile.php?userID='.$bUser->id.'">'.$bUser->username.'</a> ('.$bUser->points.' '.libHTML::points().')
print '<li><a href="profile.php?userID='.$bUser->id.'">'.$bUser->username.'</a> ('.$bUser->points.' '.libHTML::points().')
'.($bUser->type['Banned'] ? '<img src="'.l_s('images/icons/cross.png').'" alt="X" title="'.l_t('Banned').'" />' : '').'
RR: '.$bUser->reliabilityRating.'
(<a href="?aUserID='.$bUser->id.'#viewMultiFinder" class="light">'.l_t('check userID=%s',$bUser->id).'</a>)
Expand Down
14 changes: 7 additions & 7 deletions admin/adminStatusLists.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,19 @@ function adminStatusList($name, $query)
//require_once('gamemaster/game.php');
//adminStatusTable('Backed up games',processGame::backedUpGames());

adminStatusList(l_t('Mods'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%Moderator%'");
adminStatusList(l_t('Senior Mods'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%SeniorMod%'");
adminStatusList(l_t('Admins'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%Admin%'");
adminStatusList(l_t('Temp Banned - By Mod'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>')
adminStatusList(l_t('Mods'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%Moderator%'");
adminStatusList(l_t('Senior Mods'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%SeniorMod%'");
adminStatusList(l_t('Admins'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>') FROM wD_Users WHERE type LIKE '%Admin%'");
adminStatusList(l_t('Temp Banned - By Mod'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>')
FROM wD_Users WHERE tempBanReason is not null and tempBanReason <> 'System' and tempBan > ".time());

adminStatusList(l_t('Temp Banned - By System'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>')
adminStatusList(l_t('Temp Banned - By System'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>')
FROM wD_Users WHERE (tempBanReason is null or tempBanReason = 'System') and tempBan > ".time());

adminStatusList(l_t('Donors'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>')
adminStatusList(l_t('Donors'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>')
FROM wD_Users WHERE type LIKE '%Donator%'".(isset($_REQUEST['full'])?'':"LIMIT 50"));

adminStatusList(l_t('Banned users'),"SELECT CONCAT('<a href=\"userprofile.php?userID=',id,'\" class=\"light\">',username,'</a>')
adminStatusList(l_t('Banned users'),"SELECT CONCAT('<a href=\"profile.php?userID=',id,'\" class=\"light\">',username,'</a>')
FROM wD_Users WHERE type LIKE '%Banned%'".(isset($_REQUEST['full'])?'':"LIMIT 50"));

list($notice) = $DB->sql_row("SELECT message FROM wD_Config WHERE name = 'Notice'");
Expand Down
4 changes: 2 additions & 2 deletions contactUsDirect.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class GameResultData
{
$Mailer->Send(array($email=>$email), $subject.' '.$User->username,
"
This request is from <a href='https://www.webdiplomacy.net/userprofile.php?userID=".$User->id."' class = 'contactUs'>".$User->username."</a>,
This request is from <a href='https://www.webdiplomacy.net/profile.php?userID=".$User->id."' class = 'contactUs'>".$User->username."</a>,
and their registered email is: ".$User->email."<br><br>
<strong>An emergency pause was used because of ".$actualProblem."</strong>
Expand Down Expand Up @@ -336,7 +336,7 @@ class GameResultData
{
$Mailer->Send(array($email=>$email), $subject.' '.$User->username,
"
This request is from <a href='https://www.webdiplomacy.net/userprofile.php?userID=".$User->id."' class = 'contactUs'>".$User->username."</a>,
This request is from <a href='https://www.webdiplomacy.net/profile.php?userID=".$User->id."' class = 'contactUs'>".$User->username."</a>,
and their registered email is: ".$User->email."<br><br>
<strong>The user called out ".$userPickedGame. ".</strong><br><br>
Expand Down
8 changes: 4 additions & 4 deletions detailedSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ class GameResultData
print "</tr>";
foreach ($UsersData as $values)
{
print '<TR><TD class= "advancedSearch"><a href="userprofile.php?userID='.$values->userID.'">'.$values->userID.'</a>';
print '<TR><TD class= "advancedSearch"><a href="profile.php?userID='.$values->userID.'">'.$values->userID.'</a>';

// Print the mod or banned icons if the user is one or the other.
if ($values->mod)
Expand Down Expand Up @@ -939,9 +939,9 @@ class GameResultData
{
$sql = $sql." and ((select count(1) from wD_Members m where m.userID = ".$User->id." and m.gameID = g.id ) > 0) ";
$sqlCounter = $sqlCounter." and ((select count(1) from wD_Members m where m.userID = ".$User->id." and m.gameID = g.id ) > 0) ";
$userMessage = "Showing <a href='userprofile.php?userID=".$paramUserID."'>".$checkedUsername."'s</a> completed games against me.</p>";
$userMessage = "Showing <a href='profile.php?userID=".$paramUserID."'>".$checkedUsername."'s</a> completed games against me.</p>";
}
else { $userMessage = "Showing <a href='userprofile.php?userID=".$paramUserID."'>".$checkedUsername."'s</a> completed games.</p>";}
else { $userMessage = "Showing <a href='profile.php?userID=".$paramUserID."'>".$checkedUsername."'s</a> completed games.</p>";}

if ($showOnlyJoinable == 'checked')
{
Expand Down Expand Up @@ -1146,7 +1146,7 @@ function printGameResults($seeVariant, $seeGamename, $seeGameOver, $seePot, $see

if ($seeDirector=='checked')
{
if ($values->directorUserID) { print '<TD class= "advancedSearch"><a href="userprofile.php?userID='.$values->directorUserID.'">'.$values->directorUserID.'</a></TD>'; }
if ($values->directorUserID) { print '<TD class= "advancedSearch"><a href="profile.php?userID='.$values->directorUserID.'">'.$values->directorUserID.'</a></TD>'; }
else { print '<TD class= "advancedSearch">N/A</TD>'; }
}
if ($seeMinRR=='checked') { print '<TD class= "advancedSearch">'.$values->minimumRR.'</TD>'; }
Expand Down
4 changes: 2 additions & 2 deletions gamepanel/member.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function memberName()
else
$ipStr = '';

return '<a href=userprofile.php?userID='.$this->userID.'">'.$this->username.'</a>
return '<a href=profile.php?userID='.$this->userID.'">'.$this->username.'</a>
'.'
<span class="points">('.$this->vpoints.libHTML::vpoints().User::typeIcon($this->userType,false).'</b>'.
$ccStr.$ipStr.
Expand All @@ -277,7 +277,7 @@ function memberNameCountry()
if ( $this->isNameHidden() )
$buf .= '<span class="country'.$this->countryID.'">'.l_t($this->country).'</span>';
else
$buf .= '<a class="country'.$this->countryID.'" href="userprofile.php?userID='.$this->userID.'">'.$this->username.'</a>';
$buf .= '<a class="country'.$this->countryID.'" href="profile.php?userID='.$this->userID.'">'.$this->username.'</a>';

$buf .= '</span>';

Expand Down
2 changes: 1 addition & 1 deletion gamepanel/members.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function membersList()
foreach ($this->Game->civilDisorderInfo as $userID => $CD)
{
$cdUser = new User($userID);
$extras .= '<tr class="member memberAlternate1"><td class="memberLeftSide" style="white-space: nowrap;"><span><a href="userprofile.php?userID='.$userID .'">'.$cdUser->username.'</a>'.
$extras .= '<tr class="member memberAlternate1"><td class="memberLeftSide" style="white-space: nowrap;"><span><a href="profile.php?userID='.$userID .'">'.$cdUser->username.'</a>'.
' <span class="points">('.$cdUser->points.libHTML::points().User::typeIcon($cdUser->type).')'
.(defined('AdminUserSwitch') ? ' (<a href="board.php?gameID='.$this->Game->id.'&auid='.$cdUser->id.'" class="light">+</a>)':'') .
'</span></span></td><td class="memberRightSide">';
Expand Down
12 changes: 6 additions & 6 deletions halloffame.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
list($players) = $DB->sql_row("SELECT COUNT(id)+1 FROM wD_Users WHERE vpoints > 1000");

print '<p class = "hof">'.l_t('You are ranked %s out of %s players with over 1000%s','<a href="#me" class="light">#'.$position.'</a>',$players,libHTML::vpoints()).
l_t('. For more stats on your ranking, visit <a class="light" href="userprofile.php?userID='.$User->id.'">your profile</a>.').'</p>';
l_t('. For more stats on your ranking, visit <a class="light" href="profile.php?userID='.$User->id.'">your profile</a>.').'</p>';
}

$i=1;
Expand All @@ -63,12 +63,12 @@
<td class="hof"> '.number_format($points).' '.libHTML::vpoints().' - #'.$i.' </td>';
if ($User->username == $username)
{
print '<td class="hof"><a class="hof-self" href="userprofile.php?userID='.$id.'">'.$username.'</a></td> ';
print '<td class="hof"><a class="hof-self" href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
$showMe = 0;
}
else
{
print '<td class="hof"><a href="userprofile.php?userID='.$id.'">'.$username.'</a></td> ';
print '<td class="hof"><a href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
}
print' </tr>';
$i++;
Expand Down Expand Up @@ -98,7 +98,7 @@
list($playersSixMonths) = $DB->sql_row("SELECT COUNT(1) FROM wD_Users WHERE vpoints > 1000 AND timeLastSessionEnded > ".$sixMonths);

print '<p class = "hof">'.l_t('You are ranked %s out of %s players with over 1000%s who have been active in the last six months','<a href="#me" class="light">#'.$position.'</a>',$playersSixMonths,libHTML::vpoints()).
l_t('. For more stats on your ranking visit <a class="light" href="userprofile.php?userID='.$User->id.'">your profile</a>.').'</p>';
l_t('. For more stats on your ranking visit <a class="light" href="profile.php?userID='.$User->id.'">your profile</a>.').'</p>';
}

$i=1;
Expand All @@ -118,12 +118,12 @@
<td class="hof"> '.number_format($points).' '.libHTML::vpoints().' - #'.$i.' </td>';
if ($User->username == $username)
{
print '<td class="hof"><a class="hof-self" href="userprofile.php?userID='.$id.'">'.$username.'</a></td> ';
print '<td class="hof"><a class="hof-self" href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
$showMe = 0;
}
else
{
print '<td class="hof"><a href="userprofile.php?userID='.$id.'">'.$username.'</a></td> ';
print '<td class="hof"><a href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
}
print' </tr>';
$i++;
Expand Down
10 changes: 5 additions & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static function topUsers()
$i=1;
while(list($userID,$username,$points)=$DB->tabl_row($tabl))
{
$rows[] = '#'.$i.': <a href="userprofile.php?userID='.$userID.'">'.$username.'</a> ('.$points.libHTML::points().')';
$rows[] = '#'.$i.': <a href="profile.php?userID='.$userID.'">'.$username.'</a> ('.$points.libHTML::points().')';
$i++;
}
return $rows;
Expand Down Expand Up @@ -496,7 +496,7 @@ static function forumNew()
$buf .= '<div class="homeForumPost homeForumPostAlt'.libHTML::alternate().' userID'.$post['userID'].'">
<div class="homeForumPostTime">'.libTime::text($post['timeSent']).' '.$post['iconMessage'].'</div>
<a href="userprofile.php?userID='.$post['userID'].'" class="light">'.$post['username'].'</a>
<a href="profile.php?userID='.$post['userID'].'" class="light">'.$post['username'].'</a>
'.' ('.$post['points'].libHTML::vpoints().
User::typeIcon($post['userType']).')
Expand Down Expand Up @@ -587,7 +587,7 @@ static function forumNewExtern()
$buf .= '<div style="clear:both"></div>';
$buf .= '<div class="homeForumPostTime" style="float:right"><em>'.libTime::text($t['topic_time']).'</em></div>';
$buf .= '<span style=\'font-size:90%\'>';
$buf .= 'Thread:</span> <a href="userprofile.php?userID='.$t['topic_poster_webdip'].'" class="light">'.$t['topic_first_poster_name'].'</a> ';
$buf .= 'Thread:</span> <a href="profile.php?userID='.$t['topic_poster_webdip'].'" class="light">'.$t['topic_first_poster_name'].'</a> ';
$buf .= '<div style="clear:both"></div></div>';
$buf .= '<div class="homeForumPost homeForumPostAlt'.$alt.'">';

Expand All @@ -598,7 +598,7 @@ static function forumNewExtern()
$buf .= '<div class="" style="margin-bottom:5px;margin-left:3px; margin-right:3px;">';
$buf .= '<div class="homeForumPostTime" style="float:right;font-weight:bold"><em>'.libTime::text($t['topic_last_post_time']).'</em></div>';
$buf .= '<span class="home-forum-latest">';
$buf .= 'Latest:</span> <a href="userprofile.php?userID='.$t['topic_last_poster_webdip'].'" class="light">'.$t['topic_last_poster_name'].'</a> '
$buf .= 'Latest:</span> <a href="profile.php?userID='.$t['topic_last_poster_webdip'].'" class="light">'.$t['topic_last_poster_name'].'</a> '
.'</div>';
}

Expand Down Expand Up @@ -713,7 +713,7 @@ static function forumNewExtern()
is to entering orders prior to deadlines. Whether you decide to be a casual Diplomacy player or a very dedicated player,
it is important to enter orders prior to the deadlines so that the game is fair and balanced for everyone, and so that
games are not delayed while players are replaced. Some games require a minimum reliability rating, so it is important to
keep it high! You can read more about reliability rating <a href="userprofile.php?userID='.$User->id.'"
keep it high! You can read more about reliability rating <a href="profile.php?userID='.$User->id.'"
target="_blank">here</a>.
<br><br>
You are currently on the home screen. This is the landing page that you will see when you log into the site. While you can
Expand Down
2 changes: 1 addition & 1 deletion lib/html.php
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ static public function pages()
$links['board.php']=array('name'=>'Board', 'inmenu'=>FALSE);
$links['profile.php']=array('name'=>'Profile', 'inmenu'=>FALSE);
$links['search.php']=array('name'=>'Find user', 'inmenu'=>false);
$links['userprofile.php']=array('name'=>'ProfileNew', 'inmenu'=>FALSE);
$links['profile.php']=array('name'=>'ProfileNew', 'inmenu'=>FALSE);
$links['translating.php']=array('name'=>'Translating', 'inmenu'=>FALSE);
$links['points.php']=array('name'=>'Points', 'inmenu'=>FALSE);
$links['halloffame.php']=array('name'=>'Hall of fame', 'inmenu'=>FALSE);
Expand Down
Loading

0 comments on commit 5572459

Please sign in to comment.