mirror of https://github.com/BOINC/boinc.git
user web: make sure that all links that have URL_BASE have slashes after it. This makes a slash in the end of URL_BASE definition in project/project.inc no longer necessary.
svn path=/trunk/boinc/; revision=13106
This commit is contained in:
parent
36a85ccc2a
commit
b04aeea7d6
|
@ -7014,5 +7014,12 @@ Janus 4 July 2007
|
|||
user/
|
||||
top_hosts.php
|
||||
languages/translations/
|
||||
en.po
|
||||
en.po
|
||||
|
||||
Rytis 5 July 2007
|
||||
- user web: make sure that all links that have URL_BASE have slashes after
|
||||
it. This makes a slash in the end of URL_BASE definition in
|
||||
project/project.inc no longer necessary.
|
||||
|
||||
html/
|
||||
<numerous files>
|
||||
|
|
|
@ -210,7 +210,7 @@ function send_founder_transfer_email($team, $user) {
|
|||
$body = "Team member ".$user->name." has requested you to hand over
|
||||
the privileges and responsibilities of team founder to him in ".PROJECT.".
|
||||
|
||||
Visit ".URL_BASE."team_change_founder_form.php?teamid=".$team->id."
|
||||
Visit ".URL_BASE."/team_change_founder_form.php?teamid=".$team->id."
|
||||
to change team founder or decline user's request.
|
||||
|
||||
If you do not respond to this request within two months, ".$user->name." will
|
||||
|
|
|
@ -60,7 +60,7 @@ function send_moderation_email($post, $message, $action) {
|
|||
This email is to inform you that one of your posts in the forum has been affected by moderation in ".PROJECT.":
|
||||
Thread: ".$thread->getTitle()."
|
||||
Post: ".$post->getID()." by ".$user->getID()." (".$user->getName().")
|
||||
Link: ".URL_BASE."forum_thread.php?id=".$thread->getID()."
|
||||
Link: ".URL_BASE."/forum_thread.php?id=".$thread->getID()."
|
||||
Moderator: ".$moderator->getName()." (".$moderator->getID().")
|
||||
Action: ".$action."
|
||||
|
||||
|
@ -122,7 +122,7 @@ For further information and assistance with ".PROJECT." go to ".MASTER_URL;
|
|||
**/
|
||||
function send_reply_notification_email($thread, $user){
|
||||
$title = PROJECT . ": A user has posted to '". stripslashes($thread->getTitle()) ."'";
|
||||
$link = URL_BASE . "forum_thread.php?id=" . $thread->getID();
|
||||
$link = URL_BASE . "/forum_thread.php?id=" . $thread->getID();
|
||||
$body = "Another " . PROJECT . " user has posted to the thread \"" . stripslashes($thread->getTitle()) . "\".\n"
|
||||
."To view the updated thread, visit the following URL:\n\n$link";
|
||||
return re_send_email($user, $title, $body);
|
||||
|
@ -144,7 +144,7 @@ This email is sent to inform you that one of the posts in the forum was reported
|
|||
Thread: ".$thread->getTitle()."
|
||||
Post: ".$post->getID()." by ".$owner->getID()." (".$owner->getName().")
|
||||
Reporting User: ".$user->getID()." (".$user->getName().")
|
||||
Link: ".URL_BASE."forum_thread.php?id=".$thread->getID()."#".$post->getID()."
|
||||
Link: ".URL_BASE."/forum_thread.php?id=".$thread->getID()."#".$post->getID()."
|
||||
|
||||
The reporting user gave this explanation to why the post was reported:
|
||||
".$message."
|
||||
|
|
|
@ -88,9 +88,9 @@ function pm_send($to, $subject, $content) {
|
|||
$message = "Dear ".$to->name.",\n\n";
|
||||
$message .= "You have received a new private message at ".PROJECT." from ".$logged_in_user->name.", entitled \"".$subject."\".\n\n";
|
||||
$message .= "To read the original version, respond to, or delete this message, you must log in here:\n";
|
||||
$message .= URL_BASE."forum_pm.php\n\n";
|
||||
$message .= URL_BASE."/forum_pm.php\n\n";
|
||||
$message .= "Do not reply to this message. To disable email notification, go to\n";
|
||||
$message .= URL_BASE."prefs.php?subset=project\n";
|
||||
$message .= URL_BASE."/prefs.php?subset=project\n";
|
||||
$message .= "and change email notification settings.\n";
|
||||
|
||||
send_email($to, "[".PROJECT."] Private message notification", $message);
|
||||
|
|
|
@ -111,12 +111,9 @@ function build_picture_pages($width, $height) {
|
|||
echo "<tr>";
|
||||
for ($col = 0; $col < $width; $col++) {
|
||||
if ($count < $numIds) {
|
||||
echo "<td class=bordered align=\"center\"><a href=\"",
|
||||
URL_BASE, "view_profile.php?userid=",
|
||||
$userIds[$count], "\"><img src=\"",
|
||||
URL_BASE, IMAGE_URL, $userIds[$count],
|
||||
"_sm.jpg\"></a></td>";
|
||||
|
||||
echo "<td class=\"bordered\" align=\"center\">
|
||||
<a href=\"".URL_BASE."/view_profile.php?userid=".$userIds[$count]."\"><img src=\"".URL_BASE."/".IMAGE_URL.$userIds[$count]."_sm.jpg\"></a>
|
||||
</td>";
|
||||
$count++;
|
||||
}
|
||||
}
|
||||
|
@ -311,7 +308,7 @@ function build_alpha_summary_page($characters_used) {
|
|||
|
||||
foreach ($alphabet as $character) {
|
||||
if (isset($characters_used[$character])) {
|
||||
echo "<a href=", URL_BASE, PROFILE_URL, "profile_{$character}_1.html>$character</a> ";
|
||||
echo "<a href=\"".URL_BASE."/".PROFILE_URL."profile_{$character}_1.html\">$character</a> ";
|
||||
unset($characters_used[$character]);
|
||||
} else {
|
||||
echo "$character ";
|
||||
|
@ -320,7 +317,7 @@ function build_alpha_summary_page($characters_used) {
|
|||
|
||||
// Link to the 'Other' page if necessary.
|
||||
if (!empty($characters_used)) {
|
||||
echo "<a href=", URL_BASE, PROFILE_URL, "profile_other_1.html>Other</a> ";
|
||||
echo "<a href=\"".URL_BASE."/".PROFILE_URL."profile_other_1.html\">Other</a> ";
|
||||
}
|
||||
close_output_buffer($filename);
|
||||
}
|
||||
|
|
|
@ -443,8 +443,7 @@ function show_user_table($members, $offset, $numToDisplay, $cols) {
|
|||
$show_picture = false;
|
||||
}
|
||||
if ($show_picture) {
|
||||
echo "<a href=\"", URL_BASE, "view_profile.php?userid={$members[$count]}\"><img src=\"", URL_BASE, IMAGE_URL, "{$members[$count]}_sm.jpg\"></a>";
|
||||
|
||||
echo "<a href=\"".URL_BASE."/view_profile.php?userid={$members[$count]}\"><img src=\"".URL_BASE."/".IMAGE_URL."{$members[$count]}_sm.jpg\"></a>";
|
||||
} else {
|
||||
echo " ";
|
||||
}
|
||||
|
@ -483,7 +482,7 @@ function get_profile_summary($profile) {
|
|||
|
||||
}
|
||||
|
||||
$summary = "<a href=\"" . URL_BASE . "view_profile.php?userid=" . $profile->userid . "\">" . $user->name . "</a> " . $description;
|
||||
$summary = "<a href=\"" . URL_BASE . "/view_profile.php?userid=" . $profile->userid . "\">" . $user->name . "</a> " . $description;
|
||||
return $summary;
|
||||
}
|
||||
|
||||
|
@ -530,8 +529,8 @@ function show_profile($userid, $verify_mode = FALSE) {
|
|||
}
|
||||
if ($show_picture) {
|
||||
echo "
|
||||
<tr><td colspan=2 align=center>
|
||||
<img vspace=6 hspace=9 src=\"" , URL_BASE, IMAGE_URL , $user->id , '.jpg' . "\">
|
||||
<tr><td colspan=\"2\" align=\"center\">
|
||||
<img vspace=\"6\" hspace=\"9\" src=\"".URL_BASE."/".IMAGE_URL.$user->id.".jpg\">
|
||||
</td></tr>
|
||||
";
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ function send_notice_email($userId, $threadID) {
|
|||
$row = mysql_fetch_object($result);
|
||||
|
||||
$title = PROJECT . ": A user has posted to your subscribed thread.";
|
||||
$link = URL_BASE . "forum_thread.php?id=" . $threadID;
|
||||
$link = URL_BASE . "/forum_thread.php?id=" . $threadID;
|
||||
$body = "Another " . PROJECT . " user has posted to the thread \"" . stripslashes($thread->title) . "\".\n"
|
||||
."To view the updated thread, visit the following URL:\n\n$link";
|
||||
|
||||
|
|
|
@ -7,8 +7,7 @@ define('UOTD_THRESHOLD', 7);
|
|||
|
||||
function uotd_thumbnail($profile, $user) {
|
||||
if ($profile->has_picture) {
|
||||
$ub = URL_BASE;
|
||||
return "<a href=$ub/view_profile.php?userid=$user->id><img border=0 vspace=4 hspace=8 align=left src=$ub".IMAGE_URL.$user->id."_sm.jpg></a>";
|
||||
return "<a href=".URL_BASE."/view_profile.php?userid=$user->id><img border=0 vspace=4 hspace=8 align=left src=".URL_BASE."/".IMAGE_URL.$user->id."_sm.jpg></a>";
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
|
|
|
@ -157,7 +157,7 @@ function show_user_stats_private($user) {
|
|||
}
|
||||
$x .= "<br><font size=-2>Cross-project ID: $cpid</font>\n";
|
||||
row2("Cross-project statistics", $x);
|
||||
row2("Stats on your cell phone", URL_BASE."userw.php?id=$user->id");
|
||||
row2("Stats on your cell phone", URL_BASE."/userw.php?id=$user->id");
|
||||
row2("Account number<br><font size=-2>Used in URLs</font>", $user->id);
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ function show_user_info_private($user) {
|
|||
row2("Profile", $x);
|
||||
$tot = total_posts($user);
|
||||
if ($tot) {
|
||||
row2("Message boards", "<a href=".URL_BASE."forum_user_posts.php?userid=$user->id>$tot posts</a>");
|
||||
row2("Message boards", "<a href=".URL_BASE."/forum_user_posts.php?userid=$user->id>$tot posts</a>");
|
||||
}
|
||||
|
||||
row2("Private messages", pm_notification($user));
|
||||
|
@ -247,18 +247,18 @@ function show_user_summary_public($user) {
|
|||
show_credit($user);
|
||||
|
||||
if ($user->teamid && ($team = lookup_team($user->teamid))) {
|
||||
row2("Team", "<a href=\"".URL_BASE."team_display.php?teamid=$team->id\">$team->name</a>");
|
||||
row2("Team", "<a href=\"".URL_BASE."/team_display.php?teamid=$team->id\">$team->name</a>");
|
||||
} else {
|
||||
row2("Team", "None");
|
||||
}
|
||||
if ($user->show_hosts) {
|
||||
row2("Computers", "<a href=\"".URL_BASE."hosts_user.php?userid=$user->id\">View</a>");
|
||||
row2("Computers", "<a href=\"".URL_BASE."/hosts_user.php?userid=$user->id\">View</a>");
|
||||
} else {
|
||||
row2("Computers", "hidden");
|
||||
}
|
||||
$tot = total_posts($user);
|
||||
if ($tot) {
|
||||
row2("Message boards", "<a href=\"".URL_BASE."forum_user_posts.php?userid=$user->id\">$tot posts</a>");
|
||||
row2("Message boards", "<a href=\"".URL_BASE."/forum_user_posts.php?userid=$user->id\">$tot posts</a>");
|
||||
}
|
||||
|
||||
if ($user->donated == 1) {
|
||||
|
|
|
@ -108,9 +108,9 @@ function show_login($user) {
|
|||
//
|
||||
if (!function_exists("page_head")){
|
||||
function page_head($title, $java_onload=null, $title_plain=null, $prefix="") {
|
||||
$styleSheet = URL_BASE . STYLESHEET;
|
||||
$styleSheet = URL_BASE . "/".STYLESHEET;
|
||||
$rssname = PROJECT . " RSS 2.0";
|
||||
$rsslink = URL_BASE . "rss_main.php";
|
||||
$rsslink = URL_BASE . "/rss_main.php";
|
||||
|
||||
if (defined("CHARSET")) {
|
||||
header("Content-type: text/html; charset=".tr(CHARSET));
|
||||
|
@ -512,10 +512,9 @@ function sched_stopped() {
|
|||
}
|
||||
|
||||
function user_links($user) {
|
||||
$ub = URL_BASE;
|
||||
$x = '<a href="'.$ub.'show_user.php?userid='.$user->id.'">'.$user->name.'</a>';
|
||||
$x = "<a href=\"".URL_BASE."/show_user.php?userid=".$user->id."\">".$user->name."</a>";
|
||||
if ($user->has_profile) {
|
||||
$x .= ' <a href="'.$ub.'view_profile.php?userid='.$user->id.'"><img border="0" src="'.$ub.'img/head_20.png" alt="User profile image"></a>';
|
||||
$x .= ' <a href="'.URL_BASE.'/view_profile.php?userid='.$user->id.'"><img border="0" src="'.URL_BASE.'/img/head_20.png" alt="User profile image"></a>';
|
||||
}
|
||||
# Does this project accept donations?
|
||||
# If so, do you want to have a link next to user name as it appears on the web site?
|
||||
|
|
|
@ -160,10 +160,8 @@ if( !empty($user) ) {
|
|||
*/
|
||||
|
||||
admin_page_head("User Management: $user->name");
|
||||
echo "\n<link rel='stylesheet' type=text/css href='". URL_BASE. "new_forum.css'>\n";
|
||||
echo "\n<link rel='stylesheet' type=text/css href='" .URL_BASE. "arrgh.css'>\n";
|
||||
|
||||
echo "<h2>User Managment</h2>\n";
|
||||
echo "<h2>User Management</h2>\n";
|
||||
|
||||
if (!defined("POST_REPORT_EMAILS")) {
|
||||
echo "<p><font color='RED'>
|
||||
|
|
|
@ -67,7 +67,7 @@ if ($receiver > 0) {
|
|||
while ($user = mysql_fetch_object($result)) {
|
||||
// TODO: might want to also replace TOTAL_CREDIT, RAC, and similar.
|
||||
$body_to_send = str_replace(USERNAME, $user->name, $body);
|
||||
$body_to_send .= "\n\nTo opt out of future emails from ".PROJECT.", please edit your project preferences at ".URL_BASE."prefs.php?subset=project\n";
|
||||
$body_to_send .= "\n\nTo opt out of future emails from ".PROJECT.", please edit your project preferences at ".URL_BASE."/prefs.php?subset=project\n";
|
||||
$retval = send_email($user, $subject, $body_to_send);
|
||||
if ($retval) {
|
||||
// send_email returns TRUE on success
|
||||
|
|
|
@ -150,7 +150,7 @@ function replace($user, $template) {
|
|||
$user->name,
|
||||
gmdate('d F Y', $user->create_time),
|
||||
number_format($user->total_credit, 0),
|
||||
URL_BASE."opt_out.php?code=".salted_key($user->authenticator)."&userid=$user->id",
|
||||
URL_BASE."/opt_out.php?code=".salted_key($user->authenticator)."&userid=$user->id",
|
||||
floor((time() - $user->last_rpc_time) / 86400),
|
||||
);
|
||||
return preg_replace($pat, $rep, $template);
|
||||
|
|
|
@ -162,7 +162,7 @@ function replace($user, $template) {
|
|||
$user->name,
|
||||
gmdate('d F Y', $user->create_time),
|
||||
number_format($user->total_credit, 0),
|
||||
URL_BASE."opt_out.php?code=".salted_key($user->authenticator)."&userid=$user->id",
|
||||
URL_BASE."/opt_out.php?code=".salted_key($user->authenticator)."&userid=$user->id",
|
||||
$user->id,
|
||||
floor ((time() - $user->last_rpc_time) / 86400),
|
||||
);
|
||||
|
|
|
@ -27,7 +27,7 @@ $payment_id = mysql_insert_id();
|
|||
|
||||
$URL = "www.paypal.com/cgi-bin/webscr";
|
||||
|
||||
$fields = ("cmd=_xclick&lc=US&business=".PAYPAL_ADDRESS."&quantity=1&item_name=Donation&item_number=".$payment_id."_".$order_time."&amount=".$amount."&no_shipping=1&return=".URL_BASE."donated.php?st=Completed&rm=2&cancel_return=".URL_BASE."donated.php&no_note=1¤cy_code=".$currency."&bn=PP-BuyNowBF");
|
||||
$fields = ("cmd=_xclick&lc=US&business=".PAYPAL_ADDRESS."&quantity=1&item_name=Donation&item_number=".$payment_id."_".$order_time."&amount=".$amount."&no_shipping=1&return=".URL_BASE."/donated.php?st=Completed&rm=2&cancel_return=".URL_BASE."/donated.php&no_note=1¤cy_code=".$currency."&bn=PP-BuyNowBF");
|
||||
|
||||
header("Location: https://$URL?$fields");
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ if (!$thread_ids && !$post_ids){
|
|||
echo "<p>Sorry, couldn't find anything matching your search query. You
|
||||
can try to broaden your search by using less words (or less specific words).</p>
|
||||
<p>You can also
|
||||
<a href=\"http://www.google.com/search?domains=".URL_BASE."&sitesearch=".URL_BASE."forum_thread.php&q=".htmlentities($search_keywords)."\">
|
||||
<a href=\"http://www.google.com/search?domains=".URL_BASE."&sitesearch=".URL_BASE."/forum_thread.php&q=".htmlentities($search_keywords)."\">
|
||||
try the same search on Google.</a></p>";
|
||||
}
|
||||
echo "<p><a href=\"forum_search.php\">Perform another search</a></p>";
|
||||
|
|
|
@ -23,7 +23,7 @@ page_head("$email removed from mailing list");
|
|||
echo "
|
||||
No further emails will be sent to $user->email_addr.
|
||||
To resume getting emails,
|
||||
go <a href=".URL_BASE."prefs_edit.php?subset=project>here</a>
|
||||
go <a href=".URL_BASE."/prefs_edit.php?subset=project>here</a>
|
||||
";
|
||||
|
||||
page_tail();
|
||||
|
|
|
@ -48,8 +48,8 @@ rowify("<br>");
|
|||
row1("User Profile Explorer");
|
||||
echo "<tr><td>
|
||||
<ul>
|
||||
<li>View the <a href=\"" . URL_BASE . "user_profile/user_gallery_1.html\">User Picture Gallery</a>.</li>
|
||||
<li>Browse profiles <a href=\"" . URL_BASE . "user_profile/profile_country.html\">by country</a>.</li>
|
||||
<li>View the <a href=\"" . URL_BASE . "/user_profile/user_gallery_1.html\">User Picture Gallery</a>.</li>
|
||||
<li>Browse profiles <a href=\"" . URL_BASE . "/user_profile/profile_country.html\">by country</a>.</li>
|
||||
<li>Browse profiles <a href=\"?cmd=rand&pic=-1\">at random</a>,
|
||||
<a href=\"?cmd=rand&pic=1\">at random with pictures</a>, or
|
||||
<a href=\"?cmd=rand&pic=0\">at random without pictures</a>.</li>
|
||||
|
@ -102,7 +102,7 @@ function select_profile($cmd) {
|
|||
}
|
||||
|
||||
shuffle($userIds);
|
||||
header("Location: " . URL_BASE . "view_profile.php?userid=" . $userIds[0]);
|
||||
header("Location: " . URL_BASE . "/view_profile.php?userid=" . $userIds[0]);
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ function show_nav() {
|
|||
</ul>
|
||||
<h2>Community</h2>
|
||||
<ul>
|
||||
<li><a href=\"".URL_BASE."profile_menu.php\">Participant profiles</a>
|
||||
<li><a href=\"".URL_BASE."/profile_menu.php\">Participant profiles</a>
|
||||
<li><a href=\"forum_index.php\">Message boards</a>
|
||||
<li><a href=\"forum_help_desk.php\">Questions and answers</a>
|
||||
<li><a href=\"stats.php\">Statistics</a>
|
||||
|
@ -67,7 +67,7 @@ if ($caching) {
|
|||
|
||||
$stopped = web_stopped();
|
||||
$rssname = PROJECT . " RSS 2.0" ;
|
||||
$rsslink = URL_BASE . "rss_main.php";
|
||||
$rsslink = URL_BASE . "/rss_main.php";
|
||||
|
||||
if (defined("CHARSET")) {
|
||||
header("Content-type: text/html; charset=".tr(CHARSET));
|
||||
|
|
|
@ -39,7 +39,7 @@ require_once("../project/project_news.inc");
|
|||
// Create channel header and open XML content
|
||||
//
|
||||
$description = "BOINC project ".PROJECT.": Main page News";
|
||||
$channel_image = URL_BASE . "rss_image.gif";
|
||||
$channel_image = URL_BASE . "/rss_image.gif";
|
||||
$language = "en-us";
|
||||
echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
|
||||
<rss version=\"2.0\">
|
||||
|
@ -66,7 +66,7 @@ for( $item=0; $item < $news; $item++ ) {
|
|||
if( count($project_news[$item]) >= 2) {
|
||||
$d = strtotime($project_news[$item][0]);
|
||||
$news_date=gmdate('D, d M Y H:i:s',$d) . ' GMT';
|
||||
$unique_url=URL_BASE."all_news.php#$j";
|
||||
$unique_url=URL_BASE."/all_news.php#$j";
|
||||
if (isset($project_news[$item][2])) {
|
||||
$title = strip_tags($project_news[$item][2]);
|
||||
} else {
|
||||
|
|
|
@ -16,7 +16,7 @@ echo "
|
|||
computing project ".PROJECT."\"
|
||||
height=\"100\"
|
||||
/>
|
||||
<Content type=\"url\" href=\"".URL_BASE."user_profile/uotd_gadget.html\" />
|
||||
<Content type=\"url\" href=\"".URL_BASE."/user_profile/uotd_gadget.html\" />
|
||||
</Module>
|
||||
";
|
||||
|
||||
|
|
Loading…
Reference in New Issue