diff --git a/www/approveproject_form.php3 b/www/approveproject_form.php3 index 60df091511ef979a585bfb833f78164d32bfd376..b99bdcb24f9124bce926da855ec23fe0b876e887 100755 --- a/www/approveproject_form.php3 +++ b/www/approveproject_form.php3 @@ -76,6 +76,7 @@ $proj_expires = $row[expires]; $proj_name = $row[name]; $proj_URL = $row[URL]; $proj_head_uid = $row[head_uid]; +$proj_members = $row[num_members]; $proj_pcs = $row[num_pcs]; $proj_sharks = $row[num_sharks]; $proj_why = $row[why]; @@ -105,6 +106,11 @@ echo " $proj_URL \n"; +echo " + #Project Members: + $proj_members + \n"; + echo " #PCs: $proj_pcs diff --git a/www/newproject.php3 b/www/newproject.php3 index 9bcb24b2e8a9a45cdc363a0211166c3cc4f35221..fb7bb997b7f8788b46f3ec54a6cb9672b7cf83c3 100755 --- a/www/newproject.php3 +++ b/www/newproject.php3 @@ -28,6 +28,10 @@ if (!isset($proj_name) || strcmp($proj_name, "UCB Overlay Multicast") == 0) { $formerror = "Long Name"; } +if (!isset($proj_members) || + strcmp($proj_members, "") == 0) { + $formerror = "Estimated #of Project Members"; +} if (!isset($proj_pcs) || strcmp($proj_pcs, "") == 0) { $formerror = "Estimated #of PCs"; @@ -215,10 +219,10 @@ $unix_gid++; $newproj_command = "INSERT INTO projects ". "(pid, created, expires, name, URL, head_uid, ". - " num_pcs, num_sharks, why, unix_gid)". + " num_members, num_pcs, num_sharks, why, unix_gid)". "VALUES ('$pid', now(), '$proj_expires','$proj_name','$proj_URL',". - "'$proj_head_uid', '$proj_pcs', '$proj_sharks', '$proj_why', ". - "'$unix_gid')"; + "'$proj_head_uid', '$proj_members', '$proj_pcs', '$proj_sharks', ". + "'$proj_why', '$unix_gid')"; $newproj_result = mysql_db_query($TBDBNAME, $newproj_command); if (! $newproj_result) { $err = mysql_error(); @@ -245,6 +249,7 @@ mail($TBMAIL_APPROVAL, "Affiliation: $usr_affil\n". "Address: $usr_addr\n". "Phone: $usr_phones\n". + "Members: $proj_members\n". "PCs: $proj_pcs\n". "Sharks: $proj_sharks\n". "Reasons:\n$proj_why\n\n". diff --git a/www/newproject_form.php3 b/www/newproject_form.php3 index 0608b59ae2f41ecc998eb0edb5df9faaac2c3421..a444a7720eb1f04d254d0faa05f9faae38de7c18 100644 --- a/www/newproject_form.php3 +++ b/www/newproject_form.php3 @@ -235,8 +235,13 @@ echo " \n"; # -# Nodes and PCs +# Nodes and PCs and Users # +echo " + *Estimated #of Project Members: + + \n"; + echo " *Estimated #of PCs: diff --git a/www/showproject.php3 b/www/showproject.php3 index 4006442c1ba76f7ad59c9e387d44c4def94e2bce..b6d175b1ab55109082ad200d98de3b5848df189d 100644 --- a/www/showproject.php3 +++ b/www/showproject.php3 @@ -61,6 +61,7 @@ $proj_expires = $row[expires]; $proj_name = $row[name]; $proj_URL = $row[URL]; $proj_head_uid = $row[head_uid]; +$proj_members = $row[num_members]; $proj_pcs = $row[num_pcs]; $proj_sharks = $row[num_sharks]; $proj_why = $row[why]; @@ -90,6 +91,11 @@ echo " $proj_URL \n"; +echo " + #Project Members: + $proj_members + \n"; + echo " #PCs: $proj_pcs