From 5f1bf70056c2e1a945d99c0a6b265ccd381e77af Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 4 Feb 2010 16:55:16 +0000 Subject: [PATCH] - web: Drupal stuff svn path=/trunk/boinc/; revision=20418 --- checkin_notes | 13 +++++++++++++ html/drupal/home | 23 +++++++++++++++++++++++ html/drupal/hosts_user | 23 +++++++++++++++++++++++ html/drupal/view_profile | 30 ++++++++++++++++++++++++++++++ html/inc/user.inc | 33 +++++++++++++++++++++++++++++---- html/user/home.php | 24 +----------------------- 6 files changed, 119 insertions(+), 27 deletions(-) create mode 100644 html/drupal/home create mode 100644 html/drupal/hosts_user create mode 100644 html/drupal/view_profile diff --git a/checkin_notes b/checkin_notes index 368730a1b8..58cfc74685 100644 --- a/checkin_notes +++ b/checkin_notes @@ -879,3 +879,16 @@ David 4 Feb 2010 stats_sites.inc user/ hosts_user.php + +David 4 Feb 2010 + - web: Drupal stuff + + html/ + drupal/ + home + view_profile + hosts_user + inc/ + user.inc + user/ + home.php diff --git a/html/drupal/home b/html/drupal/home new file mode 100644 index 0000000000..2ff8959296 --- /dev/null +++ b/html/drupal/home @@ -0,0 +1,23 @@ +No such user\n"; + return; + } + show_account_private($user); +} + +$userid = arg(2); +if (!$userid) $userid = 1; +$userid = 1; + +display_account($userid); + +chdir($original_cwd); +?> diff --git a/html/drupal/hosts_user b/html/drupal/hosts_user new file mode 100644 index 0000000000..f6c605fae6 --- /dev/null +++ b/html/drupal/hosts_user @@ -0,0 +1,23 @@ +No such user\n"; + return; + } + show_user_hosts($userid, true, true, "total_credit", false); +} + +$userid = arg(2); +if (!$userid) $userid = 1; +$userid = 1; + +display_host($userid); + +chdir($original_cwd); +?> diff --git a/html/drupal/view_profile b/html/drupal/view_profile new file mode 100644 index 0000000000..0611bebc9f --- /dev/null +++ b/html/drupal/view_profile @@ -0,0 +1,30 @@ +No such user\n"; + return; + } + $profile = get_profile($userid); + if (!$profile) { + echo "

No profile exists for that user ID $userid

"; + return; + } + echo ""; + show_profile($user, null); + echo "
"; +} + +$userid = arg(2); +if (!$userid) $userid = 1; +$userid = 1; + +display_profile($userid); + +chdir($original_cwd); +?> diff --git a/html/inc/user.inc b/html/inc/user.inc index 9a3d221263..33c0ac7052 100644 --- a/html/inc/user.inc +++ b/html/inc/user.inc @@ -329,10 +329,9 @@ function show_user_summary_public($user) { } } -/** - * Returns a cacheable community links data object - * @param user The users to produce a community links object for - */ +// Returns a cacheable community links data object +// @param user The user to produce a community links object for + function get_community_links_object($user){ $cache_object->post_count = total_posts($user); $cache_object->user = $user; @@ -395,6 +394,32 @@ function show_profile_link($user) { } } +function show_account_private($user) { + start_table_noborder(); + echo ""; + start_table(); + show_user_info_private($user); + if (!no_computing()) { + show_user_stats_private($user); + } + + if (file_exists("../project/donations.inc")) { + require_once("../project/donations.inc"); + if (function_exists('show_user_donations_private')) { + show_user_donations_private($user); + } + } + end_table(); + show_other_projects($user, true); + project_user_page_private($user); + echo ""; + start_table(); + show_community_private($user); + end_table(); + + echo ""; +} + function is_banned_email_addr($email_addr) { global $banned_email_domains; if (isset($banned_email_domains)) { diff --git a/html/user/home.php b/html/user/home.php index c7da96457c..c9691e88ee 100644 --- a/html/user/home.php +++ b/html/user/home.php @@ -49,29 +49,7 @@ if ($init) { page_head(tra("Your account")); } -start_table_noborder(); -echo ""; -start_table(); -show_user_info_private($user); -if (!no_computing()) { - show_user_stats_private($user); -} - -if (file_exists("../project/donations.inc")) { - require_once("../project/donations.inc"); - if (function_exists('show_user_donations_private')) { - show_user_donations_private($user); - } -} -end_table(); -show_other_projects($user, true); -project_user_page_private($user); -echo ""; -start_table(); -show_community_private($user); -end_table(); - -echo ""; +show_account_private($user); page_tail();