tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UserController: Let the form validate the user's name 

refs #8826
This commit is contained in:
Johannes Meyer 2015-05-28 16:28:43 +02:00
parent 385042ea92
commit ad6b4016f0
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
application/controllers/UserController.php
View File

@ -4,6 +4,7 @@
use \Exception; use \Exception;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotFoundError;
use Icinga\Forms\Config\User\CreateMembershipForm; use Icinga\Forms\Config\User\CreateMembershipForm;
use Icinga\Forms\Config\User\UserForm; use Icinga\Forms\Config\User\UserForm;
use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Data\DataArray\ArrayDatasource;
@ -185,15 +186,15 @@ class UserController extends AuthBackendController
$userName = $this->params->getRequired('user'); $userName = $this->params->getRequired('user');
$backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable'); $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Updatable');
$row = $backend->select(array('user_name', 'is_active'))->where('user_name', $userName)->fetchRow();
if ($row === false) {
$this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
}
$form = new UserForm(); $form = new UserForm();
$form->setRedirectUrl(Url::fromPath('user/show', array('backend' => $backend->getName(), 'user' => $userName))); $form->setRedirectUrl(Url::fromPath('user/show', array('backend' => $backend->getName(), 'user' => $userName)));
$form->setRepository($backend); $form->setRepository($backend);
$form->edit($userName, get_object_vars($row))->handleRequest();
try {
$form->edit($userName)->handleRequest();
} catch (NotFoundError $_) {
$this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
}
$this->view->form = $form; $this->view->form = $form;
$this->render('form'); $this->render('form');
@ -208,14 +209,15 @@ class UserController extends AuthBackendController
$userName = $this->params->getRequired('user'); $userName = $this->params->getRequired('user');
$backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible'); $backend = $this->getUserBackend($this->params->getRequired('backend'), 'Icinga\Data\Reducible');
if ($backend->select()->where('user_name', $userName)->count() === 0) {
$this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
}
$form = new UserForm(); $form = new UserForm();
$form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName()))); $form->setRedirectUrl(Url::fromPath('user/list', array('backend' => $backend->getName())));
$form->setRepository($backend); $form->setRepository($backend);
$form->remove($userName)->handleRequest();
try {
$form->remove($userName)->handleRequest();
} catch (NotFoundError $_) {
$this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
}
$this->view->form = $form; $this->view->form = $form;
$this->render('form'); $this->render('form');