Commit Graph

2311 Commits

Author SHA1 Message Date
james
b71a0dc994 email_send should send html version of email if we have it, also dont translate the subject & body thorugh i18n() 2011-02-17 16:36:17 +00:00
jacob
dfb54ec9df Added date of birth, food requriements, t-shirt size and medical alert info to the users table as student fields 2011-02-16 19:08:58 +00:00
james
93f4703b71 Add account_list (temporary hack)
user_invite can find users by username OR by email address
if the account is found, but user_load fails, thats okay, it just means that they dont have any roles yet
2011-02-16 18:39:59 +00:00
james
4ac3a8f974 Revert Dennis's commit - improper line endings caused the whole files to be replaced 2011-02-16 16:59:33 +00:00
dennis
ce35d4ccee Changes by Dennis. Required to provide for a clean install on Windows server ISPs (also my Windows xp workstation with PHP and mySQL). There should be NO changes to functionality. 2011-02-10 14:46:58 +00:00
james
221213e1d8 Add grade to participant required fields 2011-02-02 23:19:15 +00:00
james
ebc7d7ad1d Fix the other two places that used the array_diff_assoc incorrectly (by simply removing it) 2011-02-01 21:59:06 +00:00
james
b4d018f771 Fix user_save to properly update the status of all roles that the user has
Fix special awards tab to load&save properly
Fix volunteer positions tab to load&save properly
2011-02-01 20:10:11 +00:00
jacob
347b12ab2e Oops - only update the session user id for the newly created user if it's the same account and the same conference as the one doing the user creation 2011-01-28 20:16:43 +00:00
james
8714fe7a1d Fix invitation emails 2011-01-28 20:02:21 +00:00
jacob
ceb55a49a6 Add a user id to the session when someone adds a role (and thus a user) to an account that does not currently correspond to any user records. 2011-01-28 19:57:09 +00:00
james
462427c1b1 Fix divisions insert check 2011-01-28 18:22:18 +00:00
james
cb6796b95d Languages group fix 2011-01-28 18:12:30 +00:00
james
349af780ed Email address fix for user_list (now show accounts.username and accounts.email) 2011-01-28 18:01:31 +00:00
jacob
552ce74d96 Couple of quick fixes:
- the "languages" field needed to be regrouped when applied to a Science Olympics account
 - Modified account/create api to test all errors and return them as a group, rather than exiting on the first error
2011-01-27 22:55:42 +00:00
james
a5bd01f621 Bunch of fixes 2011-01-26 23:15:58 +00:00
james
97076cbe32 Add function to copy schools from a different conference.
fix the user_load_by_uid calls, but im not sure if simply replacing them with user_load() is the 'right' fix.. but at least the page loads now :p
2011-01-11 20:10:51 +00:00
james
9230b559db Forward port mysql 5.1 16 character username limit difference 2010-12-30 14:24:05 +00:00
james
e0f0a5dd90 Re-do user_invite to allow users to be invited by admin/config's - its not complete, but its working, it still needs to send emails though to tell the user of their new role, but i need to think on how to do that because if its a new account then it could be just a username/password without an email, but if its invited then the email __IS__ the username, but we shouldnt rely on the email being valid until its been confirmed via the email confirmation.. ugh?!?! 2010-12-21 23:16:20 +00:00
james
8f2e8f985b Adjust wording slightly 2010-12-21 22:57:46 +00:00
james
beac7bb44e Forward port the "auto-select novice" change 2010-12-16 16:56:49 +00:00
james
459eb17e98 Add a hidden config option (put it in data/config.inc.php) to not require API access over SSL 2010-12-08 21:18:07 +00:00
james
8f17e80169 If there's less than 2 conferences (specifically, 1 conference) then dont show the conference selector in the header 2010-12-07 19:29:02 +00:00
james
673b0b51f8 Make conference saving work again 2010-12-07 19:26:39 +00:00
james
e278505bc0 Simplify the user list and make it work again 2010-12-06 20:26:39 +00:00
james
39ff0dd2ce More fixes to (hopefully) allow a superuser to add admin/config roles 2010-12-06 19:33:38 +00:00
james
0acf5a5661 Allow superuser to always access admin/config even if its not in their session roles 2010-12-06 18:33:02 +00:00
jacob
8817e5eb86 Updated the user loading to only include fields that are relevant to the roles, accounting for the fact that certain roles (eg. juge) have different fields for different conference types. 2010-12-02 20:28:19 +00:00
jacob
336cec80e0 Quick fix for an error showing up in some field types for the api
Added an error catch, re-indexing the languages array when a user is saved, to ensure that the indecies are numeric
2010-12-02 18:43:35 +00:00
jacob
77a3c77e69 oops - forgot to remove debugging remarks 2010-12-02 17:54:01 +00:00
jacob
dfd468505c Modified the api loging for better readability and to include the output 2010-12-02 17:50:16 +00:00
jacob
128fc6a3b5 Added logging to the API, and separated the log file creation into a common function 2010-12-02 17:25:23 +00:00
jacob
a6544f40c4 Added an error check in saving the user, avoiding duplicate keys on an insert if bad data is passed in. Touched up the error output to make finding errors a pinch easier. 2010-12-02 16:33:04 +00:00
jacob
6b94ef5c76 Added abillity to uninvite a user from a particular role where allowed, and api function (/user/uninvite)
Added function user_list_modifiable, which returns a list of user info that the current user is allowed to modify (users.inc.php)
Added api for calling user_list_modifiable (/user/list)
2010-12-01 19:40:45 +00:00
jacob
39f53e4168 Added teacher abillity to add/remove students
Updated the user_save to output more meaningful errors
Updates on 'questions' and 'pagetext' tables to change the 0 conference ID to -1, matching the -1 year
2010-11-29 22:54:12 +00:00
jacob
1e1fa0097a Updated super/conferences.php, adding a rollback if there are errors in copying a conference.
Added compvars.php, which is a test script for comparing data after it's been rolled over from one conference to another - used to test the rollover in super/conferences.php.
Updated usage of the role "student", replacing it with "participant".
2010-11-26 16:50:17 +00:00
james
57561c829d Add copyoriginal and copyparent to API 2010-11-25 20:47:32 +00:00
james
46b39f81e0 Add copyoriginal, copyparent, and notes(currently unused) to conferences table
Add code in create conference and copy conference to set copyoriginal and copyparent
Add missing json_decode to API (we expect ALL arrays being POSTED to be json encoded)
2010-11-25 20:45:44 +00:00
jacob
e9f46edb0e Added code for inviting users, access to it through the api 2010-11-23 20:58:38 +00:00
jacob
8f255f4eb8 Added an icon for conference management. Added fields in the config for teachers 2010-11-18 22:46:46 +00:00
jacob
0720cb0ae0 Updated super/conferences to properly manage existing conferences, and touched up it's UI to fit the site theme 2010-11-18 20:44:48 +00:00
james
63178e596b Add dictionary documentation
Update Test API page to link to apidocs and dictionary
2010-11-18 17:24:18 +00:00
jacob
1701e965ef Added a quick link to test api/registration/dictionary 2010-11-18 17:10:53 +00:00
jacob
8b15620f69 Added the api/registration/dictionary functionality 2010-11-18 17:00:26 +00:00
jacob
e730a5ab05 Added the rollover for the fiscal year, and removed the rollover for the fair year 2010-11-18 16:38:12 +00:00
jacob
f6eee9666a Updated to properly use the user_save function 2010-11-18 16:02:11 +00:00
jacob
31baeaa715 SQL error fix 2010-11-18 15:59:22 +00:00
james
a8b0adce05 fix typo 2010-11-17 23:47:37 +00:00
jacob
1b098f85b3 The API depends on a return value from the user_save function, which was not being generated.
Updated user_save to return 'ok' on success, and an error message otherwise.
Updated api.php to make use of user_save's retun value.
2010-11-17 21:02:32 +00:00
jacob
6c5669c3f4 Arg - accidentally committed with a data dump... 2010-11-17 16:37:44 +00:00