arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fix participant registration and fundraising

Browse Source
This commit is contained in:
arman 2025-02-04 20:35:59 +00:00
parent e77fc688f0
commit b6494034ad
15 changed files with 1597 additions and 5270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
.devcontainer/science-ation-blank-generic.sql
View File

@ -1,8 +1,8 @@
-- MariaDB dump 10.19-11.5.2-MariaDB, for debian-linux-gnu (x86_64)
-- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: sfiab
-- Host: 127.0.0.1 Database: mariadb
-- ------------------------------------------------------
-- Server version 11.5.2-MariaDB-ubu2404
-- Server version 11.6.2-MariaDB-ubu2404
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@ -13,7 +13,7 @@
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `award_awards`
@ -903,7 +903,7 @@ LOCK TABLES `emailqueue_recipients` WRITE;
UNLOCK TABLES;
--
-- Table structure for table `git
-- Table structure for table `emails`
--
DROP TABLE IF EXISTS `emails`;
@ -932,22 +932,22 @@ CREATE TABLE `emails` (
LOCK TABLES `emails` WRITE;
/*!40000 ALTER TABLE `emails` DISABLE KEYS */;
INSERT INTO `emails` VALUES
(1,'register_participants_resend_regnum','Participant Registration - Resend Registration Number','Resend the password to the participant if they submit a \'forgot regnum\' request','','Registration for [FAIRNAME]','We have received a request for the retrieval of your registration number from this email address. Please find your existing registration number below\r\n\r\nRegistration Number: [REGNUM]\r\n','','system',NULL,NULL),
(2,'new_participant','New Participant','Email that new participants receive when they are added to the system','','Registration for [FAIRNAME]','A new registration account has been created for you. To access your registration account, please enter the following registration number into the registration website:\r\n\r\nEmail Address: [EMAIL]\r\nRegistration Number: [REGNUM]\r\n','','system',NULL,NULL),
(5,'register_participants_received','Participant Registration - Form Received','Sent to the participant when the admin flags their signature form as received','','Registration for [FAIRNAME] Complete','Dear [FIRSTNAME],\r\nYour registration for the [FAIRNAME] is now complete.\r\nYour project number is [PROJECTNUMBER]. Please write down your project number and bring it with you to the fair in order to expedite the check-in process.\r\n\r\nSincerely,\r\n [FAIRNAME]','','system',NULL,NULL),
(6,'register_participants_paymentpending','Participant Registration - Payment Pending','Sent to the participant when the admin flags their signature form as received but payment pending','','Registration for [FAIRNAME] Not Complete - Payment Pending','Dear [FIRSTNAME],\r\nYour registration for the [FAIRNAME] is not yet complete. We received your registration form however it was missing the required registration fee. Please send the required registration fee in aso soon as possible in order to complete your registration.\r\n\r\nYour project number is [PROJECTNUMBER]. Please write down your project number and bring it with you to the fair in order to expedite the check-in process.\r\n\r\nSincerely,\r\n [FAIRNAME]','','system',NULL,NULL),
(7,'volunteer_welcome','Volunteer Registration - Welcome','Welcome email sent to a volunteer after they have registered for the first time. This email includes their temporary password.','','Volunteer Registration for [FAIRNAME]','Thank you for registering as a volunteer 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\nVolunteer Email Address: [EMAIL]\nVolunteer Password: [PASSWORD]','','system',NULL,NULL),
(8,'volunteer_recover_password','Volunteer Registration - Recover Password','Recover the password for a volunteer if they submit a \'forgot password\' request','','Volunteer Registration for [FAIRNAME]','We have received a request for the recovery of your password from this email address. Please find your new password below:\n\nVolunteer Email Address: [EMAIL]\nVolunteer Password: [PASSWORD] ','','system',NULL,NULL),
(9,'committee_recover_password','Committee Members - Recover Password','Recover the password for a committee member if they submit a \'forgot password\' request','','Committee Member for [FAIRNAME]','We have received a request for the recovery of your password from this email address. Please find your new password below:\n\nCommittee Member Email Address: [EMAIL]\nCommittee Member Password: [PASSWORD] ','','system',NULL,NULL),
(10,'volunteer_new_invite','Volunteers - New Volunteer Invitation','This is sent to a new volunteer when they are invited using the invite volunteers administration section, only available when the Volunteer Registration Type is set to Invite','','Volunteer Registration for [FAIRNAME]','You have been invited to be a volunteer for the [FAIRNAME]. An account has been created for you to login with and complete your information. You can login to the volunteer registration site with:\n\nEmail Address: [EMAIL]\nPassword: [PASSWORD]\n\nYou can change your password once you login.','','system',NULL,NULL),
(11,'volunteer_add_invite','Volunteers - Add Volunteer Invitation','This is sent to existing users when they are invited using the invite volunteers administration section, only available when the Volunteer Registration Type is set to Invite','','Volunteer Registration for [FAIRNAME]','The role of volunteer 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 Volunteer and your other roles without needing to logout.\n','','system',NULL,NULL),
(12,'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',NULL,NULL),
(13,'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',NULL,NULL),
(14,'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',NULL,NULL),
(15,'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',NULL,NULL),
(16,'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',NULL,NULL),
(17,'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',NULL,NULL),
(18,'fundraising_thankyou_template','Fundraising Thank You Template','Fundraising thank you template to be used to send thank you emails to individual sponsor/donors once a donation is received','','Thank You for your Contribution','Dear [FIRSTNAME],\r\n\r\nThank you for your contribution to the [FAIRNAME]\r\n\r\nSincerely,\r\n [FAIRNAME] Committee\r\n','','system',NULL,NULL);
(1,'register_participants_resend_regnum','Participant Registration - Resend Registration Number','Resend the password to the participant if they submit a \'forgot regnum\' request','contact@science-ation.ca','Registration for [FAIRNAME]','We have received a request for the retrieval of your registration number from this email address. Please find your existing registration number below\r\n\r\nRegistration Number: [REGNUM]\r\n','','system',NULL,NULL),
(2,'new_participant','New Participant','Email that new participants receive when they are added to the system','contact@science-ation.ca','Registration for [FAIRNAME]','A new registration account has been created for you. To access your registration account, please enter the following registration number into the registration website:\r\n\r\nEmail Address: [EMAIL]\r\nRegistration Number: [REGNUM]\r\n','','system',NULL,NULL),
(5,'register_participants_received','Participant Registration - Form Received','Sent to the participant when the admin flags their signature form as received','contact@science-ation.ca','Registration for [FAIRNAME] Complete','Dear [FIRSTNAME],\r\nYour registration for the [FAIRNAME] is now complete.\r\nYour project number is [PROJECTNUMBER]. Please write down your project number and bring it with you to the fair in order to expedite the check-in process.\r\n\r\nSincerely,\r\n [FAIRNAME]','','system',NULL,NULL),
(6,'register_participants_paymentpending','Participant Registration - Payment Pending','Sent to the participant when the admin flags their signature form as received but payment pending','contact@science-ation.ca','Registration for [FAIRNAME] Not Complete - Payment Pending','Dear [FIRSTNAME],\r\nYour registration for the [FAIRNAME] is not yet complete. We received your registration form however it was missing the required registration fee. Please send the required registration fee in aso soon as possible in order to complete your registration.\r\n\r\nYour project number is [PROJECTNUMBER]. Please write down your project number and bring it with you to the fair in order to expedite the check-in process.\r\n\r\nSincerely,\r\n [FAIRNAME]','','system',NULL,NULL),
(7,'volunteer_welcome','Volunteer Registration - Welcome','Welcome email sent to a volunteer after they have registered for the first time. This email includes their temporary password.','contact@science-ation.ca','Volunteer Registration for [FAIRNAME]','Thank you for registering as a volunteer 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\nVolunteer Email Address: [EMAIL]\nVolunteer Password: [PASSWORD]','','system',NULL,NULL),
(8,'volunteer_recover_password','Volunteer Registration - Recover Password','Recover the password for a volunteer if they submit a \'forgot password\' request','contact@science-ation.ca','Volunteer Registration for [FAIRNAME]','We have received a request for the recovery of your password from this email address. Please find your new password below:\n\nVolunteer Email Address: [EMAIL]\nVolunteer Password: [PASSWORD] ','','system',NULL,NULL),
(9,'committee_recover_password','Committee Members - Recover Password','Recover the password for a committee member if they submit a \'forgot password\' request','contact@science-ation.ca','Committee Member for [FAIRNAME]','We have received a request for the recovery of your password from this email address. Please find your new password below:\n\nCommittee Member Email Address: [EMAIL]\nCommittee Member Password: [PASSWORD] ','','system',NULL,NULL),
(10,'volunteer_new_invite','Volunteers - New Volunteer Invitation','This is sent to a new volunteer when they are invited using the invite volunteers administration section, only available when the Volunteer Registration Type is set to Invite','contact@science-ation.ca','Volunteer Registration for [FAIRNAME]','You have been invited to be a volunteer for the [FAIRNAME]. An account has been created for you to login with and complete your information. You can login to the volunteer registration site with:\n\nEmail Address: [EMAIL]\nPassword: [PASSWORD]\n\nYou can change your password once you login.','','system',NULL,NULL),
(11,'volunteer_add_invite','Volunteers - Add Volunteer Invitation','This is sent to existing users when they are invited using the invite volunteers administration section, only available when the Volunteer Registration Type is set to Invite','contact@science-ation.ca','Volunteer Registration for [FAIRNAME]','The role of volunteer 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 Volunteer and your other roles without needing to logout.\n','','system',NULL,NULL),
(12,'judge_recover_password','Judges - Recover Password','Recover the password for a judge if they submit a \'forgot password\' request','contact@science-ation.ca','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',NULL,NULL),
(13,'judge_welcome','Judges - Welcome','Welcome email sent to a judge after they have registered for the first time. This email includes their temporary password.','contact@science-ation.ca','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',NULL,NULL),
(14,'judge_new_invite','Judges - New Judge Invitation','This is sent to a new judge when they are invited using the invite users administration option.','contact@science-ation.ca','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',NULL,NULL),
(15,'judge_add_invite','Judges - Add Judge Invitation','This is sent to existing users when they are invited using the invite users administration option.','contact@science-ation.ca','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',NULL,NULL),
(16,'judge_activate_reminder','Judges - Activation Reminder','This is sent to existing judges who have not yet activated their account for the current fair year.','contact@science-ation.ca','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',NULL,NULL),
(17,'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.','contact@science-ation.ca','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',NULL,NULL),
(18,'fundraising_thankyou_template','Fundraising Thank You Template','Fundraising thank you template to be used to send thank you emails to individual sponsor/donors once a donation is received','contact@science-ation.ca','Thank You for your Contribution','Dear [FIRSTNAME],\r\n\r\nThank you for your contribution to the [FAIRNAME]\r\n\r\nSincerely,\r\n [FAIRNAME] Committee\r\n','','system',NULL,NULL);
/*!40000 ALTER TABLE `emails` ENABLE KEYS */;
UNLOCK TABLES;
@ -972,7 +972,7 @@ CREATE TABLE `emergencycontact` (
`email` varchar(128) NOT NULL DEFAULT '',
`year` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@ -981,6 +981,8 @@ CREATE TABLE `emergencycontact` (
LOCK TABLES `emergencycontact` WRITE;
/*!40000 ALTER TABLE `emergencycontact` DISABLE KEYS */;
INSERT INTO `emergencycontact` VALUES
(1,2,1,'sfa','rsf','Grandparent','ds','','','','',2025);
/*!40000 ALTER TABLE `emergencycontact` ENABLE KEYS */;
UNLOCK TABLES;
@ -1768,6 +1770,10 @@ CREATE TABLE `projectcategories` (
LOCK TABLES `projectcategories` WRITE;
/*!40000 ALTER TABLE `projectcategories` DISABLE KEYS */;
INSERT INTO `projectcategories` VALUES
(1,'junor','',7,8,2025),
(2,'senior','',11,12,2025),
(3,'int','',9,10,2025);
/*!40000 ALTER TABLE `projectcategories` ENABLE KEYS */;
UNLOCK TABLES;
@ -1861,29 +1867,29 @@ CREATE TABLE `projects` (
`registrations_id` int(10) unsigned NOT NULL DEFAULT 0,
`projectnumber` varchar(16) DEFAULT NULL,
`projectsort` varchar(16) DEFAULT NULL,
`projectnumber_seq` int(11) NOT NULL,
`projectsort_seq` int(11) NOT NULL,
`floornumber` int(11) NOT NULL,
`projectnumber_seq` int(11) NOT NULL DEFAULT 0,
`projectsort_seq` int(11) NOT NULL DEFAULT 0,
`floornumber` int(11) NOT NULL DEFAULT 0,
`projectcategories_id` int(10) unsigned NOT NULL DEFAULT 0,
`projectdivisions_id` int(10) unsigned NOT NULL DEFAULT 0,
`cwsfdivisionid` int(11) DEFAULT NULL,
`title` varchar(255) NOT NULL DEFAULT '',
`shorttitle` varchar(255) NOT NULL,
`shorttitle` varchar(255) NOT NULL DEFAULT '',
`summarycountok` tinyint(1) NOT NULL DEFAULT 1,
`summary` text NOT NULL,
`summary` text NOT NULL DEFAULT '',
`year` int(11) NOT NULL DEFAULT 0,
`req_electricity` enum('no','yes') NOT NULL DEFAULT 'no',
`req_table` enum('no','yes') NOT NULL DEFAULT 'yes',
`req_special` varchar(128) NOT NULL DEFAULT '',
`language` char(2) NOT NULL DEFAULT '',
`fairs_id` int(11) NOT NULL,
`fairs_id` int(11) NOT NULL DEFAULT 0,
`projecttype` varchar(64) DEFAULT NULL,
`feedback` text DEFAULT NULL,
`flagged` tinyint(1) DEFAULT NULL,
`human_participants` enum('no','yes') DEFAULT NULL,
`animal_participants` enum('no','yes') DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@ -3390,9 +3396,9 @@ DROP TABLE IF EXISTS `users`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `users` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL,
`uid` int(11) NOT NULL DEFAULT 0,
`types` set('student','judge','committee','volunteer','fair','sponsor','principal','teacher','parent','mentor','alumni') NOT NULL,
`salutation` varchar(8) NOT NULL,
`salutation` varchar(8) NOT NULL DEFAULT '',
`firstname` varchar(32) NOT NULL DEFAULT '',
`lastname` varchar(32) NOT NULL DEFAULT '',
`sex` enum('male','female') DEFAULT NULL,
@ -3530,17 +3536,17 @@ CREATE TABLE `users_judge` (
`users_id` int(11) NOT NULL,
`judge_active` enum('no','yes') NOT NULL DEFAULT 'no',
`judge_complete` enum('no','yes') NOT NULL DEFAULT 'no',
`years_school` tinyint(4) NOT NULL,
`years_regional` tinyint(4) NOT NULL,
`years_national` tinyint(4) NOT NULL,
`years_school` tinyint(4) NOT NULL DEFAULT 0,
`years_regional` tinyint(4) NOT NULL DEFAULT 0,
`years_national` tinyint(4) NOT NULL DEFAULT 0,
`willing_chair` enum('yes','no') NOT NULL DEFAULT 'no',
`special_award_only` enum('yes','no') NOT NULL DEFAULT 'no',
`cat_prefs` tinytext NOT NULL,
`div_prefs` text NOT NULL,
`divsub_prefs` tinytext NOT NULL,
`languages` tinytext NOT NULL,
`highest_psd` tinytext NOT NULL,
`expertise_other` tinytext NOT NULL,
`cat_prefs` tinytext NOT NULL DEFAULT '',
`div_prefs` text NOT NULL DEFAULT '',
`divsub_prefs` tinytext NOT NULL DEFAULT '',
`languages` tinytext NOT NULL DEFAULT '',
`highest_psd` tinytext NOT NULL DEFAULT '',
`expertise_other` tinytext NOT NULL DEFAULT '',
`private_info` text DEFAULT NULL ,
`flagged_judge` tinyint(1) DEFAULT NULL,
PRIMARY KEY (`users_id`)
@ -3787,6 +3793,6 @@ UNLOCK TABLES;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2024-11-22 2:44:22
-- Dump completed on 2025-02-03 18:47:42

3796
.devcontainer/science-ation-test.sql
View File

File diff suppressed because it is too large Load Diff

13
admin/award_awards.php
View File

@ -394,8 +394,10 @@ send_header('Awards Management',
var award_id = 0;
var award_tab_update = new Array();
function update_awardinfo()
{
if(award_tab_update['awardinfo'] == award_id) return;
award_tab_update['awardinfo'] = award_id;
// alert(award_id);
@ -634,7 +636,7 @@ function update_feeder_enable()
/* Setup the popup window */
$(document).ready(function() {
console.log('first');
$("#popup_editor").dialog({
bgiframe: true, autoOpen: false,
modal: true, resizable: false,
@ -649,7 +651,7 @@ $(document).ready(function() {
});
$("#editor_tabs").tabs({
create: function( event, ui ) {
activate: function( event, ui ) {
update_awardinfo();
update_eligibility();
update_prizeinfo();
@ -680,6 +682,7 @@ $(document).ready(function() {
// collapsible: true,
// selected: -1 /* None selected */
// });
})
</script>
@ -912,15 +915,15 @@ function popup_editor(id, mode)
switch(mode) {
case 'new':
$('#editor_tabs').tabs('option', 'disabled', [1, 2, 3]);
$('#editor_tabs').tabs('select', 0);
$('#editor_tabs').tabs('option','active', 0);
break;
case 'template':
$('#editor_tabs').tabs('option', 'disabled', [0, 1, 3]);
$('#editor_tabs').tabs('select', 2);
$('#editor_tabs').tabs('option', 'active', 2);
break;
default:
$('#editor_tabs').tabs('option', 'disabled', []);
$('#editor_tabs').tabs('select', 0);
$('#editor_tabs').tabs('option','active', 0);
break;
}
/* Don't let anything collapse */

227
admin/donors.php
View File

@ -29,6 +29,7 @@ user_auth_required('committee', 'admin');
require_once('fundraising_common.inc.php');
global $pdo;
switch (get_value_from_array($_GET, 'action')) {
case 'organizationinfo_load':
$id = intval($_GET['id']);
@ -41,6 +42,8 @@ switch (get_value_from_array($_GET, 'action')) {
case 'organizationinfo_save':
$id = intval($_POST['sponsor_id']);
if ($id == -1) {
echo "INSERT INTO sponsors (year) VALUES ('" . $config['FAIRYEAR'] . "')";
$q = $pdo->prepare("INSERT INTO sponsors (year) VALUES ('" . $config['FAIRYEAR'] . "')");
@ -51,8 +54,20 @@ switch (get_value_from_array($_GET, 'action')) {
$createnew = true;
} else
$createnew = false;
if ($id) {
if ($_POST['fundingselectiondate'] == '') {
$_POST['fundingselectiondate'] = '0000-00-00';
}
if ($_POST['proposalsubmissiondate'] == '') {
$_POST['proposalsubmissiondate'] = '0000-00-00';
}
if (!$_POST['waiveraccepted']) {
$_POST['waiveraccepted'] = 'no';
}
$exec = 'UPDATE sponsors SET '
. "donortype='" . stripslashes($_POST['donortype']) . "', "
. "organization='" . stripslashes($_POST['organization']) . "', "
@ -302,7 +317,7 @@ switch (get_value_from_array($_GET, 'action')) {
$supporttypes[] = 'Sponsorship';
echo "<select name=\"supporttype\">\n";
echo "<option value=\"\">Choose type of support</option>\n";
foreach ($supporttypes AS $st) {
foreach ($supporttypes as $st) {
echo "<option value=\"$st\">" . i18n($st) . "</option>\n";
}
echo "</select>\n";
@ -364,9 +379,10 @@ switch (get_value_from_array($_GET, 'action')) {
break;
case 'newcontactsearch':
if ($_POST['email'])
if ($_POST['email']) {
$q = $pdo->prepare("SELECT *,MAX(year) FROM users WHERE email='" . trim($_POST['email']) . "' GROUP BY uid HAVING deleted='no'");
$q->execute();
}
if ($r = $q->fetch(PDO::FETCH_OBJ)) {
echo i18n('There is an exact email address match for %1', array($_POST['email']));
echo '<ul>';
@ -463,10 +479,14 @@ switch (get_value_from_array($_GET, 'action')) {
break;
}
send_header('Donor/Sponsor Management',
array('Committee Main' => 'committee_main.php',
send_header(
'Donor/Sponsor Management',
array(
'Committee Main' => 'committee_main.php',
'Administration' => 'admin/index.php',
'Fundraising' => 'admin/fundraising.php'));
'Fundraising' => 'admin/fundraising.php'
)
);
// delete the contact who has been submitted in _POST
function delete_contact()
@ -709,7 +729,7 @@ function draw_contact_form($sponsor_id, $contact = null)
<select name="salutation">
<option value=""><?= i18n('Choose') ?></option>
<?
foreach ($salutations AS $salutation) {
foreach ($salutations as $salutation) {
if ($contact['salutation'] == $salutation)
$sel = 'selected="selected"';
else
@ -752,13 +772,26 @@ function draw_contact_form($sponsor_id, $contact = null)
<td><input type="text" name="fax" value="<?= htmlspecialchars($contact['fax']) ?>"></td>
</tr>
<tr><td><?= i18n('Address 1') ?></td><td colspan="3"><input type="text" name="address" size="60" maxlength="64" value="<?= htmlspecialchars($contact['address']) ?>" /></td></tr>
<tr><td><?= i18n('Address 2') ?></td><td colspan="3"><input type="text" name="address2" size="60" maxlength="64" value="<?= htmlspecialchars($contact['address2']) ?>" /></td></tr>
<tr><td><?= i18n('City') ?></td><td><input id="city" type="text" name="city" size="16" maxlength="32" value="<?= htmlspecialchars($contact['city']) ?>" /></td>
<td><?= i18n($config['provincestate']) ?></td><td>
<tr>
<td><?= i18n('Address 1') ?></td>
<td colspan="3"><input type="text" name="address" size="60" maxlength="64" value="<?= htmlspecialchars($contact['address']) ?>" /></td>
</tr>
<tr>
<td><?= i18n('Address 2') ?></td>
<td colspan="3"><input type="text" name="address2" size="60" maxlength="64" value="<?= htmlspecialchars($contact['address2']) ?>" /></td>
</tr>
<tr>
<td><?= i18n('City') ?></td>
<td><input id="city" type="text" name="city" size="16" maxlength="32" value="<?= htmlspecialchars($contact['city']) ?>" /></td>
<td><?= i18n($config['provincestate']) ?></td>
<td>
<? emit_province_selector('province_code', $contact['province']); ?>
</td></tr>
<tr><td><?= i18n($config['postalzip']) ?></td><td colspan="3"><input type="text" name="postalcode" size="8" maxlength="7" value="<?= htmlspecialchars($contact['postalcode']) ?>" /></td></tr>
</td>
</tr>
<tr>
<td><?= i18n($config['postalzip']) ?></td>
<td colspan="3"><input type="text" name="postalcode" size="8" maxlength="7" value="<?= htmlspecialchars($contact['postalcode']) ?>" /></td>
</tr>
<tr>
@ -808,7 +841,7 @@ function draw_activityinfo_form()
echo '<select name="type">';
echo '<option value="">' . i18n('Choose Type') . "</option>\n";
$logtypes = array('Appeal', 'Phone Call', 'Email', 'Personal Visit', 'Other');
foreach ($logtypes AS $lt) {
foreach ($logtypes as $lt) {
echo "<option value=\"$lt\">" . i18n($lt) . "</option>\n";
}
echo "</select>\n";
@ -835,10 +868,10 @@ function draw_activityinfo_form()
<?php
$query = "SELECT CONCAT_WS('&nbsp;', users.firstname, users.lastname) AS name, fdl.dt, fdl.log, fdl.type,
fundraising_campaigns.name AS campaignname
\t FROM fundraising_donor_logs AS fdl
\t LEFT JOIN users ON fdl.users_id=users.id
\t LEFT JOIN fundraising_campaigns ON fdl.fundraising_campaigns_id=fundraising_campaigns.id
\t WHERE sponsors_id=" . $sponsorid . ' ORDER BY dt DESC';
FROM fundraising_donor_logs AS fdl
LEFT JOIN users ON fdl.users_id=users.id
LEFT JOIN fundraising_campaigns ON fdl.fundraising_campaigns_id=fundraising_campaigns.id
WHERE sponsors_id=" . $sponsorid . ' ORDER BY dt DESC';
// echo "<tr><td colspan=\"3\">" . $query . "</td></tr>";
$q = $pdo->prepare($query);
$q->execute();
@ -857,7 +890,8 @@ function draw_activityinfo_form()
}
?>
</tbody></table>
</tbody>
</table>
</form>
<?php
}
@ -940,14 +974,19 @@ $(document).ready(function() {
selected: 0
});
$("#organizationinfo_fundingselectiondate").datepicker({ dateFormat: 'yy-mm-dd'});
$("#organizationinfo_proposalsubmissiondate").datepicker({ dateFormat: 'yy-mm-dd'});
$("#organizationinfo_fundingselectiondate").datepicker({
dateFormat: 'yy-mm-dd'
});
$("#organizationinfo_proposalsubmissiondate").datepicker({
dateFormat: 'yy-mm-dd'
});
//, showOn: 'button', buttonText: "<?= i18n('calendar') ?>" });
open_search();
});
var sponsor_id = 0;
function open_editor(id) {
sponsor_id = id;
$("#donor_editor").show();
@ -977,8 +1016,7 @@ function open_editor(id) {
$("#update_contactsinfoorganizationinfo_save_button").attr('disabled', 'disabled');
$("[name=donortype]").attr('checked', '');
}
else {
} else {
$('#editor_tabs').tabs('option', 'selected', 0);
$('#editor_tabs').tabs('option', 'disabled', []);
}
@ -992,8 +1030,8 @@ function open_search() {
$("#searchbrowse").show();
donorsearch(false);
}
function update_organizationinfo()
{
function update_organizationinfo() {
var id = sponsor_id;
if (!sponsor_id)
return false;
@ -1038,18 +1076,18 @@ function organizationinfo_save() {
open_editor(json.id);
},
"json");
}
else
} else
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=organizationinfo_save", $("#organizationinfo").serializeArray());
return false;
}
function update_sponsorshipinfo()
{
function update_sponsorshipinfo() {
var id = sponsor_id;
$("#editor_tab_sponsorship").load("<?= $_SERVER['PHP_SELF'] ?>?action=sponsorshipinfo_load&id=" + id, null, function() {
$(".date").datepicker({ dateFormat: 'yy-mm-dd' });
$(".date").datepicker({
dateFormat: 'yy-mm-dd'
});
$('.tableview').tablesorter();
});
}
@ -1059,8 +1097,7 @@ function sponsorshipinfo_save() {
return false;
}
function update_contactsinfo()
{
function update_contactsinfo() {
var id = sponsor_id;
$("#editor_tab_contacts").load("<?= $_SERVER['PHP_SELF'] ?>?action=contactsinfo_load&id=" + id, null,
function() {
@ -1097,13 +1134,14 @@ function contactsinfo_delete(uid) {
}
function update_activityinfo()
{
function update_activityinfo() {
var id = sponsor_id;
$("#editor_tab_activity").load(
"<?= $_SERVER['PHP_SELF'] ?>?action=activityinfo_load&id=" + id,
null,
function(){$('.tableview').tablesorter(); }
function() {
$('.tableview').tablesorter();
}
);
return false;
}
@ -1120,9 +1158,13 @@ function activityinfo_save() {
function donorsearch(realsearch) {
$("#searchresults").show();
if (realsearch)
$("#searchresults").load("donors_search.php", $("#searchform").serializeArray(), function(){$('.tableview').tablesorter(); });
$("#searchresults").load("donors_search.php", $("#searchform").serializeArray(), function() {
$('.tableview').tablesorter();
});
else
$("#searchresults").load("donors_search.php", null, function(){$('.tableview').tablesorter(); }); //, $("#searchform").serializeArray());
$("#searchresults").load("donors_search.php", null, function() {
$('.tableview').tablesorter();
}); //, $("#searchform").serializeArray());
return false;
}
@ -1134,13 +1176,19 @@ function newcontactsearch() {
searchtimer = setTimeout('donewcontactsearch()', 300);
return true;
}
function donewcontactsearch() {
$("#newcontactsearch").load("<?= $_SERVER['PHP_SELF'] ?>?action=newcontactsearch", $("#contact_new").serializeArray());
}
function useexistingcontact(uid) {
var id = sponsor_id;
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=contactsinfo_addexisting",{id: id, uid: uid} ,function() { update_contactsinfo(); });
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=contactsinfo_addexisting", {
id: id,
uid: uid
}, function() {
update_contactsinfo();
});
}
function togglefulldonationhistory() {
@ -1156,35 +1204,38 @@ function campaignchange() {
function donortypechange() {
if ($("input[name='donortype']:checked").val() == "organization") {
$("#organizationinfo_logo").attr("disabled","");
$("#organizationinfo_donationpolicyurl").attr("disabled","");
$("#organizationinfo_fundingselectiondate").attr("disabled","");
$("#organizationinfo_proposalsubmissiondate").attr("disabled","");
}
else if($("input[name='donortype']:checked").val()=="individual") {
$("#organizationinfo_logo").removeAttr("disabled", "");
$("#organizationinfo_donationpolicyurl").removeAttr("disabled", "");
$("#organizationinfo_fundingselectiondate").removeAttr("disabled", "");
$("#organizationinfo_proposalsubmissiondate").removeAttr("disabled", "");
} else if ($("input[name='donortype']:checked").val() == "individual") {
$("#organizationinfo_logo").attr("disabled", "disabled");
$("#organizationinfo_donationpolicyurl").attr("disabled", "disabled");
$("#organizationinfo_fundingselectiondate").attr("disabled", "disabled");
$("#organizationinfo_proposalsubmissiondate").attr("disabled", "disabled");
}
else {
}
$("#organizationinfo_save_button").attr('disabled','');
} else {}
$("#organizationinfo_save_button").removeAttr('disabled', '');
}
function adddonation() {
var id = sponsor_id;
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=donation_add", $("#addnewdonationform").serializeArray(),function() { update_sponsorshipinfo(); });
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=donation_add", $("#addnewdonationform").serializeArray(), function() {
update_sponsorshipinfo();
});
return false;
}
function removedonation(donationid, sponsorid) {
if (confirmClick('Are you sure you want to remove this donation/sponsorship?')) {
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=donation_remove", {id: donationid, sponsors_id: sponsorid},function() { update_sponsorshipinfo(); });
$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=donation_remove", {
id: donationid,
sponsors_id: sponsorid
}, function() {
update_sponsorshipinfo();
});
}
return false;
}
</script>
<?
@ -1219,29 +1270,64 @@ echo '<hr />';
<form enctype="multipart/form-data" id="organizationinfo">
<input type="hidden" name="sponsor_id" id="sponsor_id" value="0">
<table class="tableedit" border=0>
<tr><td><?= i18n('Donor Type') ?></td><td colspan="5">
<tr>
<td><?= i18n('Donor Type') ?></td>
<td colspan="5">
<input id="donortype_individual" type="radio" name="donortype" value="individual" onchange="return donortypechange()" /><label for="donortype_individual"><?= i18n('Individual') ?></label>
<input id="donortype_organization" type="radio" name="donortype" value="organization" onchange="return donortypechange()" /><label for="donortype_organization"><?= i18n('Organization') ?></label>
</td></tr>
<tr><td><?= i18n('Name') ?></td><td colspan="5"><input class="translatable" type="text" id="organizationinfo_organization" name="organization" size="60" maxlength="128" /></td></tr>
<tr><td><?= i18n('Address 1') ?></td><td colspan="5"><input id="organizationinfo_address" type="text" name="address" size="60" maxlength="64" /></td></tr>
<tr><td><?= i18n('Address 2') ?></td><td colspan="5"><input id="organizationinfo_address2" type="text" name="address2" size="60" maxlength="64" /></td></tr>
<tr><td><?= i18n('City') ?></td><td><input id="organizationinfo_city" type="text" name="city" size="16" maxlength="32" /></td>
<td><?= i18n($config['provincestate']) ?></td><td>
</td>
</tr>
<tr>
<td><?= i18n('Name') ?></td>
<td colspan="5"><input class="translatable" type="text" id="organizationinfo_organization" name="organization" size="60" maxlength="128" /></td>
</tr>
<tr>
<td><?= i18n('Address 1') ?></td>
<td colspan="5"><input id="organizationinfo_address" type="text" name="address" size="60" maxlength="64" /></td>
</tr>
<tr>
<td><?= i18n('Address 2') ?></td>
<td colspan="5"><input id="organizationinfo_address2" type="text" name="address2" size="60" maxlength="64" /></td>
</tr>
<tr>
<td><?= i18n('City') ?></td>
<td><input id="organizationinfo_city" type="text" name="city" size="16" maxlength="32" /></td>
<td><?= i18n($config['provincestate']) ?></td>
<td>
<? emit_province_selector('province_code', '', 'id="organizationinfo_province_code"'); ?>
</td>
<td><?= i18n($config['postalzip']) ?></td><td><input id="organizationinfo_postalcode" type="text" name="postalcode" size="8" maxlength="7" /></td></tr>
<tr><td><?= i18n('Phone') ?></td><td><input type="text" id="organizationinfo_phone" name="phone" size="16" maxlength="32" /></td>
<td><?= i18n('Toll Free') ?></td><td><input type="text" id="organizationinfo_tollfree" name="tollfree" size="16" maxlength="32" /></td>
<td><?= i18n('Fax') ?></td><td><input type="text" id="organizationinfo_fax" name="fax" size="16" maxlength="32" /></td></tr>
<tr><td><?= i18n('Email') ?></td><td colspan="5"><input type="text" id="organizationinfo_email" name="email" size="60" maxlength="128" /></td>
<td><?= i18n($config['postalzip']) ?></td>
<td><input id="organizationinfo_postalcode" type="text" name="postalcode" size="8" maxlength="7" /></td>
</tr>
<tr><td><?= i18n('Website') ?></td><td colspan="5"><input type="text" id="organizationinfo_website" name="website" size="60" maxlength="128" /></td>
<tr>
<td><?= i18n('Phone') ?></td>
<td><input type="text" id="organizationinfo_phone" name="phone" size="16" maxlength="32" /></td>
<td><?= i18n('Toll Free') ?></td>
<td><input type="text" id="organizationinfo_tollfree" name="tollfree" size="16" maxlength="32" /></td>
<td><?= i18n('Fax') ?></td>
<td><input type="text" id="organizationinfo_fax" name="fax" size="16" maxlength="32" /></td>
</tr>
<tr><td><?= i18n('Donation Policy') ?></td><td colspan="5"><input id="organizationinfo_donationpolicyurl" type="file" name="donationpolicyurl" size="30" maxlength="128" /></td></tr>
<tr><td><?= i18n('Logo') ?></td><td colspan="5"><input type="file" id="organizationinfo_logo" name="logo" size="30" /></td></tr>
<tr><td><?= i18n('Funding Selection Date') ?></td><td><input id="organizationinfo_fundingselectiondate" type="text" name="fundingselectiondate" class="date" size="12" maxlength="12" /></td>
<td><?= i18n('Proposal Submission Date') ?></td><td colspan="3"><input id="organizationinfo_proposalsubmissiondate" type="text" name="proposalsubmissiondate" class="date" size="12" maxlength="12" /></td>
<tr>
<td><?= i18n('Email') ?></td>
<td colspan="5"><input type="text" id="organizationinfo_email" name="email" size="60" maxlength="128" /></td>
</tr>
<tr>
<td><?= i18n('Website') ?></td>
<td colspan="5"><input type="text" id="organizationinfo_website" name="website" size="60" maxlength="128" /></td>
</tr>
<tr>
<td><?= i18n('Donation Policy') ?></td>
<td colspan="5"><input id="organizationinfo_donationpolicyurl" type="file" name="donationpolicyurl" size="30" maxlength="128" /></td>
</tr>
<tr>
<td><?= i18n('Logo') ?></td>
<td colspan="5"><input type="file" id="organizationinfo_logo" name="logo" size="30" /></td>
</tr>
<tr>
<td><?= i18n('Funding Selection Date') ?></td>
<td><input id="organizationinfo_fundingselectiondate" type="text" name="fundingselectiondate" class="date" size="12" maxlength="12" /></td>
<td><?= i18n('Proposal Submission Date') ?></td>
<td colspan="3"><input id="organizationinfo_proposalsubmissiondate" type="text" name="proposalsubmissiondate" class="date" size="12" maxlength="12" /></td>
</tr>
<?
@ -1262,7 +1348,10 @@ echo '<hr />';
* </td></tr>
*/
?>
<tr><td><?= i18n('Notes') ?></td><td colspan="5"><textarea id="organizationinfo_notes" name="notes" rows="4" cols="60"></textarea></td></tr>
<tr>
<td><?= i18n('Notes') ?></td>
<td colspan="5"><textarea id="organizationinfo_notes" name="notes" rows="4" cols="60"></textarea></td>
</tr>
</table>
<input id="organizationinfo_save_button" type="submit" value="<?= i18n('Save') ?>" onClick="return organizationinfo_save()" />
</form>

16
admin/fundraising_campaigns.php
View File

@ -178,7 +178,7 @@ case 'managelist':
$recq = $pdo->prepare("SELECT SUM(value) AS received FROM fundraising_donations WHERE fundraising_campaigns_id='$r->id' AND fiscalyear='{$config['FISCALYEAR']}' AND status='received'");
$recq->execute();
show_pdo_errors_if_any($pdo);
$recr = recq->fetch(PDO::FETCH_OBJ);
$recr = $recq->fetch(PDO::FETCH_OBJ);
$received = $recr->received;
if ($r->target)
$percent = round($received / $r->target * 100, 1);
@ -223,8 +223,8 @@ case 'managelist':
echo '</tr>';
echo "</thead>\n";
$q = $pdo->prepare("SELECT * FROM fundraising_donations WHERE fundraising_campaigns_id='$campaign_id'
\t\t\tAND status='received' ORDER BY datereceived DESC");
$q = $pdo->prepare("SELECT * FROM fundraising_donations WHERE fundraising_campaigns_id='$campaign_id' AND status='received' ORDER BY datereceived DESC");
$q->execute();
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
$goal = getGoal($r->fundraising_goal);
$sq = $pdo->prepare("SELECT * FROM sponsors WHERE id='{$r->sponsors_id}'");
@ -438,7 +438,7 @@ case 'managelist':
echo "<input type=\"button\" onclick=\"return opensendemaildialog($campaign_id,$email->id)\" value=\"" . i18n('Send as email') . '" />';
echo "<br />\n";
if ($email->lastsent) {
list($date, $time) = split(' ', $email->lastsent);
list($date, $time) = explode(' ', $email->lastsent);
echo i18n('Last Sent');
echo '<br />' . format_date($date);
echo '<br />' . format_time($time);
@ -590,13 +590,9 @@ function modifycampaignsfinish(){
});
}
function managecampaignsfinish() {
}
function managecampaignfinish() {
$("#editor_tabs").tabs({
create: function( event, ui ) {
$("#campaign_tabs").tabs({
activate: function( event, ui ) {
update_tab_overview();
update_tab_donations();
update_tab_prospects();

2
admin/fundraising_setup.php
View File

@ -346,7 +346,7 @@ send_header('Fundraising Setup',
$(document).ready(function() {
$("#editor_tabs").tabs({
create: function( event, ui ) {
activate: function( event, ui ) {
update_levels();
update_goals();
update_setup();

12
admin/project_editor.php
View File

@ -86,6 +86,7 @@ switch ($action) {
WHERE id='$id'");
$stmt->execute();
happy_("Generated and Saved Project Number: $pn");
break;
case 'project_save':
@ -105,7 +106,7 @@ function project_save()
$q = $pdo->prepare("SELECT * FROM projects WHERE registrations_id='{$registrations_id}' AND year='{$config['FAIRYEAR']}'");
$q->execute();
$projectinfo = $q->fetch(PDO::FETCH_OBJ);
if (!projectinfo) {
if (!$projectinfo) {
echo error(i18n('Invalid project to update'));
}
@ -153,6 +154,9 @@ function project_save()
. "feedback='" . iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['feedback'])) . "', "
. "projectsort='" . stripslashes($_POST['projectsort']) . "'"
. "WHERE id='" . intval($_POST['id'])) . "'");
$stmt->execute();
show_pdo_errors_if_any($pdo);
happy_('Project information successfully updated');
@ -175,7 +179,8 @@ function project_save()
function project_load()
{
global $registrations_id, $config, $pdo, $projectcategories_id;
global $registrations_id, $config, $pdo;
// $projectcategories_id=null;
// now lets find out their MAX grade, so we can pre-set the Age Category
$q = $pdo->prepare("SELECT MAX(grade) AS maxgrade FROM students WHERE registrations_id='" . $registrations_id . "'");
@ -297,9 +302,10 @@ function countwords()
$q->execute();
show_pdo_errors_if_any($pdo);
// ###
} else
} else {
$q = $pdo->prepare("SELECT * FROM projectdivisions WHERE year='" . $config['FAIRYEAR'] . "' ORDER BY division");
$q->execute();
}
echo '<select name="projectdivisions_id">';
echo '<option value="">' . i18n('Select a division') . "</option>\n";

2
admin/registration_list.php
View File

@ -313,7 +313,7 @@ $(document).ready(function() {
$("#editor_tabs").tabs({
create: function( event, ui ) {
activate: function( event, ui ) {
update_students();
update_project();
update_reg();

11
admin/registration_receivedforms.php
View File

@ -208,7 +208,8 @@ if (get_value_from_array($_POST, 'action') == 'received' && get_value_from_array
list($projectnumber, $ps, $pns, $pss) = generateProjectNumber($reg_id);
$stmt = $pdo->prepare("UPDATE projects SET projectnumber='$projectnumber',
projectsort='$ps',projectnumber_seq='$pns',projectsort_seq='$pss'
WHERE registrations_id='$reg_id' AND year='{$config['FAIRYEAR']}'");
WHERE registrations_id='$reg_id' AND year=$config{['FAIRYEAR']}");
$stmt->execute();
echo happy(i18n('Assigned Project Number: %1', array($projectnumber)));
} else
$projectnumber = $projectnum;
@ -261,7 +262,7 @@ if (get_value_from_array($_POST, 'action') == 'received' && get_value_from_array
echo notice(i18n('Registration of form %1 cancelled', array($_POST['registration_number'])));
} else if (get_value_from_array($_GET, 'action') == 'unregister' && get_value_from_array($_GET, 'registration_number')) {
$reg_num = intval(trim($_GET['registration_number']));
$q = $pdo - prepare("SELECT registrations.id AS reg_id, projects.id AS proj_id FROM projects,registrations WHERE projects.registrations_id=registrations.id AND registrations.year='{$config['FAIRYEAR']}' AND registrations.num='$reg_num'");
$q = $pdo->prepare("SELECT registrations.id AS reg_id, projects.id AS proj_id FROM projects,registrations WHERE projects.registrations_id=registrations.id AND registrations.year='{$config['FAIRYEAR']}' AND registrations.num='$reg_num'");
$q->execute();
$r = $q->fetch(PDO::FETCH_OBJ);
$stmt = $pdo->prepare("UPDATE projects SET projectnumber=null, projectsort=null, projectnumber_seq=0, projectsort_seq=0 WHERE id='$r->proj_id' AND year='{$config['FAIRYEAR']}'");
@ -298,9 +299,9 @@ if ($showformatbottom) {
echo '</table>';
echo '<br>';
echo i18n(" <lh>'Receive All' notes:</lh> <ul><li>The button will mark all open-status students that have completed registration as having their $signatureformpermissionform received.
\t \t\t\t\t\t\t\t\t\t\t\t\t <li> Students with above status will be emailed a \"$signatureformpermissionform received\" confirmation.
\t \t\t\t\t\t\t\t\t\t\t\t\t <li> Project numbers will be assigned to these students' projects.
\t \t\t\t\t\t\t\t\t\t\t\t\t</ul>");
<li> Students with above status will be emailed a \"$signatureformpermissionform received\" confirmation.
<li> Project numbers will be assigned to these students' projects.
</ul>");
}
if (get_value_from_array($_POST, 'action') == 'receive_all') {

21
admin/student_editor.php
View File

@ -93,9 +93,10 @@ switch ($action) {
$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$q->execute();
// no need to error message if this doesnt exist
if ($q->rowCount() == 1)
$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
if ($q->rowCount() == 1) {
$stmt = $pdo->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$stmt->execute();
}
if ($q->rowCount() != 1) {
error_('Invalid student to remove');
exit;
@ -108,9 +109,10 @@ switch ($action) {
$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$q->execute();
// no need to error message if this doesnt exist
if ($q->rowCount() == 1)
$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
if ($q->rowCount() == 1) {
$stmt = $pdo->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$stmt->execute();
}
$stmt = $pdo->prepare("DELETE FROM students WHERE id='$remove_id' AND registrations_id='$registrations_id'");
$stmt->execute();
@ -119,9 +121,10 @@ switch ($action) {
$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$q->execute();
// no need to error message if this doesnt exist
if ($q->rowCount() == 1)
$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
if ($q->rowCount() == 1) {
$stmt = $pdo->prepare("DELETE FROM emergencycontact WHERE students_id='$remove_id' AND registrations_id='$registrations_id' AND year='{$config['FAIRYEAR']}'");
$stmt->execute();
}
happy_('Student successfully removed');
exit;
@ -171,6 +174,7 @@ function students_save()
. "'" . iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teachername'][$x])) . "', "
. "'" . iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teacheremail'][$x])) . "', "
. "'" . $config['FAIRYEAR'] . "')");
$stmt->execute();
happy_('%1 %2 successfully added', array($_POST['firstname'][$x], $_POST['lastname'][$x]));
} else {
@ -471,11 +475,12 @@ function registration_load()
/* Find a reg num */
do {
$regnum = rand(100000, 999999);
$q = $pdo->prepare("SELECT * FROM registrations WHERE num='$regnum' AND year={$config['FAIRYEAR']}");
$q->execute();
$q = $pdo->prepare("SELECT * FROM registrations WHERE num=? AND year=?");
$q->execute([$regnum, $config['FAIRYEAR']]);
} while ($q->rowCount() > 0);
$r['num'] = $regnum;
echo notice(i18n('New registration number generated.'));
echo notice(i18n('This new registration will added when the "Save Registration Information" button is pressed below. At that time the other tabs will become available.'));
} else {

104
common.inc.php
View File

@ -29,9 +29,9 @@ header('Content-Type: text/html; charset=utf8');
include_once ('helper.inc.php');
// set error reporting to not show notices, for some reason some people's installation dont set this by default
// so we will set it in the code instead just to make sure
error_reporting(E_ALL);
// error_reporting(E_ALL);
// error_reporting( E_ALL ^ E_WARNING );
// error_reporting( E_ALL ^ E_WARNING ^ E_NOTICE ^ E_DEPRECATED );
error_reporting(E_ALL ^ E_WARNING ^ E_NOTICE ^ E_DEPRECATED);
define('REQUIREDFIELD', '<span class="requiredfield">*</span>');
@ -138,7 +138,7 @@ if (!$dbdbversion) {
exit;
}
if (!$_SERVER['REQUEST_URI'] == "db_update.php" && ($dbcodeversion != $dbdbversion)) {
if (!$_SERVER['REQUEST_URI'] == 'db_update.php' && ($dbcodeversion != $dbdbversion)) {
echo '<html><head><title>SFIAB ERROR</title></head><body>';
echo '<h1>Science Fair In A Box - ERROR</h1>';
echo 'SFIAB database and code are mismatched';
@ -357,9 +357,12 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title><? if ($title && !$titletranslated) echo i18n($title);
else if ($title) echo $title;
else echo i18n($config['fairname']); ?></title>
<title><? if ($title && !$titletranslated)
echo i18n($title);
else if ($title)
echo $title;
else
echo i18n($config['fairname']); ?></title>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.14.1/themes/base/jquery-ui.css">
<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/sfiab.css" type="text/css" media="all" />
@ -369,15 +372,17 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
</head>
<body>
<!-- <? if ($title && !$titletranslated) echo i18n($title);
else if ($title) echo $title;
else echo i18n($config['fairname']); ?> -->
<!-- <? if ($title && !$titletranslated)
echo i18n($title);
else if ($title)
echo $title;
else
echo i18n($config['fairname']); ?> -->
<script src="https://code.jquery.com/jquery-3.7.1.js"></script>
<script src="https://code.jquery.com/jquery-migrate-3.5.2.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.32.0/js/jquery.tablesorter.min.js" integrity="sha512-O/JP2r8BG27p5NOtVhwqsSokAwEP5RwYgvEzU9G6AfNjLYqyt2QT8jqU1XrXCiezS50Qp1i3ZtCQWkHZIRulGA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<!-- <script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/jqueryui/1.7.2/jquery-ui.min.js"></script> -->
<script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/sfiab.js"></script>
<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/theme-script.js"></script>
@ -400,11 +405,10 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
echo '<h1>' . i18n($config['fairname']) . '</h1>';
if ($config['theme'] == 'science_ation')
echo "<span id='menu-toggle-button' onClick='toggle_sidebar()' class='material-symbols-outlined'>
menu
</span>"
\t menu
\t </span>"
?>
</div>
@ -995,38 +999,38 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
}
}
/*require_once("Rmail/Rmail.php");
require_once("Rmail/RFC822.php");
// this sends out an all-ready-to-go email, it does no substitution or changes or database lookups or anything
function email_send_new($to, $from, $subject, $body, $bodyhtml = '')
{
$mail = new RMail();
$mail->setFrom($from);
$mail->setSubject($subject);
$mail->setText($body);
$r = new Mail_RFC822($from);
$structure = $r->parseAddressList($from);
$s = $structure[0];
$ret = sprintf('%s@%s', $s->mailbox, $s->host);
$mail->setReturnPath($ret);
$mail->setHeader('Bounce-To', $ret);
// only add the html if we have it
if ($bodyhtml) {
$mail->setHTML($bodyhtml);
}
if (is_array($to)) {
return $mail->send($to);
} else {
return $mail->send(array($to));
}
}
/*
* require_once("Rmail/Rmail.php");
* require_once("Rmail/RFC822.php");
*
* // this sends out an all-ready-to-go email, it does no substitution or changes or database lookups or anything
* function email_send_new($to, $from, $subject, $body, $bodyhtml = '')
* {
* $mail = new RMail();
* $mail->setFrom($from);
* $mail->setSubject($subject);
* $mail->setText($body);
*
* $r = new Mail_RFC822($from);
* $structure = $r->parseAddressList($from);
* $s = $structure[0];
* $ret = sprintf('%s@%s', $s->mailbox, $s->host);
* $mail->setReturnPath($ret);
* $mail->setHeader('Bounce-To', $ret);
*
* // only add the html if we have it
* if ($bodyhtml) {
* $mail->setHTML($bodyhtml);
* }
*
* if (is_array($to)) {
* return $mail->send($to);
* } else {
* return $mail->send(array($to));
* }
* }
*/
/*
* returns an array of arrays
* [ 0 ] = array ( to, firstname, lastname, email )
@ -1192,8 +1196,14 @@ function config_warnings() {}
global $config;
if (is_numeric($d))
return date($config['dateformat'], $d);
else
else {
if ($d != '0000-00-00')
return date($config['dateformat'], strtotime($d));
else {
return i18n('Not set.');
// return '0000-00-00';
}
}
}
// $t can be a unix timestamp integer, or a text string, eg 10:23:48
@ -1308,12 +1318,14 @@ function config_warnings() {}
if ($percent <= 50)
$red = 255;
else
$red = (100 - $percent) * 2 / 100 * 255;;
$red = (100 - $percent) * 2 / 100 * 255;
;
if ($percent > 50)
$green = 255;
else
$green = ($percent) * 2 / 100 * 255;;
$green = ($percent) * 2 / 100 * 255;
;
// echo "red=$red";
// echo "green=$green";

4
projects.inc.php
View File

@ -146,7 +146,7 @@ function getSpecialAwardsEligibleForProject($projectid)
AND award_types.id=award_awards.award_types_id
AND award_awards.id=award_awards_projectcategories.award_awards_id
AND award_awards.id=award_awards_projectdivisions.award_awards_id
AND projects.projectcategories_ipreparequeryd=award_awards_projectcategories.projectcategories_id
AND projects.projectcategories_id=award_awards_projectcategories.projectcategories_id
AND projects.projectdivisions_id=award_awards_projectdivisions.projectdivisions_id
AND award_awards.id is not null
AND projects.year='" . $config['FAIRYEAR'] . "'
@ -328,7 +328,7 @@ function getSpecialAwardsNominatedByRegistrationID($id)
");
$awardq->execute();
$projects = array();
while ($prjr = $prjq->fetch(PDO::FETCH_OBJ)) {
while ($prjr = $awardq->fetch(PDO::FETCH_OBJ)) {
$projects[$prjr->projectnumber] = array(
'id' => $prjr->projects_id,
'projectnumber' => $prjr->projectnumber,

91
register_participants.inc.php
View File

@ -23,7 +23,8 @@
?>
<?
function registrationFormsReceived($reg_id = "")
{ global $pdo;
{
global $pdo;
if ($reg_id) $rid = $reg_id;
else $rid = $_SESSION['registration_id'];
$q = $pdo->prepare("SELECT status FROM registrations WHERE id='$rid'");
@ -33,7 +34,6 @@ function registrationFormsReceived($reg_id="")
return true;
else
return false;
}
function registrationDeadlinePassed()
{
@ -45,7 +45,6 @@ function registrationDeadlinePassed()
return false;
else
return true;
}
function studentStatus($reg_id = "")
@ -68,17 +67,12 @@ function studentStatus($reg_id="")
if ($q->rowCount() < $config['minstudentsperproject'])
return "incomplete";
while($r=$q->fetch(PDO::FETCH_OBJ))
{
foreach ($required_fields AS $req)
{
if($req=="dateofbirth")
{
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
foreach ($required_fields as $req) {
if ($req == "dateofbirth") {
if ($r->$req == "0000-00-00" || !$r->$req)
return "incomplete";
}
else
{
} else {
if (!$r->$req)
return "incomplete";
}
@ -101,16 +95,13 @@ function emergencycontactStatus($reg_id="")
$sq->execute();
$numstudents = $sq->rowCount();
while($sr=$sq->fetch(PDO::FETCH_OBJ))
{
while ($sr = $sq->fetch(PDO::FETCH_OBJ)) {
$q = $pdo->prepare("SELECT * FROM emergencycontact WHERE registrations_id='$rid' AND year='" . $config['FAIRYEAR'] . "' AND students_id='$sr->id'");
$q->execute();
$r = $q->fetch(PDO::FETCH_OBJ);
foreach ($required_fields AS $req)
{
if(!$r->$req)
{
foreach ($required_fields as $req) {
if (!$r->$req) {
return "incomplete";
}
}
@ -145,10 +136,8 @@ function projectStatus($reg_id="")
if (!$q->rowCount())
return "empty";
while($r=$q->fetch(PDO::FETCH_OBJ))
{
foreach ($required_fields AS $req)
{
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
foreach ($required_fields as $req) {
if (!$r->$req) {
return "incomplete";
}
@ -182,12 +171,9 @@ $q->execute();
if ($q->rowCount() < get_value_from_array($config, 'minmentorserproject'))
return "incomplete";
while($r=$q->fetch(PDO::FETCH_OBJ))
{
foreach ($required_fields AS $req)
{
if(!$r->$req)
{
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
foreach ($required_fields as $req) {
if (!$r->$req) {
return "incomplete";
}
}
@ -195,7 +181,6 @@ $q->execute();
//if it made it through without returning incomplete, then we must be complete
return "complete";
}
function safetyStatus($reg_id = "")
@ -208,23 +193,19 @@ function safetyStatus($reg_id="")
//grab all of their answers
$q = $pdo->prepare("SELECT * FROM safety WHERE registrations_id='$rid'");
$q->execute();
while($r=$q->fetch(PDO::FETCH_OBJ))
{
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
$safetyanswers[$r->safetyquestions_id] = $r->answer;
}
//now grab all the questions
$q = $pdo->prepare("SELECT * FROM safetyquestions WHERE year='" . $config['FAIRYEAR'] . "' ORDER BY ord");
$q->execute();
while($r=$q->fetch(PDO::FETCH_OBJ))
{
if($r->required=="yes" && !$safetyanswers[$r->id])
{
while ($r = $q->fetch(PDO::FETCH_OBJ)) {
if ($r->required == "yes" && !$safetyanswers[$r->id]) {
return "incomplete";
}
}
return "complete";
}
function spawardStatus($reg_id = "")
@ -383,7 +364,8 @@ function generateProjectNumber($registration_id)
show_pdo_errors_if_any($pdo);
while ($i = $q->fetch(PDO::FETCH_OBJ)) {
if (($r->projectdivisions_id == $i->projectdivisions_id)
&&($r->projectcategories_id == $i->projectcategories_id) ) {
&& ($r->projectcategories_id == $i->projectcategories_id)
) {
$p['number']['n_used'][] = $i->projectnumber_seq;
$p['sort']['n_used'][] = $i->projectsort_seq;
}
@ -444,8 +426,12 @@ function generateProjectNumber($registration_id)
}
}
return array($p['number']['str'], $p['sort']['str'],
$p['number']['n'], $p['sort']['n']);
return array(
$p['number']['str'],
$p['sort']['str'],
$p['number']['n'],
$p['sort']['n']
);
}
function computeRegistrationFee($regid)
@ -480,19 +466,26 @@ function computeRegistrationFee($regid)
$regfee = $regfee ?? 0;
if ($config['regfee_per'] == 'student') {
if ($config['regfee'] == ''){
$config['regfee'] = 0;
}
$f = $config['regfee'] * $n_students;
$ret[] = array( 'id' => 'regfee',
$ret[] = array(
'id' => 'regfee',
'text' => "Fair Registration (per student)",
'base' => $config['regfee'],
'num' => $n_students,
'ext' => $f );
'ext' => $f
);
$regfee += $f;
} else {
$ret[] = array( 'id' => 'regfee',
$ret[] = array(
'id' => 'regfee',
'text' => "Fair Registration (per project)",
'base' => $config['regfee'],
'num' => 1,
'ext' => $config['regfee'] );
'ext' => $config['regfee']
);
$regfee += $config['regfee'];
}
@ -502,11 +495,13 @@ function computeRegistrationFee($regid)
$f = $n_tshirts * $tsc;
$regfee += $f;
if ($n_tshirts != 0) {
$ret[] = array( 'id' => 'tshirt',
$ret[] = array(
'id' => 'tshirt',
'text' => "T-Shirts",
'base' => $tsc,
'num' => $n_tshirts,
'ext' => $f);
'ext' => $f
);
}
}
}
@ -526,11 +521,13 @@ function computeRegistrationFee($regid)
}
$f = $tsc * $cnt;
$ret[] = array( 'id' => "regfee_item_{$rfi['id']}",
$ret[] = array(
'id' => "regfee_item_{$rfi['id']}",
'text' => "{$rfi['name']} (per {$rfi['per']})",
'base' => $tsc,
'num' => $cnt,
'ext' => $f);
'ext' => $f
);
$regfee += $f;
}
return array($regfee, $ret);

2
register_participants_mentor.php
View File

@ -157,7 +157,7 @@ if ($registrations_nummentors == null)
$sel = 'selected="selected"';
else
$sel = '';
echo "<option $sel value=\"\">" . i18n('Choose') . "</option>\n";
echo "<option $sel value=\"-1\">" . i18n('Choose') . "</option>\n";
for ($x = $config['minmentorsperproject']; $x <= $config['maxmentorsperproject']; $x++) {
// dont let them go less than the number we found. to go less, they must delete each record individually
if ($x < $numfound)

8
register_participants_project.php
View File

@ -128,10 +128,12 @@ if (get_value_from_array($_POST, 'action') == 'save') {
}
// now lets find out their MAX grade, so we can pre-set the Age Category
$q = $pdo->prepare("SELECT MAX(grade) AS maxgrade FROM students WHERE registrations_id='" . $_SESSION['registration_id'] . "'");
$q->execute();
$gradeinfo = $q->fetch(PDO::FETCH_OBJ);
// now lets grab all the age categories, so we can choose one based on the max grade
$q = $pdo->prepare("SELECT * FROM projectcategories WHERE year='" . $config['FAIRYEAR'] . "' ORDER BY id");
$q->execute();
@ -144,12 +146,18 @@ while ($r = $q->fetch(PDO::FETCH_OBJ)) {
if ($gradeinfo->maxgrade >= $r->mingrade && $gradeinfo->maxgrade <= $r->maxgrade) {
$projectcategories_id = $r->id;
}
}
// now select their project info
$q = $pdo->prepare("SELECT * FROM projects WHERE registrations_id='" . $_SESSION['registration_id'] . "' AND year='" . $config['FAIRYEAR'] . "'");
$q->execute();
if ($projectcategories_id == ''){
echo error(i18n('No project age categories'));
}
// check if it exists, if we didnt find any record, lets insert one
if ($q->rowCount() == 0) {
$stmt = $pdo->prepare("INSERT INTO projects (registrations_id,projectcategories_id,year) VALUES ('" . $_SESSION['registration_id'] . "','$projectcategories_id','" . $config['FAIRYEAR'] . "')");
$stmt->execute();
// now query the one we just inserted