diff --git a/public/js/app.js b/public/js/app.js index a114bc2fb0..1fa78a24df 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -229,7 +229,9 @@ window.habitrpg = angular.module('habitrpg', $rootScope.$broadcast('responseError', "The site has been updated and the page needs to refresh. The last action has not been recorded, please refresh and try again."); } else if (response.data.code && response.data.code === 'ACCOUNT_SUSPENDED') { - $rootScope.openModal('suspended',{keyboard: false,backdrop: 'static',size: 'lg',controller:'AuthCtrl'}); + confirm(response.data.err); + localStorage.clear(); + window.location.href = '/logout'; // 400 range? } else if (response < 500) { diff --git a/src/controllers/hall.js b/src/controllers/hall.js index cc87862707..d3a2796476 100644 --- a/src/controllers/hall.js +++ b/src/controllers/hall.js @@ -67,7 +67,7 @@ api.updateHero = function(req,res,next) { && User.schema.paths[req.body.itemPath]) { shared.dotSet(member, req.body.itemPath, req.body.itemVal); // Sanitization at 5c30944 (deemed unnecessary) } - if (req.body.auth.blocked) member.auth.blocked = req.body.auth.blocked; + if (_.isBoolean(req.body.auth.blocked)) member.auth.blocked = req.body.auth.blocked; member.save(cb); } ], function(err, saved){ diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index 8f64e3b639..b5728fb551 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -8,18 +8,6 @@ script(type='text/ng-template', id='modals/reset.html') button.btn.btn-default(ng-click='$close();')=env.t('neverMind') button.btn.btn-danger(ng-click='$close(); reset()')=env.t('resetDo') -script(type='text/ng-template', id='modals/suspended.html') - .modal-header - h4 Account Suspended - .modal-body - p This account has been suspended. Please contact leslie@habitrpg.com for further assistance. - hr - p Account UUID: {{::user._id}} - a(ng-click='logout()') - span.glyphicon.glyphicon-log-out - |  - =env.t('logout') - script(type='text/ng-template', id='modals/restore.html') .modal-header h4=env.t('fixValues')