ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed minor bug when changing user name fails

Browse source
This commit is contained in:
Marcin Kurczewski 2013-10-15 20:33:53 +02:00
parent 23ac43ecac
commit 1b3ce29b46
1 changed files with 67 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
src/Controllers/UserController.php
View file

@ -110,70 +110,80 @@ class UserController
*/ */
public function editAction($name) public function editAction($name)
{ {
$user = self::locateUser($name); try
$edited = false;
$secondary = $user->id == $this->context->user->id ? 'own' : 'all';
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ViewUser, $secondary);
$this->context->handleExceptions = true;
$this->context->transport->user = $user;
$this->context->transport->tab = 'edit';
$this->context->viewName = 'user-view';
$this->context->stylesheets []= 'user-view.css';
$this->context->subTitle = $name;
$this->context->suppliedCurrentPassword = $suppliedCurrentPassword = InputHelper::get('current-password');
$this->context->suppliedName = $suppliedName = InputHelper::get('name');
$this->context->suppliedPassword1 = $suppliedPassword1 = InputHelper::get('password1');
$this->context->suppliedPassword2 = $suppliedPassword2 = InputHelper::get('password2');
$this->context->suppliedEmail = $suppliedEmail = InputHelper::get('email');
$this->context->suppliedAccessRank = $suppliedAccessRank = InputHelper::get('access-rank');
$currentPasswordHash = $user->pass_hash;
if ($suppliedName != '' and $suppliedName != $user->name)
{ {
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserName, $secondary);
$suppliedName = Model_User::validateUserName($suppliedName);
$user->name = $suppliedName;
$edited = true;
}
if ($suppliedPassword1 != '') $user = self::locateUser($name);
{ $edited = false;
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserPassword, $secondary); $secondary = $user->id == $this->context->user->id ? 'own' : 'all';
if ($suppliedPassword1 != $suppliedPassword2) PrivilegesHelper::confirmWithException($this->context->user, Privilege::ViewUser, $secondary);
throw new SimpleException('Specified passwords must be the same');
$suppliedPassword = Model_User::validatePassword($suppliedPassword1);
$user->pass_hash = Model_User::hashPassword($suppliedPassword, $user->pass_salt);
$edited = true;
}
if ($suppliedEmail != '' and $suppliedEmail != $user->email) $this->context->handleExceptions = true;
{ $this->context->transport->user = $user;
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserEmail, $secondary); $this->context->transport->tab = 'edit';
$suppliedEmail = Model_User::validateEmail($suppliedEmail); $this->context->viewName = 'user-view';
$user->email = $suppliedEmail; $this->context->stylesheets []= 'user-view.css';
$edited = true; $this->context->subTitle = $name;
}
if ($suppliedAccessRank != '' and $suppliedAccessRank != $user->access_rank) $this->context->suppliedCurrentPassword = $suppliedCurrentPassword = InputHelper::get('current-password');
{ $this->context->suppliedName = $suppliedName = InputHelper::get('name');
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserAccessRank, $secondary); $this->context->suppliedPassword1 = $suppliedPassword1 = InputHelper::get('password1');
$suppliedAccessRank = Model_User::validateAccessRank($suppliedAccessRank); $this->context->suppliedPassword2 = $suppliedPassword2 = InputHelper::get('password2');
$user->access_rank = $suppliedAccessRank; $this->context->suppliedEmail = $suppliedEmail = InputHelper::get('email');
$edited = true; $this->context->suppliedAccessRank = $suppliedAccessRank = InputHelper::get('access-rank');
} $currentPasswordHash = $user->pass_hash;
if ($edited) if ($suppliedName != '' and $suppliedName != $user->name)
{
if ($this->context->user->id == $user->id)
{ {
$suppliedPasswordHash = Model_User::hashPassword($suppliedCurrentPassword, $user->pass_salt); PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserName, $secondary);
if ($suppliedPasswordHash != $currentPasswordHash) $suppliedName = Model_User::validateUserName($suppliedName);
throw new SimpleException('Must supply valid current password'); $user->name = $suppliedName;
$edited = true;
} }
R::store($user);
$this->context->transport->success = true; if ($suppliedPassword1 != '')
{
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserPassword, $secondary);
if ($suppliedPassword1 != $suppliedPassword2)
throw new SimpleException('Specified passwords must be the same');
$suppliedPassword = Model_User::validatePassword($suppliedPassword1);
$user->pass_hash = Model_User::hashPassword($suppliedPassword, $user->pass_salt);
$edited = true;
}
if ($suppliedEmail != '' and $suppliedEmail != $user->email)
{
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserEmail, $secondary);
$suppliedEmail = Model_User::validateEmail($suppliedEmail);
$user->email = $suppliedEmail;
$edited = true;
}
if ($suppliedAccessRank != '' and $suppliedAccessRank != $user->access_rank)
{
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ChangeUserAccessRank, $secondary);
$suppliedAccessRank = Model_User::validateAccessRank($suppliedAccessRank);
$user->access_rank = $suppliedAccessRank;
$edited = true;
}
if ($edited)
{
if ($this->context->user->id == $user->id)
{
$suppliedPasswordHash = Model_User::hashPassword($suppliedCurrentPassword, $user->pass_salt);
if ($suppliedPasswordHash != $currentPasswordHash)
throw new SimpleException('Must supply valid current password');
}
R::store($user);
$this->context->transport->success = true;
}
}
catch (Exception $e)
{
$this->context->transport->user = self::locateUser($name);
throw $e;
} }
} }