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

Fix for adding users that have been deleted.... i think.

Browse Source
This commit is contained in:
james 2011-01-19 19:46:48 +00:00
parent f47f2c4ceb
commit c53e9611e5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/user_editor_window.php
View File

@ -102,6 +102,11 @@ echo mysql_error();
* so we'll never add a judge/committee role to a student */ * so we'll never add a judge/committee role to a student */
user_create($type, $username, $u); user_create($type, $username, $u);
} }
} else {
//undelete them?
mysql_query("UPDATE users SET deleted='no' WHERE id='$r->id'");
//then load them?
$u = user_load($r->id);
} }
} else { } else {
$u = user_create($type, $username); $u = user_create($type, $username);

5
user.inc.php
View File

@ -211,6 +211,9 @@ function user_load($user, $uid = false)
/* Turn the type into an array, because there could be more than one */ /* Turn the type into an array, because there could be more than one */
$ts = explode(',', $ret['types']); $ts = explode(',', $ret['types']);
//ts could be FALSE, so check it, and switch to an empty array if it is
if(!$ts) $ts=array();
$ret['types'] = $ts; /* Now we can use in_array('judge', $ret['types']) ; */ $ret['types'] = $ts; /* Now we can use in_array('judge', $ret['types']) ; */
/* Convenience */ /* Convenience */
@ -465,10 +468,12 @@ function user_save(&$u)
if($u['password'] != $u['orig']['password']) if($u['password'] != $u['orig']['password'])
user_set_password($u['id'], $u['password']); user_set_password($u['id'], $u['password']);
if(count($u['types'])) {
/* Save types */ /* Save types */
foreach($u['types'] as $t) { foreach($u['types'] as $t) {
call_user_func("user_save_$t", $u); call_user_func("user_save_$t", $u);
} }
}
/* Should we do this? */ /* Should we do this? */
/* Record all the data in orig that we saved */ /* Record all the data in orig that we saved */