Skip to content

Commit

Permalink
Issue GENI-NSF#164: Stop creating email addresses for tutorial accoun…
Browse files Browse the repository at this point in the history
…ts. Users will need to self-assert their address at the Portal.
  • Loading branch information
ahelsing committed Jul 21, 2016
1 parent 4234feb commit e1955b4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

## Changes

* None
* Tutorial accounts no longer get an email address. Users
will need to self-assert their address at the Portal.
([#164](https://github.com/GENI-NSF/geni-ar/issues/164))

## Installation Notes

Expand Down
13 changes: 12 additions & 1 deletion etc/tutorial-email.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,15 @@ They are:

where NN is the tutorial user number, from 01-<numaccounts>.

Each user has the e-mail address <username_prefix>[email protected], which forwards to gpo-ops and to you.
Each user will need to self-assert their email address when they first
log in to the GENI Portal. After supplying their address, each user
will receive an email to confirm their address before they can use the
Portal.

Users should also modify their profile to provide their
correct full name. After logging in to the Portal, select the menu
under their account name, and pick 'Profile'. Then select 'Modify user
supplied account details'. On that page, they should supply their full
name, and preferably their school or institution name under the final
"Intended use of GENI" field.

7 changes: 4 additions & 3 deletions protected/tutorial_actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

$query_vars[] = 'first_name';
$query_vars[] = 'last_name';
$query_vars[] = 'email';
//$query_vars[] = 'email';
$query_vars[] = 'username_requested';
$query_vars[] = 'phone';
$query_vars[] = 'password_hash';
Expand Down Expand Up @@ -112,7 +112,8 @@

$conn = db_conn();

$values = array($desc,$lastname,$email,$uid,$org_phone,$pw_hash,"BBN","Tutorial User",$desc,AR_STATE::APPROVED);
// $values = array($desc,$lastname,$email,$uid,$org_phone,$pw_hash,"BBN","Tutorial User",$desc,AR_STATE::APPROVED);
$values = array($desc,$lastname,$uid,$org_phone,$pw_hash,"BBN","Tutorial User",$desc,AR_STATE::APPROVED);
$query_vals = array();
foreach ($values as $val) {
$query_vals[] = $conn->quote($val,"text");
Expand Down Expand Up @@ -156,7 +157,7 @@
$attrs['cn'] = $fullname;
$attrs['displayName'] = $fullname;
$attrs['userPassword'] = $pw_hash;
$attrs['mail'] = $email;
// $attrs['mail'] = $email;
$attrs['eduPersonAffiliation'][] = "member";
$attrs['eduPersonAffiliation'] []= "staff";
$attrs['telephoneNumber'] = $org_phone;
Expand Down

0 comments on commit e1955b4

Please sign in to comment.