Skip to content

Commit

Permalink
Preselect previous dird after session timeout
Browse files Browse the repository at this point in the history 
This preselects the previous dird connected to after session timeout
in login form.
  • Loading branch information
@frb121
frb121 committed Jun 30, 2016
1 parent 5c8cbab commit ee2ff4a
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 50 deletions.
3 changes: 2 additions & 1 deletion module/Auth/src/Auth/Controller/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ public function loginAction()
$this->layout('layout/login');

$config = $this->getServiceLocator()->get('Config');
$dird = $this->params()->fromQuery('dird') ? $this->params()->fromQuery('dird') : null;

$form = new LoginForm($config['directors']);
$form = new LoginForm($config['directors'], $dird);

$request = $this->getRequest();

Expand Down
46 changes: 33 additions & 13 deletions module/Auth/src/Auth/Form/LoginForm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ class LoginForm extends Form

protected $config;
protected $directors;
protected $dird;
protected $availableLocales;
protected $locale;

public function __construct($config=null, $name=null)
public function __construct($config=null, $dird=null)
{

$this->config = $config;
$this->dird = $dird;
$this->directors = $this->getDirectors();
$this->availableLocales = $this->getAvailableLocales();
$this->locale = $this->determineLanguage();
Expand All @@ -62,19 +64,37 @@ public function __construct($config=null, $name=null)
);
}
else {
$this->add(array(
'name' => 'director',
'type' => 'select',
'options' => array(
'label' => 'Director',
'empty_option' => 'Please choose a director',
'value_options' => $this->directors,
),
'attributes' => array(
'id' => 'director',
if(isset($this->dird)) {
$this->add(array(
'name' => 'director',
'type' => 'select',
'options' => array(
'label' => 'Director',
'empty_option' => 'Please choose a director',
'value_options' => $this->directors,
),
'attributes' => array(
'id' => 'director',
'value' => $this->dird
)
)
)
);
);
}
else {
$this->add(array(
'name' => 'director',
'type' => 'select',
'options' => array(
'label' => 'Director',
'empty_option' => 'Please choose a director',
'value_options' => $this->directors,
),
'attributes' => array(
'id' => 'director',
)
)
);
}
}

if(isset($this->locale)) {
Expand Down
8 changes: 4 additions & 4 deletions module/Client/src/Client/Controller/ClientController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$clients = $this->getClientModel()->getClients();
Expand Down Expand Up @@ -81,7 +81,7 @@ public function detailsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

return new ViewModel(
Expand All @@ -97,7 +97,7 @@ public function statusAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$clientname = $this->params()->fromQuery('client');
Expand All @@ -116,7 +116,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
4 changes: 2 additions & 2 deletions module/Dashboard/src/Dashboard/Controller/DashboardController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

return new ViewModel(
Expand Down Expand Up @@ -109,7 +109,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
8 changes: 4 additions & 4 deletions module/Director/src/Director/Controller/DirectorController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

return new ViewModel(array(
Expand All @@ -52,7 +52,7 @@ public function messagesAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

return new ViewModel();
Expand All @@ -63,7 +63,7 @@ public function consoleAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

return new ViewModel(array(
Expand All @@ -75,7 +75,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
6 changes: 3 additions & 3 deletions module/Fileset/src/Fileset/Controller/FilesetController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$filesets = $this->getFilesetModel()->getFilesets();
Expand All @@ -56,7 +56,7 @@ public function detailsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$filesetid = $this->params()->fromRoute('id', 0);
Expand All @@ -74,7 +74,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
12 changes: 6 additions & 6 deletions module/Job/src/Job/Controller/JobController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$status = "all";
Expand All @@ -66,7 +66,7 @@ public function detailsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$jobid = (int) $this->params()->fromRoute('id', 0);
Expand All @@ -85,7 +85,7 @@ public function rerunAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$jobid = (int) $this->params()->fromRoute('id', 0);
Expand All @@ -104,7 +104,7 @@ public function cancelAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$jobid = (int) $this->params()->fromRoute('id', 0);
Expand All @@ -122,7 +122,7 @@ public function actionsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$action = $this->params()->fromQuery('action');
Expand Down Expand Up @@ -167,7 +167,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
6 changes: 3 additions & 3 deletions module/Media/src/Media/Controller/MediaController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$volumes = $this->getMediaModel()->getVolumes();
Expand All @@ -55,7 +55,7 @@ public function detailsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$volumename = $this->params()->fromRoute('id');
Expand All @@ -70,7 +70,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
6 changes: 3 additions & 3 deletions module/Pool/src/Pool/Controller/PoolController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$pools = $this->getPoolModel()->getPools();
Expand All @@ -55,7 +55,7 @@ public function detailsAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$poolname = $this->params()->fromRoute('id');
Expand All @@ -73,7 +73,7 @@ public function getDataAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$data = $this->params()->fromQuery('data');
Expand Down
4 changes: 2 additions & 2 deletions module/Restore/src/Restore/Controller/RestoreController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function indexAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$this->getRestoreParams();
Expand Down Expand Up @@ -161,7 +161,7 @@ public function filebrowserAction()
$this->RequestURIPlugin()->setRequestURI();

if(!$this->SessionTimeoutPlugin()->isValid()) {
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI())));
return $this->redirect()->toRoute('auth', array('action' => 'login'), array('query' => array('req' => $this->RequestURIPlugin()->getRequestURI(), 'dird' => $_SESSION['bareos']['director'])));
}

$this->getRestoreParams();
Expand Down
Loading

0 comments on commit ee2ff4a

Please sign in to comment.