Skip to content

Patch of bug #544 Changed all setError calls back to error calls #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steinkel merged 1 commit into from
Apr 25, 2017
Merged

Patch of bug #544 Changed all setError calls back to error calls #545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/Shell/UsersShell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function resetAllPasswords()
{
$password = Hash::get($this->args, 0);
if (empty($password)) {
$this->setError(__d('CakeDC/Users', 'Please enter a password.'));
$this->error(__d('CakeDC/Users', 'Please enter a password.'));
}
$hashedPassword = $this->_generatedHashedPassword($password);
$this->Users->updateAll(['password' => $hashedPassword], ['id IS NOT NULL']);
Expand All @@ -135,10 +135,10 @@ public function resetPassword()
$username = Hash::get($this->args, 0);
$password = Hash::get($this->args, 1);
if (empty($username)) {
$this->setError(__d('CakeDC/Users', 'Please enter a username.'));
$this->error(__d('CakeDC/Users', 'Please enter a username.'));
}
if (empty($password)) {
$this->setError(__d('CakeDC/Users', 'Please enter a password.'));
$this->error(__d('CakeDC/Users', 'Please enter a password.'));
}
$data = [
'password' => $password
Expand All @@ -163,10 +163,10 @@ public function changeRole()
$username = Hash::get($this->args, 0);
$role = Hash::get($this->args, 1);
if (empty($username)) {
$this->setError(__d('CakeDC/Users', 'Please enter a username.'));
$this->error(__d('CakeDC/Users', 'Please enter a username.'));
}
if (empty($role)) {
$this->setError(__d('CakeDC/Users', 'Please enter a role.'));
$this->error(__d('CakeDC/Users', 'Please enter a role.'));
}
$data = [
'role' => $role
Expand Down Expand Up @@ -215,7 +215,7 @@ public function passwordEmail()
{
$reference = Hash::get($this->args, 0);
if (empty($reference)) {
$this->setError(__d('CakeDC/Users', 'Please enter a username or email.'));
$this->error(__d('CakeDC/Users', 'Please enter a username or email.'));
}
$resetUser = $this->Users->resetToken($reference, [
'expiration' => Configure::read('Users.Token.expiration'),
Expand All @@ -227,7 +227,7 @@ public function passwordEmail()
$this->out($msg);
} else {
$msg = __d('CakeDC/Users', 'The password token could not be generated. Please try again');
$this->setError($msg);
$this->error($msg);
}
}

Expand All @@ -241,7 +241,7 @@ protected function _changeUserActive($active)
{
$username = Hash::get($this->args, 0);
if (empty($username)) {
$this->setError(__d('CakeDC/Users', 'Please enter a username.'));
$this->error(__d('CakeDC/Users', 'Please enter a username.'));
}
$data = [
'active' => $active
Expand Down Expand Up @@ -316,7 +316,7 @@ protected function _updateUser($username, $data)
{
$user = $this->Users->find()->where(['username' => $username])->first();
if (empty($user)) {
$this->setError(__d('CakeDC/Users', 'The user was not found.'));
$this->error(__d('CakeDC/Users', 'The user was not found.'));
}
$user = $this->Users->patchEntity($user, $data);
collection($data)->filter(function ($value, $field) use ($user) {
Expand All @@ -338,15 +338,15 @@ public function deleteUser()
{
$username = Hash::get($this->args, 0);
if (empty($username)) {
$this->setError(__d('CakeDC/Users', 'Please enter a username.'));
$this->error(__d('CakeDC/Users', 'Please enter a username.'));
}
$user = $this->Users->find()->where(['username' => $username])->first();
if (isset($this->Users->SocialAccounts)) {
$this->Users->SocialAccounts->deleteAll(['user_id' => $user->id]);
}
$deleteUser = $this->Users->delete($user);
if (!$deleteUser) {
$this->setError(__d('CakeDC/Users', 'The user {0} was not deleted. Please try again', $username));
$this->error(__d('CakeDC/Users', 'The user {0} was not deleted. Please try again', $username));
}
$this->out(__d('CakeDC/Users', 'The user {0} was deleted successfully', $username));
}
Expand Down