diff --git a/checkin_notes b/checkin_notes index f01f29c8d3..0563e2018e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -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/ + diff --git a/html/inc/email.inc b/html/inc/email.inc index 63e75e9183..811f5bc17f 100644 --- a/html/inc/email.inc +++ b/html/inc/email.inc @@ -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 diff --git a/html/inc/forum_email.inc b/html/inc/forum_email.inc index 32c15d3f60..ab2aee8a49 100644 --- a/html/inc/forum_email.inc +++ b/html/inc/forum_email.inc @@ -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." diff --git a/html/inc/forum_pm.inc b/html/inc/forum_pm.inc index 4de63fd4ad..ed859c0515 100644 --- a/html/inc/forum_pm.inc +++ b/html/inc/forum_pm.inc @@ -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); diff --git a/html/inc/gallery.inc b/html/inc/gallery.inc index 82b6e9efb8..edfd44e9ee 100644 --- a/html/inc/gallery.inc +++ b/html/inc/gallery.inc @@ -111,12 +111,9 @@ function build_picture_pages($width, $height) { echo ""; for ($col = 0; $col < $width; $col++) { if ($count < $numIds) { - echo ""; - + echo " + + "; $count++; } } @@ -311,7 +308,7 @@ function build_alpha_summary_page($characters_used) { foreach ($alphabet as $character) { if (isset($characters_used[$character])) { - echo "$character "; + echo "$character "; 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 "Other "; + echo "Other "; } close_output_buffer($filename); } diff --git a/html/inc/profile.inc b/html/inc/profile.inc index 7affc1b9d3..d2512c428d 100644 --- a/html/inc/profile.inc +++ b/html/inc/profile.inc @@ -443,8 +443,7 @@ function show_user_table($members, $offset, $numToDisplay, $cols) { $show_picture = false; } if ($show_picture) { - echo ""; - + echo ""; } else { echo " "; } @@ -483,7 +482,7 @@ function get_profile_summary($profile) { } - $summary = "" . $user->name . " " . $description; + $summary = "" . $user->name . " " . $description; return $summary; } @@ -530,8 +529,8 @@ function show_profile($userid, $verify_mode = FALSE) { } if ($show_picture) { echo " - - id , '.jpg' . "\"> + + id.".jpg\"> "; } diff --git a/html/inc/subscribe.inc b/html/inc/subscribe.inc index d3957a9434..569270df20 100644 --- a/html/inc/subscribe.inc +++ b/html/inc/subscribe.inc @@ -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"; diff --git a/html/inc/uotd.inc b/html/inc/uotd.inc index 3d23ac03b1..cc8f9c0071 100644 --- a/html/inc/uotd.inc +++ b/html/inc/uotd.inc @@ -7,8 +7,7 @@ define('UOTD_THRESHOLD', 7); function uotd_thumbnail($profile, $user) { if ($profile->has_picture) { - $ub = URL_BASE; - return "id>id."_sm.jpg>"; + return "id>id."_sm.jpg>"; } else { return ""; } diff --git a/html/inc/user.inc b/html/inc/user.inc index c0ad7c147b..7ef1ab5d68 100644 --- a/html/inc/user.inc +++ b/html/inc/user.inc @@ -157,7 +157,7 @@ function show_user_stats_private($user) { } $x .= "
Cross-project ID: $cpid\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
Used in URLs", $user->id); } @@ -196,7 +196,7 @@ function show_user_info_private($user) { row2("Profile", $x); $tot = total_posts($user); if ($tot) { - row2("Message boards", "id>$tot posts"); + row2("Message boards", "id>$tot posts"); } 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", "id\">$team->name"); + row2("Team", "id\">$team->name"); } else { row2("Team", "None"); } if ($user->show_hosts) { - row2("Computers", "id\">View"); + row2("Computers", "id\">View"); } else { row2("Computers", "hidden"); } $tot = total_posts($user); if ($tot) { - row2("Message boards", "id\">$tot posts"); + row2("Message boards", "id\">$tot posts"); } if ($user->donated == 1) { diff --git a/html/inc/util.inc b/html/inc/util.inc index 649bb89490..ed4f2db90b 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -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 = ''.$user->name.''; + $x = "id."\">".$user->name.""; if ($user->has_profile) { - $x .= ' User profile image'; + $x .= ' User profile image'; } # 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? diff --git a/html/ops/manage_user.php b/html/ops/manage_user.php index 9d461306fe..e0ccff7751 100644 --- a/html/ops/manage_user.php +++ b/html/ops/manage_user.php @@ -160,10 +160,8 @@ if( !empty($user) ) { */ admin_page_head("User Management: $user->name"); -echo "\n\n"; -echo "\n\n"; -echo "

User Managment

\n"; +echo "

User Management

\n"; if (!defined("POST_REPORT_EMAILS")) { echo "

diff --git a/html/ops/mass_email.php b/html/ops/mass_email.php index 96bc44d6e0..0374a3ef06 100644 --- a/html/ops/mass_email.php +++ b/html/ops/mass_email.php @@ -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 diff --git a/html/ops/mass_email_script.php b/html/ops/mass_email_script.php index d4beba1799..cc0bab1eb6 100755 --- a/html/ops/mass_email_script.php +++ b/html/ops/mass_email_script.php @@ -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); diff --git a/html/ops/remind.php b/html/ops/remind.php index ea98cabc0e..b5d578c434 100755 --- a/html/ops/remind.php +++ b/html/ops/remind.php @@ -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), ); diff --git a/html/user/donate.php b/html/user/donate.php index 0049d3e1a8..32c51efb4d 100644 --- a/html/user/donate.php +++ b/html/user/donate.php @@ -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"); diff --git a/html/user/forum_search.php b/html/user/forum_search.php old mode 100755 new mode 100644 diff --git a/html/user/forum_search_action.php b/html/user/forum_search_action.php old mode 100755 new mode 100644 index 99b611bc3f..4a0d0e9b2f --- a/html/user/forum_search_action.php +++ b/html/user/forum_search_action.php @@ -105,7 +105,7 @@ if (!$thread_ids && !$post_ids){ echo "

Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).

You can also - + try the same search on Google.

"; } echo "

Perform another search

"; diff --git a/html/user/opt_out.php b/html/user/opt_out.php index 7b68183b7e..1ef84b7925 100644 --- a/html/user/opt_out.php +++ b/html/user/opt_out.php @@ -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 here +go here "; page_tail(); diff --git a/html/user/profile_menu.php b/html/user/profile_menu.php index 5c48d9a337..4131314313 100644 --- a/html/user/profile_menu.php +++ b/html/user/profile_menu.php @@ -48,8 +48,8 @@ rowify("
"); row1("User Profile Explorer"); echo "

Community