From bfb2b63a6830a421a4d92412431d6a5b1f071927 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 8 Nov 2008 08:35:08 +0000 Subject: [PATCH] - the rest of the user invite system, should all be working now. Can be used to invite Volunteers and Judges, or add the volunteer/judge role to an account, or send a reminder email to a specific volutneer/judge that registration is now open and they should login. --- db/db.update.116.sql | 15 ++++++++++ user_invite.php | 66 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/db/db.update.116.sql b/db/db.update.116.sql index b84647df..fe0b186b 100644 --- a/db/db.update.116.sql +++ b/db/db.update.116.sql @@ -23,3 +23,18 @@ ALTER TABLE `users_volunteer` DROP `tmp`; DROP TABLE users_years; +-- Add new judge emails, delete old +INSERT INTO `emails` ( `id` , `val` , `name` , `description` , `from` , `subject` , `body` , `type` ) VALUES + ('', 'judge_recover_password', 'Judges - Recover Password', 'Recover the password for a judge if they submit a ''forgot password'' request', '', 'Password Recovery for [FAIRNAME]', 'We have received a request for the recovery of your password from this email address. Please find your new password below:\n\nJudge Email Address: [EMAIL]\nJudge Password: [PASSWORD] ', 'system'), + ('', 'judge_welcome', 'Judges - Welcome', 'Welcome email sent to a judge after they have registered for the first time. This email includes their temporary password.', '', 'Judge Registration for [FAIRNAME]', 'Thank you for registering as a judge at our fair. Please find your temporary password below. After logging in for the first time you will be prompted to change your password.\n\nJudge Email Address: [EMAIL]\nJudge Password: [PASSWORD]', 'system'), + ('', 'judge_new_invite', 'Judges - New Judge Invitation', 'This is sent to a new judge when they are invited using the invite users administration option.', '', 'Judge Registration for [FAIRNAME]', 'You have been invited to be a judge for the [FAIRNAME]. An account has been created for you to login with and complete your information. You can login to the judge registration site with:\n\nEmail Address: [EMAIL]\nPassword: [PASSWORD]\nYou can change your password once you login.', 'system'), + ('', 'judge_add_invite', 'Judges - Add Judge Invitation', 'This is sent to existing users when they are invited using the invite users administration option.', '', 'Judge Registration for [FAIRNAME]', 'The role of judge for the [FAIRNAME] has been added to your account by a committee member. When you login again, there will be a [Switch Roles] link in the upper right hand area of the page. Clicking on [Switch Roles] will let you switch between being a Judge and your other roles without needing to logout.\n', 'system'); + ('', 'judge_activate_reminder', 'Judges - Activation Reminder', 'This is sent to existing judges who have not yet activated their account for the current fair year.', '', 'Judge Registration for [FAIRNAME]', 'This message is to let you know that Judge registration for the [FAIRNAME] is now open. If you would like to participate in the fair this year please log in to the registration site using your email address ([EMAIL]) an\n', 'system'); + ('', 'volunteer_activate_reminder', 'Volunteer Registration - Activation Reminder', 'This is sent to existing volunteers who have not yet activated their account for the current fair year.', '', 'Volunteer Registration for [FAIRNAME]', 'This message is to let you know that Volunteer registration for the [FAIRNAME] is now open. If you would like to participate in the fair this year please log in to the registration site using your email address ([EMAIL]).\n', 'system'); + +DELETE FROM `emails` WHERE `val`='new_judge_invite'; +DELETE FROM `emails` WHERE `val`='register_judges_resend_password'; + +-- Fix the names of these emails +UPDATE `emails` SET `name` = 'Volunteers - New Volunteer Invitation' WHERE `val`='volunteer_new_invite'; +UPDATE `emails` SET `name` = 'Volunteers - Add Volunteer Invitation' WHERE `val`='volunteer_add_invite'; diff --git a/user_invite.php b/user_invite.php index ab162017..9873fe0a 100644 --- a/user_invite.php +++ b/user_invite.php @@ -117,26 +117,31 @@ update_status(""); document.invite.button.disabled = true; document.invite.button.value = ""; + document.invite.action.value = "err"; break; case "notexist": update_status(""); document.invite.button.disabled = false; document.invite.button.value = ""; + document.invite.action.value = "notexist"; break; case "norole": update_status(""); document.invite.button.disabled = false; document.invite.button.value = ""; + document.invite.action.value = "norole"; break; case "noyear": update_status(""); document.invite.button.disabled = false; document.invite.button.value = ""; + document.invite.action.value = "noyear"; break; case "exist": update_status(""); document.invite.button.disabled = true; document.invite.button.value = ""; + document.invite.action.value = "err"; break; } } else { @@ -150,26 +155,59 @@ "; - if($_POST['action']=="invite" && $_POST['email']) - { - $q=mysql_query("SELECT id FROM users WHERE email='".$_POST['email']."'"); - if(mysql_num_rows($q)) - { - echo error(i18n("A judge already exists with that email address")); - } - else - { - $pass=generatePassword(); -// mysql_query("INSERT INTO judges (email,password) VALUES ('".mysql_escape_string(stripslashes($_POST['email']))."','$pass')"); -// email_send("new_judge_invite",stripslashes($_POST['email']),array("FAIRNAME"=>$config['fairname']),array("FAIRNAME"=>$config['fairname'],"EMAIL"=>stripslashes($_POST['email']),"PASSWORD"=>$pass)); - echo happy(i18n("%1 has been invited to be a judge",array($_POST['email']))); + if($_POST['action']!="" && $_POST['email']) + { + $allowed_actions = array('notexist','norole','noyear'); + $email = stripslashes($_POST['email']); + $type = $_POST['type']; + $action = $_POST['action']; + + if(!in_array($action, $allowed_actions)) + exit; + + $q = mysql_query("SELECT id FROM users WHERE email='$email' ORDER BY year DESC"); + if(mysql_num_rows($q) > 0) { + $u = mysql_fetch_assoc($q); + $u = user_load($u['id']); + } else { + $u = NULL; + } + + switch($action) { + case 'notexist': /* Create the user */ + $u = user_create($type); + email_send("{$type}_new_invite",$u['email'], + array("FAIRNAME"=>$config['fairname']), + array("FAIRNAME"=>$config['fairname'], + "EMAIL"=>$u['email'], + "PASSWORD"=>$u['password'])); + echo happy(i18n('%1 has been invited to be a %2', array($u['email'], $user_what[$type]))); + echo happy(i18n('An email has been sent to %1', array($u['email']))); + break; + + case 'norole': /* Add role to the existing user */ + user_create($type, $u); + email_send("{$type}_add_invite",$u['email'], + array("FAIRNAME"=>$config['fairname']), + array("FAIRNAME"=>$config['fairname'])); + echo happy(i18n('%1 is now also a %2', array($u['email'], $user_what[$type]))); + echo happy(i18n('An email has been sent to %1', array($u['email']))); + break; + + case 'noyear': /* Send a reminder email */ + email_send("{$type}_activate_reminder",$u['email'], + array("FAIRNAME"=>$config['fairname']), + array("FAIRNAME"=>$config['fairname'], + "EMAIL"=>$u['email'])); + echo happy(i18n('An email has been sent to %1', array($u['email']))); + break; } } echo "
\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "
"; echo i18n("Select a Role: ");