Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Albert Santoni 2014-06-20 13:36:37 -04:00
parent 83dbc789af faa12c8065
commit 82220a44a3
6 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View File

@ -41,6 +41,7 @@ define('UI_MDATA_VALUE_FORMAT_STREAM' , 'live stream');
//User types
define('UTYPE_HOST' , 'H');
define('UTYPE_ADMIN' , 'A');
define('UTYPE_SUPERADMIN' , 'S');
define('UTYPE_GUEST' , 'G');
define('UTYPE_PROGRAM_MANAGER' , 'P');

10
airtime_mvc/application/controllers/UserController.php
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

7
airtime_mvc/application/models/User.php
View File

@ -49,7 +49,12 @@ class Application_Model_User
{
return $this->isUserType(UTYPE_ADMIN);
}
public function isSuperAdmin()
{
return $this->isUserType(UTYPE_SUPERADMIN);
}
public function canSchedule($p_showId)
{
$type = $this->getType();

2
airtime_mvc/application/views/scripts/form/edit-user.phtml
View File

@ -157,7 +157,7 @@
</ul>
<?php endif; ?>
</dd>
<button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
</dl>
<button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
</form>
</div>

3
airtime_mvc/application/views/scripts/user/add-user.phtml
View File

@ -26,6 +26,9 @@
</table>
</div>
</div>
<div class="user-data" id="user_details_superadmin_message" style="display: none; margin-top: 105px; text-align: center;">
<?=sprintf(_("Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."), "/billing/client");?>
</div>
<div class="user-data simple-formblock" id="user_details">
<?php echo $this->successMessage ?>
<fieldset class="padded">

18
airtime_mvc/public/js/airtime/user/user.js
View File

@ -4,6 +4,17 @@ function populateForm(entries){
$('.errors').remove();
$('.success').remove();
if (entries.type === 'S')
{
$("#user_details").hide();
$("#user_details_superadmin_message").show();
$('#type').attr('disabled', '1');
} else {
$("#user_details").show();
$("#user_details_superadmin_message").hide();
$('#type').removeAttr('disabled');
}
$('#user_id').val(entries.id);
$('#login').val(entries.login);
$('#first_name').val(entries.first_name);
@ -23,12 +34,6 @@ function populateForm(entries){
$('#password').val("");
$('#passwordVerify').val("");
}
if (entries.login === 'admin')
{
$('#type').attr('disabled', '1');
} else {
$('#type').removeAttr('disabled');
}
}
function rowClickCallback(row_id){
@ -66,6 +71,7 @@ function rowCallback( nRow, aData, iDisplayIndex ){
} else if ( aData['type'] == "S" )
{
$('td:eq(3)', nRow).html( $.i18n._('Super Admin') );
$('td:eq(4)', nRow).html(""); //Disable deleting the super admin
}
return nRow;