From dea1c700626575d231d00cfd6365d6fff56b6b61 Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Wed, 26 Oct 2016 11:46:24 +0200 Subject: [PATCH 1/4] Restore: fix alert msg --- module/Restore/src/Restore/Controller/RestoreController.php | 3 ++- module/Restore/view/restore/restore/index.phtml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php index b69ed7a8e50..51e8252e03a 100644 --- a/module/Restore/src/Restore/Controller/RestoreController.php +++ b/module/Restore/src/Restore/Controller/RestoreController.php @@ -139,7 +139,7 @@ public function indexAction() echo $e->getMessage(); } - if($backups == null) { + if(empty($backups)) { $errors = 'No backups of client '.$this->restore_params['client'].' found.'; } @@ -204,6 +204,7 @@ public function indexAction() return new ViewModel(array( 'restore_params' => $this->restore_params, 'form' => $form, + 'errors' => $errors )); } diff --git a/module/Restore/view/restore/restore/index.phtml b/module/Restore/view/restore/restore/index.phtml index 6e2b7f26ede..c2ce2949de6 100644 --- a/module/Restore/view/restore/restore/index.phtml +++ b/module/Restore/view/restore/restore/index.phtml @@ -31,7 +31,7 @@ $this->headTitle($title); acl_alert) : echo $this->ACLAlert($this->required_commands); elseif(!$this->acl_alert) : ?> errors)) { + if(isset($this->errors) && !empty($this->errors)) { echo ''; } From e6a7f20e73a8275ce6cc5ee2ba53eac5c79a2e12 Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Wed, 26 Oct 2016 11:54:40 +0200 Subject: [PATCH 2/4] Useability tweak --- module/Application/view/layout/layout.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 765b2bcc68e..1fd3aea4ca6 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -75,7 +75,7 @@ echo $this->doctype(); - Bareos  + Bareos 
navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav navbar-nav'); ?> From 6bfd2d67cc471ebd4796e603ac327362983e7bb9 Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Wed, 26 Oct 2016 12:06:20 +0200 Subject: [PATCH 3/4] topnavbar: user dropdown menu extended This adds a few more items to the user dropdown menu in the top navigation bar, which refer to the documentation, mailinglists, bugtracker, support and subscription service. --- module/Application/view/layout/layout.phtml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 1fd3aea4ca6..26616ae1ec2 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -91,7 +91,11 @@ echo $this->doctype();   From c293c1e2792d9be7d422beefbbacd6c8efc8995c Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Wed, 26 Oct 2016 12:47:56 +0200 Subject: [PATCH 4/4] directors.ini tweak Allows to also use boolean values to enable/disable an director entry in the directors.ini configuration file. --- config/autoload/global.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/autoload/global.php b/config/autoload/global.php index c571da21b2f..586b88e2343 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -108,7 +108,7 @@ function read_directors_ini($directors, $directors_ini) foreach($directors as $instance) { - if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "yes") { + if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && (strtolower($instance['enabled']) == "yes" || strtolower($instance['enabled']) == TRUE)) { if(array_key_exists('diraddress', $instance) && isset($instance['diraddress'])) { $arr[key($directors)] = array();