From 39bc2da38d195007df3c1cf6ae9e053ae2b2035c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 22 Aug 2003 05:36:25 +0000
Subject: [PATCH] admin account creation

svn path=/trunk/boinc/; revision=2171
---
 checkin_notes                             | 11 +++
 html/ops/create_account_action.php        | 43 +++++++++++
 html/ops/create_account_form.php          | 18 +++++
 html/ops/index.php                        |  6 +-
 html/ops/util_ops.inc                     | 93 +----------------------
 html/user/clone.php                       |  1 +
 html/user/confirm_email_change.php        |  1 +
 html/user/create_account_action.php       |  1 +
 html/user/create_account_form.php         |  1 +
 html/user/db.inc                          |  4 +-
 html/user/edit_email_action.php           |  2 +-
 html/user/edit_email_form.php             |  1 +
 html/user/edit_user_info_action.php       |  4 +-
 html/user/edit_user_info_form.php         |  1 +
 html/user/host_edit_action.php            |  1 +
 html/user/host_edit_form.php              |  1 +
 html/user/hosts_user.php                  |  1 +
 html/user/index.php                       |  2 +-
 html/user/info.php                        |  1 +
 html/user/login_action.php                |  2 +-
 html/user/login_form.php                  |  1 +
 html/user/mail_passwd.php                 |  2 +-
 html/user/profile.inc                     |  1 +
 html/user/profile_menu.php                |  1 +
 html/user/results_host.php                |  1 +
 html/user/show_host_detail.php            |  2 +-
 html/user/show_user.php                   |  2 +-
 html/user/team_create_action.php          |  2 +-
 html/user/team_create_form.php            |  1 +
 html/user/team_display.php                |  2 +-
 html/user/team_edit_action.php            |  2 +-
 html/user/team_edit_form.php              |  1 +
 html/user/team_email_list.php             |  2 +-
 html/user/team_join_action.php            |  2 +-
 html/user/team_join_form.php              |  1 +
 html/user/team_lookup.php                 |  2 +-
 html/user/team_quit_action.php            |  2 +-
 html/user/team_quit_form.php              |  1 +
 html/user/team_remove_inactive_action.php |  2 +-
 html/user/team_remove_inactive_form.php   |  1 +
 html/user/top_hosts.php                   |  1 +
 html/user/top_teams.php                   |  1 +
 html/user/top_users.php                   |  1 +
 html/user/totals.php                      |  2 +-
 html/user/util.inc                        |  3 +-
 html/user/workunit.php                    |  1 +
 46 files changed, 123 insertions(+), 112 deletions(-)
 create mode 100644 html/ops/create_account_action.php
 create mode 100644 html/ops/create_account_form.php

diff --git a/checkin_notes b/checkin_notes
index f6e97ac813..8ae965802b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5899,3 +5899,14 @@ Karl 2003/08/21
         boinc_api.C
         boinc_api.h
         windows_opengl.C
+
+David  Aug 21 2003
+    - added administrative function for adding accounts
+      (even if account creation is disabled in config)
+    - html_ops can now refer to project-specific stuff (e.g. PROJECT)
+    - removed include of db.inc in html_user/util.inc.
+      This lets you use util.inc from html_ops
+
+    html_ops/
+        create_account_form.php (new)
+        create_acction_action.php (new)
diff --git a/html/ops/create_account_action.php b/html/ops/create_account_action.php
new file mode 100644
index 0000000000..9d16f374c9
--- /dev/null
+++ b/html/ops/create_account_action.php
@@ -0,0 +1,43 @@
+<?
+    require_once("util_ops.inc");
+    require_once("../html_user/util.inc");
+
+    db_init();
+    $email_addr = $_GET["email_addr"];
+
+    // see if email address is taken
+    $query = "select * from user where email_addr='$email_addr'";
+    $result = mysql_query($query);
+    $user = mysql_fetch_object($result);
+    if ($user) {
+        echo "That email address ($email_addr) is taken";
+        exit();
+    }
+    $authenticator = random_string();
+    $munged_email_addr = munge_email_addr($email_addr, $authenticator);
+    $user_name = $_GET["user_name"];
+    $t = time();
+    $query = "insert into user (create_time, email_addr, name, authenticator) values ($t, '$munged_email_addr', '$user_name', '$authenticator')";
+    $result = mysql_query($query);
+    if (!$result) {
+        echo "couldn't create account:".mysql_error();
+        exit();
+    }
+    
+    $url = URL_BASE."/account_created.php?email_addr=".urlencode($email_addr);
+    mail($email_addr, PROJECT. " account created",
+"This email confirms the creation of your ".PROJECT." account.
+
+".PROJECT." URL:         ".MASTER_URL."
+
+Your account key:          $authenticator\n
+
+Please save this email.
+You will need your account key to log in to the ".PROJECT." web site.
+
+To finish registration, go to
+$url
+"
+);
+
+?>
diff --git a/html/ops/create_account_form.php b/html/ops/create_account_form.php
new file mode 100644
index 0000000000..a867b6c9f5
--- /dev/null
+++ b/html/ops/create_account_form.php
@@ -0,0 +1,18 @@
+<?
+// use this to create accounts while regular account creation is disabled
+
+require_once("util_ops.inc");
+
+echo "
+    <h2>Create ".PROJECT." account</h2>
+    <form action=create_account_action.php>
+";
+start_table();
+row2("Name", "<input size=32 name=user_name>");
+row2("Email address", "<input size=32 name=email_addr>");
+row2("", "<input type=submit value=OK>");
+echo "
+    </form>
+";
+
+?>
diff --git a/html/ops/index.php b/html/ops/index.php
index 48b320f125..52270620f3 100644
--- a/html/ops/index.php
+++ b/html/ops/index.php
@@ -1,13 +1,14 @@
 <?php
 
+require_once("db_ops.inc");
 require_once("util_ops.inc");
 
 $cgi_url = parse_config("<cgi_url>");
 
 $w = 7*86400;
 echo "
-    <title>BOINC Project Management</title>
-    <h2>BOINC Project Management</h2>
+    <title>BOINC Project Management for ".PROJECT."</title>
+    <h2>BOINC Project Management for ".PROJECT."</h2>
     <p>
     Browse database:
     <ul> 
@@ -38,6 +39,7 @@ echo "
     <a href=$cgi_url/stripchart.cgi>Stripcharts</a> |
     <a href=show_log.php>Show/Grep all logs</a> |
     <a href=show_log.php?f=mysql*.log&l=-20>Tail MySQL logs</a>
+    <br><a href=create_account_form.php>Create account</a>
 ";
 
 // TODO: Add functionality to list the number of recommends / rejects received
diff --git a/html/ops/util_ops.inc b/html/ops/util_ops.inc
index 67b5a919e0..02b996aee3 100644
--- a/html/ops/util_ops.inc
+++ b/html/ops/util_ops.inc
@@ -1,6 +1,8 @@
 <?php
 
 require_once("db_ops.inc");
+require_once("../html_user/util.inc");
+require_once("../html_user/project_specific/project.inc");
 
 define("EMAIL_EXISTS", -1);
 define("EMAIL_UPDATED", 1);
@@ -20,58 +22,16 @@ define("TITLE_COLOR", " bgcolor=000000 ");
 define("TITLE_FONT", " <font color=ffffff> ");
 define("BODY_COLOR", " bgcolor=ffffff ");
 define("NOLOGIN", "Not logged in. Click <a href=login.php>here</a> to login.\n");
-define("BADPASS", "The password you entered is incorrect. Click the <b>Back</b> button on your browser to re-enter your password or try again later.");
-define("DIFFPASS", "You've typed two different passwords. Click the <b>Back</b> button on your browser to edit your information, making sure you type the same password in both password fields.");
-define("PROJECT", "Sample project");
 
-function get_user_from_cookie() {
-    $auth = "";
-    $c = getenv("HTTP_COOKIE");
-    $d = str_replace("; ", "&", $c);
-    parse_str($d);
-    if ($auth) return lookup_user_auth($auth);
-    return NULL;
-}
-
-function show_login($user) {
-    if ($user) {
-        printf("Logged in as %s.\n", $user->name);
-        printf("<br><a href=login.php>Log in as someone else.</a>\n");
-    } else {
-	echo NOLOGIN;
-    }
-}
-
-function page_head($title) {
+function admin_page_head($title) {
     echo "<head><title>$title</title><body " . BODY_COLOR . ">\n";
     echo TABLE . "<tr " . TITLE_COLOR . "><td>" . TITLE_FONT . "<font size=6><b><a href=index.php>".PROJECT.":</a>  $title</b></font></td></tr></table>\n";
 }
 
-function page_tail() {
+function admin_page_tail() {
     echo "<hr><a href=index.php> Main admin page </a>\n";
 }
 
-function date_str($x) {
-    if ($x == 0) return "---";
-    // return date("g:i A, l M j", $when);
-    return strftime("%Y-%m-%d", $x);
-}
-
-function time_str($x) {
-    if ($x == 0) return "---";
-    // return strftime("%T %b %e, %Y", $x);
-    return strftime("%Y-%m-%d %H:%M:%S", $x);
-}
-
-function start_table() {
-    // echo "<table border=2 cellpadding=4 width=700>\n";
-    echo "<table border=2 cellpadding=4 width=100%>\n";
-}
-
-function end_table() {
-    echo "</table>\n";
-}
-
 function print_checkbox($text,$name,$checked) {
     echo "<input type=checkbox name=$name"
         . (strlen($checked) ? " checked" : "") . ">"
@@ -95,58 +55,13 @@ function row($x, $y) {
     echo "<tr>\n<td width=30% colspan=2 valign=top align=right>$x</td>\n<td colspan=2>$y</td>\n</tr>\n";
 }
 
-function row2($x, $y) {
-    echo "<tr><td align=right>$x</td><td>$y</td></tr>\n";
-}
 function c_row2($color, $x, $y) {
     echo "<tr bgcolor=$color><td align=right>$x</td><td>$y</td></tr>\n";
 }
 
-function row3($x, $y, $z) {
-    echo "<tr><td width=30% valign=top align=right>$x</td><td>$y</td><td>$z</td></tr>\n";
-}
-
 function row4($xx, $xy, $yx, $yy) {
     echo "<tr><td width=25% valign=top align=right>$xx</td><td width=25%>$xy</td>"
         . "<td width=25% align=right>$yx</td><td width=%25>$yy</td></tr>\n";
 }
 
-function random_string() {
-    return md5(uniqid(rand()));
-}
-
-function print_country_select() {
-    PassThru("country_select");
-}
-
-// look for an element in some XML text
-//
-function parse_element($xml, $tag) {
-    $element = null;
-    $x = strstr($xml, $tag);
-    if ($x) {
-        $y = substr($x, strlen($tag));
-        $n = strpos($y, "<");
-        if ($n) {
-            $element = substr($y, 0, $n);
-        }
-    }
-    return $element;
-}
-
-// look for a particular element in the config.xml file
-//
-function parse_config($tag) {
-    $element = null;
-    $fp = fopen("../config.xml", "r");
-    while (1) {
-        $buf = fgets($fp, 1024);
-        if ($buf == null) break;
-        $element = parse_element($buf, $tag);
-        if ($element) break;
-    }
-    fclose($fp);
-    return $element;
-}
-
 ?>
diff --git a/html/user/clone.php b/html/user/clone.php
index 07d6fe14f8..fc495e6410 100644
--- a/html/user/clone.php
+++ b/html/user/clone.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
 
     db_init();
diff --git a/html/user/confirm_email_change.php b/html/user/confirm_email_change.php
index b20bb93bf5..f35a9d3191 100644
--- a/html/user/confirm_email_change.php
+++ b/html/user/confirm_email_change.php
@@ -1,5 +1,6 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
 
     db_init();
diff --git a/html/user/create_account_action.php b/html/user/create_account_action.php
index 2fbb906c98..410494cdc6 100644
--- a/html/user/create_account_action.php
+++ b/html/user/create_account_action.php
@@ -1,5 +1,6 @@
 <?php
 
+include_once("db.inc");
 include_once("util.inc");
 
 function show_error($str) {
diff --git a/html/user/create_account_form.php b/html/user/create_account_form.php
index 8222da1023..16a8c44394 100644
--- a/html/user/create_account_form.php
+++ b/html/user/create_account_form.php
@@ -1,4 +1,5 @@
 <?php
+require_once('db.inc');
 require_once('util.inc');
 db_init();
 page_head('New Account');
diff --git a/html/user/db.inc b/html/user/db.inc
index 0c17fd0681..322fe1a01d 100644
--- a/html/user/db.inc
+++ b/html/user/db.inc
@@ -13,8 +13,8 @@ function db_init($pathMod='') {
     }
     $db_name = parse_config("<db_name>", $pathMod);
     if(!mysql_select_db($db_name)) {
-	    echo "Unable to select database - please try again later";
-	    exit();
+        echo "Unable to select database - please try again later";
+        exit();
     }
 
     return 0;
diff --git a/html/user/edit_email_action.php b/html/user/edit_email_action.php
index 1bcab134f4..cd878a58ea 100644
--- a/html/user/edit_email_action.php
+++ b/html/user/edit_email_action.php
@@ -1,8 +1,8 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
-    require_once("db.inc");
 
 function send_verify_email($user, $email_addr, $key) {
     mail(
diff --git a/html/user/edit_email_form.php b/html/user/edit_email_form.php
index bd3cb3f7a7..e68cbd21c9 100644
--- a/html/user/edit_email_form.php
+++ b/html/user/edit_email_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 
 db_init();
diff --git a/html/user/edit_user_info_action.php b/html/user/edit_user_info_action.php
index ba3fb6ff4c..50bf623c48 100644
--- a/html/user/edit_user_info_action.php
+++ b/html/user/edit_user_info_action.php
@@ -1,7 +1,7 @@
 <?php
-    require_once("util.inc");
-    require_once("user.inc");
     require_once("db.inc");
+    require_once("user.inc");
+    require_once("util.inc");
 
     db_init();
     $user = get_logged_in_user();
diff --git a/html/user/edit_user_info_form.php b/html/user/edit_user_info_form.php
index 5942e59736..685e2d61d1 100644
--- a/html/user/edit_user_info_form.php
+++ b/html/user/edit_user_info_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 
 db_init();
diff --git a/html/user/host_edit_action.php b/html/user/host_edit_action.php
index db3ee67bd3..53bf44d6ba 100644
--- a/html/user/host_edit_action.php
+++ b/html/user/host_edit_action.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("host.inc");
 
diff --git a/html/user/host_edit_form.php b/html/user/host_edit_form.php
index 2722dd3578..44c3a830e6 100644
--- a/html/user/host_edit_form.php
+++ b/html/user/host_edit_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("host.inc");
 
diff --git a/html/user/hosts_user.php b/html/user/hosts_user.php
index 2c46a34e28..b8c81724b9 100644
--- a/html/user/hosts_user.php
+++ b/html/user/hosts_user.php
@@ -2,6 +2,7 @@
     // show all the hosts for a user.
     // if $userid is absent, show hosts of logged-in user
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("host.inc");
 
diff --git a/html/user/index.php b/html/user/index.php
index c258cc79f5..8e9ab88b40 100644
--- a/html/user/index.php
+++ b/html/user/index.php
@@ -1,6 +1,6 @@
 <?php
-    require_once("util.inc");
     require_once("db.inc");
+    require_once("util.inc");
     require_once("project_specific/project.inc");
 
     init_session();
diff --git a/html/user/info.php b/html/user/info.php
index 2da573cd4e..e90e5c58cb 100644
--- a/html/user/info.php
+++ b/html/user/info.php
@@ -1,4 +1,5 @@
 <?php
+require_once('db.inc');
 require_once('util.inc');
 db_init();
 page_head('Rules and Policies');
diff --git a/html/user/login_action.php b/html/user/login_action.php
index 9ed7f0846a..33c569fbb6 100644
--- a/html/user/login_action.php
+++ b/html/user/login_action.php
@@ -1,7 +1,7 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
-    require_once("db.inc");
 
     init_session();
     db_init();
diff --git a/html/user/login_form.php b/html/user/login_form.php
index 57c07538f3..53aec0feb1 100644
--- a/html/user/login_form.php
+++ b/html/user/login_form.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
 
     $next_url = $_GET["next_url"];
diff --git a/html/user/mail_passwd.php b/html/user/mail_passwd.php
index 2b1f710689..bce4b47c21 100644
--- a/html/user/mail_passwd.php
+++ b/html/user/mail_passwd.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once("util.inc");
 require_once("db.inc");
+require_once("util.inc");
 
 db_init();
 
diff --git a/html/user/profile.inc b/html/user/profile.inc
index 2d5856f76a..1ca23c6f0b 100644
--- a/html/user/profile.inc
+++ b/html/user/profile.inc
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 
 // TODO: Determine if we can always assume these will be the same number.
diff --git a/html/user/profile_menu.php b/html/user/profile_menu.php
index aa78151345..f9d0a3c89e 100644
--- a/html/user/profile_menu.php
+++ b/html/user/profile_menu.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("project_specific/project.inc");
 require_once("profile.inc");
diff --git a/html/user/results_host.php b/html/user/results_host.php
index a301c9c699..882f201069 100644
--- a/html/user/results_host.php
+++ b/html/user/results_host.php
@@ -1,6 +1,7 @@
 <?php
     // show recent results for a host
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("result.inc");
 
diff --git a/html/user/show_host_detail.php b/html/user/show_host_detail.php
index af7f1729d9..2679badfd8 100644
--- a/html/user/show_host_detail.php
+++ b/html/user/show_host_detail.php
@@ -1,6 +1,6 @@
 <?php
-    require_once("util.inc");
     require_once("db.inc");
+    require_once("util.inc");
     require_once("user.inc");
     require_once("host.inc");
 
diff --git a/html/user/show_user.php b/html/user/show_user.php
index 294fac06a7..61892e1650 100644
--- a/html/user/show_user.php
+++ b/html/user/show_user.php
@@ -1,7 +1,7 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
-    require_once("db.inc");
 
     init_session();
     db_init();
diff --git a/html/user/team_create_action.php b/html/user/team_create_action.php
index b8e9253efa..0d79069841 100644
--- a/html/user/team_create_action.php
+++ b/html/user/team_create_action.php
@@ -1,8 +1,8 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
 
diff --git a/html/user/team_create_form.php b/html/user/team_create_form.php
index 40000c2c03..2ed5650d18 100644
--- a/html/user/team_create_form.php
+++ b/html/user/team_create_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
 
diff --git a/html/user/team_display.php b/html/user/team_display.php
index 090179c16b..5ab5312e79 100644
--- a/html/user/team_display.php
+++ b/html/user/team_display.php
@@ -1,8 +1,8 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
-require_once("db.inc");
 
 db_init();
 $user = get_logged_in_user(false);
diff --git a/html/user/team_edit_action.php b/html/user/team_edit_action.php
index 87cd5d7972..c8294965fe 100644
--- a/html/user/team_edit_action.php
+++ b/html/user/team_edit_action.php
@@ -1,8 +1,8 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
     $user = get_logged_in_user();
diff --git a/html/user/team_edit_form.php b/html/user/team_edit_form.php
index f47fca25d5..66162558ad 100644
--- a/html/user/team_edit_form.php
+++ b/html/user/team_edit_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
 
diff --git a/html/user/team_email_list.php b/html/user/team_email_list.php
index 7458677193..e862fec794 100644
--- a/html/user/team_email_list.php
+++ b/html/user/team_email_list.php
@@ -1,8 +1,8 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
-require_once("db.inc");
 
     db_init();
 
diff --git a/html/user/team_join_action.php b/html/user/team_join_action.php
index 8181c47593..b73b510f40 100644
--- a/html/user/team_join_action.php
+++ b/html/user/team_join_action.php
@@ -1,8 +1,8 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
     $user = get_logged_in_user();
diff --git a/html/user/team_join_form.php b/html/user/team_join_form.php
index 6d2a5e42d7..87e708c90b 100644
--- a/html/user/team_join_form.php
+++ b/html/user/team_join_form.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
 
diff --git a/html/user/team_lookup.php b/html/user/team_lookup.php
index cb5fa8b25d..34f5493af9 100644
--- a/html/user/team_lookup.php
+++ b/html/user/team_lookup.php
@@ -1,8 +1,8 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
     init_session();
diff --git a/html/user/team_quit_action.php b/html/user/team_quit_action.php
index 5e6096061c..e7bcb4a56d 100644
--- a/html/user/team_quit_action.php
+++ b/html/user/team_quit_action.php
@@ -1,7 +1,7 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
     $user = get_logged_in_user();
diff --git a/html/user/team_quit_form.php b/html/user/team_quit_form.php
index 0660999436..d0711bf687 100644
--- a/html/user/team_quit_form.php
+++ b/html/user/team_quit_form.php
@@ -1,5 +1,6 @@
 <?php {
 
+require_once("db.inc");
 require_once("util.inc");
 require_once("team.inc");
 
diff --git a/html/user/team_remove_inactive_action.php b/html/user/team_remove_inactive_action.php
index 9dde6cea72..2582216c05 100644
--- a/html/user/team_remove_inactive_action.php
+++ b/html/user/team_remove_inactive_action.php
@@ -1,8 +1,8 @@
 <?php {
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
-    require_once("db.inc");
 
     db_init();
     $user = get_logged_in_user();
diff --git a/html/user/team_remove_inactive_form.php b/html/user/team_remove_inactive_form.php
index 12cd2206c3..b0e1c5f664 100644
--- a/html/user/team_remove_inactive_form.php
+++ b/html/user/team_remove_inactive_form.php
@@ -1,5 +1,6 @@
 <?php
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("team.inc");
 
diff --git a/html/user/top_hosts.php b/html/user/top_hosts.php
index 3966960bba..6b3d662015 100644
--- a/html/user/top_hosts.php
+++ b/html/user/top_hosts.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("host.inc");
 
diff --git a/html/user/top_teams.php b/html/user/top_teams.php
index 74c439c77d..d9968ae75d 100644
--- a/html/user/top_teams.php
+++ b/html/user/top_teams.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
     require_once("team.inc");
diff --git a/html/user/top_users.php b/html/user/top_users.php
index 340bdfb970..7db0f651cb 100644
--- a/html/user/top_users.php
+++ b/html/user/top_users.php
@@ -1,4 +1,5 @@
 <?php
+    require_once("db.inc");
     require_once("util.inc");
     require_once("user.inc");
 
diff --git a/html/user/totals.php b/html/user/totals.php
index 8f1f91cda2..60826a6360 100644
--- a/html/user/totals.php
+++ b/html/user/totals.php
@@ -1,6 +1,6 @@
 <?php
-    require_once("util.inc");
     require_once("db.inc");
+    require_once("util.inc");
 
     init_session();
     db_init();
diff --git a/html/user/util.inc b/html/user/util.inc
index 8e39f327e4..771e7e359a 100644
--- a/html/user/util.inc
+++ b/html/user/util.inc
@@ -1,7 +1,6 @@
 <?php
 
-require_once("db.inc");
-require_once("project_specific/project.inc");
+    require_once("project_specific/project.inc");
 
 // Sends the authenticator to the given email address
 //
diff --git a/html/user/workunit.php b/html/user/workunit.php
index 47fb928bb3..7c51dc1ecc 100644
--- a/html/user/workunit.php
+++ b/html/user/workunit.php
@@ -1,6 +1,7 @@
 <?php
     // show summary of a workunit
 
+    require_once("db.inc");
     require_once("util.inc");
     require_once("result.inc");