' . i18n("What would you like to do?") . '
'; - echo '' . i18n('Create a new conference') . '" . i18n("Please enter the name and type of this conference.") . "
"; + + echo '| " . i18n("Conference Name") . " | "; $val = ''; if(array_key_exists('name', $_SESSION['conference_wizard'])){ $val = ' VALUE="' . $_SESSION['conference_wizard']['name'] . '" '; } - echo ""; + echo " | "; echo " |
| " . i18n("Conference Type") . " | "; echo ""; echo " |
" . i18n("Please select the conference that you wish to copy.") . "
"; - echo "| " . i18n("Conference to Copy:") . " | ";
+ echo ' ';
+ echo " ';
}
function handle_select_conference_step(){
@@ -541,8 +557,6 @@ function handle_select_conference_step(){
function build_enter_name_step(){
echo "
" . i18n("Please enter a name for this conference") . " "; - echo "
"; $errorMessage .= roll($oldConfId, $newConfId, 'award_prizes', "award_awards_id='{$r->id}'", array('award_awards_id' => $award_awards_id)); } @@ -939,7 +950,7 @@ function roll($oldConfId, $newConfId, $table, $where='', $replace=array()){ /* Skip year field */ if($k == 'year') continue; /* Skip conferences_id field */ - if($k == 'year') continue; + if($k == 'conferences_id') continue; $fields[] = $k; } diff --git a/testapi.php b/testapi.php index 0eb83c1..50fa25f 100644 --- a/testapi.php +++ b/testapi.php @@ -119,6 +119,14 @@ Link username to email? User Stuff View the user +Invite a user: + Event ScheduleSchedule Listingdiff --git a/theme/default/sfiab.css b/theme/default/sfiab.css index 5537a0c..3f6ab05 100644 --- a/theme/default/sfiab.css +++ b/theme/default/sfiab.css @@ -756,56 +756,3 @@ ul.conferencenav li a:hover { .scheduleevent_tour { background: #CCFFD5; } -/* -#wizardWrapper{ - display: none; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} -#wizardBackdrop{ - display: none; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: #383878; -} - -#wizard { - background-color: #E0E0FF; - border: 2px solid silver; - width: 40em; - margin-left:auto; - margin-right:auto; - top: 20%; -} - -#wizard h2{ - background-color: #1B86B7; - color: #FFF; - text-align:center; - padding:0; - margin:0; - margin-left:auto; - margin-right:auto; - border-bottom: 1px solid silver; -} - -#wizard p{ - margin: 0.5em; -} - -.wizard_content{ - background-color: #E0E0FF; - margin: 1em; -} - -.wizard_buttons{ - background-color: #1B86B7; - padding: 0.25em; -} -*/ diff --git a/user.inc.php b/user.inc.php index ced39c3..7dc9600 100644 --- a/user.inc.php +++ b/user.inc.php @@ -1113,7 +1113,7 @@ function api_user_auth_required($all_required = array(), $one_required = array() if(!isset($_SESSION['roles']) || !isset($_SESSION['accounts_id'])) { $ret['status']="error"; - $ret['error']="Not logged in"; + $returnval="Not logged in"; return $ret; } @@ -1140,14 +1140,14 @@ function api_user_auth_required($all_required = array(), $one_required = array() if(!$ok) { $ret['status']="error"; - $ret['error']="You do not have permission to access that information"; + $returnval="You do not have permission to access that information"; return $ret; } /* Forward to password expired, remember the target URI */ if($_SESSION['password_expired'] == true) { $ret['status']="error"; - $ret['error']="Your password has expired"; + $returnval="Your password has expired"; return $ret; } $ret['status']="ok"; @@ -1445,5 +1445,88 @@ function user_conference_load($accounts_id,$conferences_id) { //exit; } +// sends an invitation from the user currently logged in, to the new user info passed in the parameters +// returns the created user object on success, error message otherwise +function user_invite($username, $password, $email, $roles_id){ + global $roles, $conference; + $u = user_load($_SESSION['users_id']); + $ok = false; + $returnval = null; + $schoolId = null; + + $roletype = null; + foreach($roles as $t => $r){ + if($r['id'] == $roles_id){ + $roletype = $t; + break; + } + } + + if($roletype === null){ + $returnval = 'Invalid roles_id parameter'; + } + + // find out if this user has the necessary permission to invite another one + if(!is_array($u['roles'])){ + $returnval = 'You do not have a valid role for inviting users'; + } + + if(array_key_exists('admin', $u['roles'])){ + // This is an administrative user; they can invite people to any role they want. + $ok = true; + }else if(array_key_exists('teacher', $u['roles'])){ + // This is a teacher; they can add students. + + // make sure this teacher is tied to a school + if(array_key_exists('schools_id', $u) && $u['schools_id'] > 0){ + if($roletype == 'participant'){ + $ok = true; + $schoolId = $u['schools_id']; + }else{ + $returnval = 'You do not have permission to invite this role'; + } + }else{ + $returnval = 'You must be associated with a school to add participants'; + } + }else{ + $returnval = 'You do not have a role with permission to invite users'; + } + + if($returnval == null){ + // all fields have been passed in, let's go ahead and create the account/user/role + $newAccount = account_create($username, $password); + if(!is_array($newAccount)){ + switch($newAccount){ + case -1: $returnval = "Invalid username"; break; + case -2: $returnval = "Username already in use"; break; + case -3: $returnval = "Invalid password"; break; + } + } + } + + if($returnval == null){ + $newUser = user_create($newAccount['id'], $conference['id']); + if(!is_array($newUser)){ + $returnval = 'Error creating user'; + }else if($schoolId !== null){ + // schoolId is only defined if this is a teacher inviting a student + $newUser['schools_id'] = $schoolId; + user_save($newUser); + } + } + + if($returnval == null){ + $result = user_add_role($newUser, $roletype); + if($result == 'ok'){ + // if we made it here, then it all worked nicely + $returnval = user_load($newUser['id']); + }else{ + $returnval = "Error adding '$roletype' role: $result"; + } + } + + return $returnval; + +} ?> |