From 5e178fe1dc44136ec4930185c1674c6a5c504b64 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 14 May 2004 22:57:59 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3381 --- checkin_notes | 3 +++ html/forum/index.php | 2 +- html/forum/subscribe.php | 2 -- html/forum/text_search_action.php | 6 ++---- html/forum/text_search_form.php | 2 -- html/forum/user_posts.php | 1 - html/inc/gallery.inc | 7 +++---- html/inc/host.inc | 3 +-- html/inc/profile.inc | 6 +----- html/inc/team.inc | 7 ++----- html/inc/user.inc | 8 +++++++- html/inc/util.inc | 4 ++-- html/user/download_network.php | 1 - html/user/hosts_user.php | 4 ++-- html/user/index.php | 1 + html/user/top_hosts.php | 2 +- lib/util.C | 2 +- 17 files changed, 27 insertions(+), 34 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5d089ad5b7..62c586b12a 100755 --- a/checkin_notes +++ b/checkin_notes @@ -12290,3 +12290,6 @@ Karl 2004-04-12 tools/ update_versions + +David May 14 2004 + - various web fixes diff --git a/html/forum/index.php b/html/forum/index.php index bbe71c4234..5bb84e330e 100644 --- a/html/forum/index.php +++ b/html/forum/index.php @@ -11,7 +11,7 @@ show_forum_title(NULL, NULL, false); echo "

If you have a question or problem, please use the Questions/problems - are instead of the Message boards.

+ area instead of the Message boards.

Do a keyword search of messages. diff --git a/html/forum/subscribe.php b/html/forum/subscribe.php index 52f6a9f42d..7204a77482 100644 --- a/html/forum/subscribe.php +++ b/html/forum/subscribe.php @@ -2,8 +2,6 @@ require_once('../inc/subscribe.inc'); require_once('../inc/util.inc'); -db_init(); - $action = $_GET['action']; $thread = $_GET['thread']; diff --git a/html/forum/text_search_action.php b/html/forum/text_search_action.php index 5da2a0affe..e8e39722ba 100644 --- a/html/forum/text_search_action.php +++ b/html/forum/text_search_action.php @@ -8,10 +8,8 @@ $offset = $_GET['offset']; if (!$offset) $offset=0; $count = 10; -page_head("Search results"); - if ($_GET['titles']) { - echo "

Titles containing '$search_string'

\n"; + page_head("Titles containing '$search_string'"); $q = "select * from thread where match(title) against ('$search_string') limit $offset,$count"; $result = mysql_query($q); echo ""; @@ -29,7 +27,7 @@ if ($_GET['titles']) { } if ($_GET['bodies']) { - echo "

Messages containing '$search_string'

\n"; + page_head("Messages containing '$search_string'"); $q = "select * from post where match(content) against ('$search_string') limit $offset,$count"; $result = mysql_query($q); echo "
"; diff --git a/html/forum/text_search_form.php b/html/forum/text_search_form.php index bfcf510d90..53623c5c7f 100644 --- a/html/forum/text_search_form.php +++ b/html/forum/text_search_form.php @@ -6,8 +6,6 @@ require_once("../inc/util.inc"); page_head("Message search"); echo " -

Message search

- This page lets you search for messages containing particular words. All Message boards and Question/answer areas will be searched.

diff --git a/html/forum/user_posts.php b/html/forum/user_posts.php index 74b193479a..5b3fb3dc8f 100644 --- a/html/forum/user_posts.php +++ b/html/forum/user_posts.php @@ -11,7 +11,6 @@ $count = 10; $user = lookup_user_id($userid); page_head("Posts by $user->name"); -echo "

Posts by $user->name

\n"; $result = mysql_query("select * from post where user=$userid order by id desc limit $offset,$count"); $n = 0; start_table(); diff --git a/html/inc/gallery.inc b/html/inc/gallery.inc index be52abdba4..f70a3e9623 100644 --- a/html/inc/gallery.inc +++ b/html/inc/gallery.inc @@ -61,7 +61,7 @@ function build_picture_pages($width, $height) { page_head("User Picture Gallery: Page $page of $numPages", $descriptor); fwrite($descriptor, - "

User Profile Pictures

Last updated " + "Last updated " . pretty_time_str(time()) . "\n

Browse the user profiles by picture. Only user profiles with pictures are listed here." @@ -230,9 +230,8 @@ function build_profile_pages($members, $pageHead, $pageTitle, $rowsPerPage, $col $descriptor = fopen($filename, "w"); $head = $pageHead . ": Page $page of $numPages"; - page_head($pageHead, $descriptor); + page_head($pageTitle, $descriptor); - fwrite($descriptor, "

$pageTitle

\n"); fwrite($descriptor, "Last updated " . pretty_time_str(time()) . "

\n"); $offset = (($page-1) * $rowsPerPage * $colsPerPage); @@ -254,7 +253,7 @@ function build_country_summary_page($countryMembers) { $descriptor = fopen($filename, "w"); page_head("User Profiles by Country", $descriptor); - fwrite($descriptor, "

User Profiles by Country

Last updated " . pretty_time_str(time()) . "

"); + fwrite($descriptor, "Last updated " . pretty_time_str(time()) . "

"); fwrite($descriptor, "

\n"); fwrite($descriptor, "\n"); diff --git a/html/inc/host.inc b/html/inc/host.inc index 540f0c7db9..44e63cfe9a 100644 --- a/html/inc/host.inc +++ b/html/inc/host.inc @@ -115,9 +115,8 @@ function show_host($host, $private, $ipprivate) { } -function host_table_start($title, $private, $show_owner) { +function host_table_start($private, $show_owner) { start_table(); - row1($title, 7); echo ""; echo "\n"; if ($private) { diff --git a/html/inc/profile.inc b/html/inc/profile.inc index aa1f891538..4b1ed74966 100644 --- a/html/inc/profile.inc +++ b/html/inc/profile.inc @@ -331,7 +331,7 @@ function show_result_page() { page_head("Profile Saved"); echo " -

Congratulations!

+

Congratulations!

Your profile was successfully entered into our database.

id>View your profile
"; @@ -470,10 +470,6 @@ function show_profile($userid, $verify_mode=false) { } function show_profile_summary($user, $profile_info, $can_edit, $verify_mode) { - echo " -

Profile: $user->name

- "; - if (!$can_edit && !$verify_mode) { show_view_buttons($user->id); } diff --git a/html/inc/team.inc b/html/inc/team.inc index ce00d9caf4..999839168e 100644 --- a/html/inc/team.inc +++ b/html/inc/team.inc @@ -6,14 +6,11 @@ require_once("../inc/sanitize_html.inc"); require_once("../inc/countries.inc"); function display_team_page($team, $user) { - page_head("$team->name"); - echo "

Team page for "; if (strlen($team->name_html)) { - echo "$team->name_html"; + page_head("$team->name_html"); } else { - echo $team->name; + page_head("$team->name"); } - echo "

"; if ($user->teamid == $team->id) { echo "You currently belong to this team
CountryProfiles
Host ID
Click for more info
"; } diff --git a/html/user/download_network.php b/html/user/download_network.php index 245880d5ba..ed0b769029 100644 --- a/html/user/download_network.php +++ b/html/user/download_network.php @@ -8,7 +8,6 @@ init_session(); page_head("Download BOINC add-on software"); echo " -

Download BOINC add-on software

You can download applications from any of the following categories. Please note that these applications are not endorsed by ".PROJECT." and that you use them at your own risk:

\n "; diff --git a/html/user/hosts_user.php b/html/user/hosts_user.php index 7f959df86f..5976568b15 100644 --- a/html/user/hosts_user.php +++ b/html/user/hosts_user.php @@ -14,7 +14,7 @@ mysql_free_result($result); if ($user->show_hosts) { page_head("Computers belonging to $user->name"); - host_table_start("Computers belonging to $user->name", false, false); + host_table_start(false, false); } else { echo "Hidden\n"; exit(); @@ -24,7 +24,7 @@ $user = get_logged_in_user(); $userid = $user->id; page_head("Your computers"); - host_table_start("Your computers", true, false); + host_table_start(true, false); $private = true; } $i = 1; diff --git a/html/user/index.php b/html/user/index.php index 1a8a5ff232..9c2ad4dde0 100644 --- a/html/user/index.php +++ b/html/user/index.php @@ -37,6 +37,7 @@ if (project_is_stopped()) {

  • Your account - view stats, modify preferences
  • Teams - create or join a team
  • Download BOINC +
  • Add-ons

    Community