Merge branch 'whmcs-login' into whmcs-login-saas

This commit is contained in:
Albert Santoni 2014-06-20 13:36:37 -04:00
commit 82220a44a3
6 changed files with 32 additions and 9 deletions

View file

@ -63,7 +63,9 @@ class UserController extends Zend_Controller_Action
$user->setPassword($formData['password']);
}
if (array_key_exists('type', $formData)) {
$user->setType($formData['type']);
if ($formData['type'] != UTYPE_SUPERADMIN) { //Don't allow any other user to be promoted to Super Admin
$user->setType($formData['type']);
}
}
$user->setEmail($formData['email']);
$user->setCellPhone($formData['cell_phone']);
@ -189,6 +191,12 @@ class UserController extends Zend_Controller_Action
}
$user = new Application_Model_User($delId);
// Don't allow super admins to be deleted.
if ($user->isSuperAdmin())
{
return;
}
# Take care of the user's files by either assigning them to somebody
# or deleting them all