arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,342 Commits 9 Branches 6 Tags 30 MiB
fc503f505c
Commit Graph

147 Commits

Author SHA1 Message Date
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
jacob
1972323a65 Correction on how the multiselect fields are described 2010-11-17 16:12:10 +00:00
jacob
2848ed177d Quick correction on how lang is described in the user_get_fields function 2010-11-17 15:52:02 +00:00
jacob
0ff766175b Updates on the data that gets returned when describing the user structure 
Modified user code to properly save the volunteer availability data
Updated the UI to properly use the user_save function to update judge and volunteer info
 2010-11-16 22:51:42 +00:00
james
61fba8a93c json_decode always returns an object unless you tell it to give you an associative array (2nd parameter) 
give multi-select-lists as full object's where appropriate (might be more too? special awards?)
 2010-11-16 21:19:16 +00:00
jacob
a0c64963e0 small mod on user save function 2010-11-16 20:54:46 +00:00
jacob
cf2e2eb6db Modified some of the user preference data as it's stored in the user array 2010-11-16 20:42:40 +00:00
jacob
1e2340beb1 Some updates on the interface for creating conferences 
Modified the user object, correcting some issues with judging availability and volunteer availability.
 2010-11-16 19:53:26 +00:00
jacob
a7a7735347 Added grouping to the list of user information fields 2010-11-10 18:47:01 +00:00
jacob
c3cf698524 Updates converting from year to conference id. 2010-11-03 17:18:02 +00:00
jacob
d8df2be109 Quick patch on my last commit. 2010-11-01 15:28:51 +00:00
jacob
4f35702bbf Added API function for modifying account information 2010-10-28 21:22:12 +00:00
jacob
d0d3c7b7c4 Separated the functionality of school selection from the pages, implemented it in the API 2010-10-27 16:40:17 +00:00
jacob
f1b9123835 Added a couple of field descriptions in the user fields 2010-10-26 19:38:08 +00:00
jacob
92d46976f7 Separating judging timeslot selection into the user object 2010-10-26 18:15:04 +00:00
james
3971df267f Add registration field roles to testapi.php page 
Fix char(2) field detection
 2010-10-25 23:55:38 +00:00
jacob
bb40bf4da1 Updated the user_load and user_save functions to handle judges special awards selection. 
Updated judge_special_awards.php to use that method rather than direct SQL queries.
 2010-10-25 18:07:55 +00:00
jacob
cee52c6b67 Updated function for getting user info structure. Used it in the user_load function. 2010-10-22 18:43:17 +00:00
jacob
bae700dead Starting on code for getting relevant field descriptions for user data depending on 
the roles for that user.
 2010-10-21 21:56:09 +00:00
jacob
3867b9b539 Fixes on the modified user_load function 2010-10-21 16:08:41 +00:00
jacob
78bf0c8751 Modified user_load to load only fields relevant to the roles that the user has 2010-10-20 19:44:18 +00:00
james
a792b763a1 remove username from the standard user fields 
add 'required_fields' array to the user object so the API users know which fields are needed
 2010-10-20 17:25:43 +00:00
james
c367656d02 also load committee whether its active or not 2010-10-15 01:46:53 +00:00
james
ab068fdfbb Fix updateSessionRoles once and for all 2010-10-15 01:31:07 +00:00
james
759ecc0a1a Oops its user_load not users_load 2010-10-14 23:06:21 +00:00
james
f225787e39 Properly update the session roles from the API side 
Allow (u) to be empty if we dont have it, we can get it from the session users_id
 2010-10-14 20:38:48 +00:00
james
241618c74f Fix saving active/deactive roles 
Fix the session roles when roles are modified and only put 'active' ones into the session roles array
 2010-10-14 20:31:10 +00:00
james
ba793ac8e0 Fix rolestasks saving of the level for each item 
Fix tableeditor css to only modify anything in the tableeditor/tableview classes
Fix saving language for volunteers
Fix error message for saving phone numbers on organization and personal
Fix schoolfeedback and schoolinfo pages
Update school select tab, better html and school options list
Fix css for tertiary menu to show difference between selected and non-selected
 2010-10-14 19:42:20 +00:00
jacob
01d70abf74 Added teacher interface in olympics 
UI touch ups
 2010-10-14 17:51:56 +00:00
jacob
9229b1665b Added user settings config for science olympic judges 2010-10-13 21:01:01 +00:00
jacob
607834bc0e updating _SESSION when user roles are modified 2010-10-08 20:28:56 +00:00
jacob
7d5f5cccd0 Removed some usage of old user functions. Added role handling in testapi.php 2010-10-08 18:43:20 +00:00
jacob
835047f3a8 Role functions debugged in account.inc.php, using them in user_main.php and user.inc.php 2010-10-08 16:07:07 +00:00
jacob
177f49f805 moving code for modifying user roles into accounts.inc.php. Incomplete. Broken. 2010-10-07 22:02:45 +00:00
jacob
98dcfd6399 added some skeletal function stubs 2010-10-06 20:01:15 +00:00
jacob
daa714e5ef Added functionality in the main page for managing roles 2010-10-06 17:05:54 +00:00
jacob
052024b6d6 Updates for letting users register in roles. Incomplete 2010-10-05 21:46:29 +00:00
jacob
d2afb6a94e Modifications on how roles get handled 2010-10-05 15:04:15 +00:00
james
a92544bbea Implement user/edit 
Remove saving some stuff from user_save
 2010-10-01 19:42:52 +00:00
james
895bcc36e2 Add user/view API 
Change user_load() to explicitly load specific values instead of all values, as there's now some fields that need to be deleted but we cant delete them yet...
 2010-10-01 19:28:26 +00:00
jacob
9db042fc10 Modifications on editing users 2010-10-01 18:47:28 +00:00
james
70d359c15b PHP 5.3 DEPRECATED split() so, convert all split()'s to explode()'s 2010-09-10 19:38:56 +00:00
james
88cdfebdea Move team management to teacher interface 2010-09-01 17:53:35 +00:00
james
de564f3c55 More user stuff to get things workinga gain 
Add a API module for science olympics
 2010-08-31 20:12:41 +00:00
james
ec3be0f10f More changes to be able to at least barely use the system again 2010-08-31 19:41:32 +00:00
james
81f3f3235a Fix logging in and switching conferences, man, this is becoming a mess 2010-08-31 17:35:58 +00:00
james
4bf2897f18 Add changes for API Authenication and force API to use SSL 2010-08-24 16:04:12 +00:00
dave
9f3dc6c9dc Fix user loading 2010-08-19 22:56:33 +00:00
james
78614ef309 Set some redirects to user_edit instead of user_account 
Disable the importantdates box again
 2010-08-19 20:07:08 +00:00
dave
ceb80636e1 Start of the new user editor, some works, most things don't. 2010-08-08 09:09:49 +00:00
james
2c7e23b276 Fix some user/account bugs 
Start fixing the schoolstudents page (it now adds users, but it doesnt re-load them or edit htem or delete them)
 2010-07-27 19:06:36 +00:00
james
5207e193fc Authenticate and check for superuser on all /super pages 2010-07-15 19:52:44 +00:00
dave
28004d6fe8 typo 2010-07-15 09:18:04 +00:00
dave
ba2738b813 Fix redirection on login and on forced password changes. 2010-07-15 09:18:02 +00:00
dave
dd6228f5d7 Implement password expired, force the user to set a new password. 2010-07-15 09:17:59 +00:00
jacob
a403202786 Updates to work with new user system. Also updated the committees_link table fieldname to use "accounts_id" instead of "users_uid" and updated code accordingly. 2010-07-14 21:04:50 +00:00
dave
7c918c0167 update the user personal information editor, the superuser edit flags 
for admin/config/super don't quite work yet.
 2010-07-13 03:30:26 +00:00
dave
88f8ce044b Update role activate/deactive page 2010-07-13 03:30:25 +00:00
dave
b1f2718a3c Users can login and logout and look at their home pages. 2010-07-13 03:30:11 +00:00
jacob
887610f5e3 Added script for copying/converting user data into the new format, populating the accounts and user_roles table 
Modified user.inc and user_login to handle authentication on the new accounts table
 2010-07-06 15:32:26 +00:00
jacob
0503030a35 Updates for managing students 2010-06-16 21:33:43 +00:00
james
fbba2e7e20 Needed to add a "no" value to the "deleted" field when creating a new user 2010-06-09 16:14:01 +00:00
dave
f05b4ba677 Smarter user name logic 2010-01-27 20:24:13 +00:00
dave
ed6879754d Remember the page for password changes too, and take them there 2010-01-24 06:47:09 +00:00
dave
54fe3bf509 Make user_auth_required aceept and array and return the auth user type. 
If the user is required to login before visiting a page, remember the
page, and take them to it once they login.
 2010-01-24 06:47:06 +00:00
james
c962286321 Save committee member "complete" status 2009-12-03 23:19:06 +00:00
james
99114c7242 Completely convert the old communication module over to the new system... (almost). 
TODO: switch the "send" to the new dialog-style preview and confirmation, instead of the old one, but at least it works!
 2009-12-02 22:17:20 +00:00
james
785f5bbf35 Show display and save the "preferred language" field. 2009-11-28 20:07:02 +00:00
james
c4f5ed2ab7 load_by_username also loads by email 
create_user also sets email address if username looks like an email
 2009-10-22 19:03:29 +00:00
james
c9062e127b Implement working prospect list, and ability to remove indidivuals from the list or empty the entire list 2009-10-11 18:19:04 +00:00
james
663420b078 All of tonights wackload of changes 2009-10-11 03:32:14 +00:00
james
5aa7cf541a Remove debugging from user.inc 
Begin the searching in the prospecting tool
 2009-10-09 00:42:47 +00:00
james
383581ef7f Fix user_save to automatically create user_<type> records for each type before it tries to save the extra info for that type 2009-10-08 22:44:21 +00:00
dave
39c350c91f - typo 2009-09-26 20:41:54 +00:00
dave
aaac5b4806 - Prevent a warning if the user has no types on delete 2009-09-26 20:41:36 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
dave
986ce4ef44 - user.inc.php needs to generate a password without including common.inc.php 
(install3 doesn't like including that file).  That's ok, because eventually
  all passwd handling will be done through user.inc.php (and the generate could
  even be inlined into set_password). But for now, just copy the existing
  generatePassword, and call it something different so the function names don't
  clash.
 2008-07-09 18:24:49 +00:00
dave
a9318b6303 - Move all the password handling code into one function (not duplicated/spread 
over 3 files)
- Fix a bug to always save the old password (unless it was a reset password)
- Fix a bug to save the old password even when the user sets a new one
 2008-07-09 17:02:11 +00:00
james
5ed0135442 Better fix for the password expiration problem 2008-07-09 14:51:48 +00:00
james
e1055150c9 Dont make newly created users passwords expire as soon as they login 
Allow firstname and lastname to be POSTed through on the install3 script so the name can be set instead of using 'Superuser Account'
 2008-07-08 19:29:02 +00:00
dave
15a56ce13f - Add First Aid and CPR data collection to the user table. 
- Modify the config so a committee can enable it for volutneers and committee
  members
 2008-02-23 03:28:43 +00:00
james
3b55ddd4a7 Use single quotes for consistency 2008-02-15 23:11:16 +00:00
james
a118acc21c Add the missing 'Gender' field to the user personal profile page, as well as save it :) 2008-02-15 23:08:33 +00:00
dave
7f7c3c53e1 - Change the password expiry mechanism to always check 
{$type}_password_expiry_days.  This allows the $config variable to be updated
  and everyones password will expire based on the new value.  To implement
  this, the password expiry column in the users table has been changed to
  passwordset, and a PHP script is used to convert the expiry dates to set
  dates (based on the _password_expiry_days)
- Cleanup the password entry checking
- Load all config variables for the db_update.php script.  Just in case an
  update script wants access to $config
 2007-12-21 08:38:13 +00:00
james
337d5acac2 Close php 2007-12-20 22:47:21 +00:00
dave
89675213bf - Make address2 never required, and setup the system so we can easily add more 
fields that shoudl never be required.  I do it this way so I don't have to duplicate
  the field select array in user.inc.php for the requried fields too.
- Swap the City and Address2 locations so that Address1 and Address2 are on top
  of each other, instead of beside each other.
 2007-12-12 22:50:54 +00:00
dave
9fffa6755d - Call them 'fair's not 'region's.. to assist linking fairs together. 
- This patch references some config variables that don't exist yet, that's ok,
  we dont' want anyone turning these on yet.
 2007-12-12 04:15:17 +00:00
dave
1dc1b47d05 - Fix multirole creation. If a user tries to create an account, and they 
already exist, they will be guided through the process of adding a role to
  their existing account.
- Do a database update, and merge anyone who has managed to create 2 accounts
  into a single account.
- Still testing this, but it seems to be working
 2007-12-12 03:01:44 +00:00
dave
55983aca38 - Change the user editor, read the fields and required fields from a config 
variable, this will allow the committee to specify exactly what they
  wish to collect (and which fields are requried)
- Insert config variables for volunteers and committee
 2007-11-26 02:28:45 +00:00
dave
f6cc5d7326 - Cleanup how variables are handled/rolled/etc. Convert the require_vars 
function in the config editor to one that checks where ALL variables marked
  with year=-1 exist for FAIRYEAR.  If it doesn't, it creates them.  This
  function gets called in three places:
 	- On installation
	- On rollover
	- Whenever the database is updated
 We should, now, be able to just insert new variables with year=-1, and they
 will be automatically updated for the current year with the default value.
 (no more going into the variable editor to make sure the copy is done).

- Fix the superuser account creation in the install script
 2007-11-25 19:53:15 +00:00
james
8a0a3dbc74 Save organization in users table 
Dont save emailprivate in users table (its in users_committee)
 2007-11-19 21:12:09 +00:00
dave
1a246cba5d - Fixup the location: redirections in user_auth_required() 2007-11-19 07:01:51 +00:00
dave
2715d67aef - Fix login check for an expired password 
- Allow user_personal.php to handle committee members
- Add password field if the editer in user_personal has access_super
- Allow a committee member to edit anyone in user_personal.php
- Convert auth_required to user_auth_required, and check for both a user type
  and an access level (if committee)
- Convert the committee to the new user system (BIG change :)
- Remove the ^M from admin/committees.php
 2007-11-17 21:59:59 +00:00
dave
0d8f704cd8 - remember when a full load on a user is done 
- user mysql_escape_string on all fields before saving (oops!) :)
- add a committee login function to set SESSION variables.
 2007-11-16 22:19:58 +00:00
dave
93c05cbe2f - New user and volunteer signup system 2007-11-16 06:30:42 +00:00