Merge branch 'bareos-16.2'

bareos · Oct 28, 2016 · a860029 · a860029
2 parents 1de549f + c293c1e
commit a860029
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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();

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -75,7 +75,7 @@ echo $this->doctype();
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
          </button>
-         <a href="http://www.bareos.org/" target="_blank"><img src="<?php echo $this->basePath('img/bareos-logo-small.png') ?>" alt="Bareos" /></a>&nbsp;
+         <a href="<?php echo $this->url('dashboard', array('action' => 'index')); ?>" target="_self"><img src="<?php echo $this->basePath('img/bareos-logo-small.png') ?>" alt="Bareos" /></a>&nbsp;
       </div>
       <div class="collapse navbar-collapse">
          <?php echo $this->navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav navbar-nav'); ?>
@@ -91,7 +91,11 @@ echo $this->doctype();
                   <span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;<?php echo $_SESSION['bareos']['username']; ?> <span class="caret"></span>
                </a>
                <ul class="dropdown-menu" role="menu">
-                  <li><a href="http://doc.bareos.org" target="_blank"><?php echo $this->translate("Help"); ?></a></li>
+                  <li><a href="http://doc.bareos.org" target="_blank"><?php echo $this->translate("Documentation"); ?></a></li>
+                  <li><a href="https://www.bareos.org/en/open-source.html" target="_blank"><?php echo $this->translate("Mailinglists"); ?></a></li>
+                  <li><a href="https://bugs.bareos.org/" target="_blank"><?php echo $this->translate("Bugtracker"); ?></a></li>
+                  <li><a href="http://www.bareos.com/en/Support.html" target="_blank"><?php echo $this->translate("Support"); ?></a></li>
+                  <li><a href="http://www.bareos.com/en/Subscription.html" target="_blank"><?php echo $this->translate("Subscription"); ?></a></li>
                   <li role="separator" class="divider"></li>
                   <li><a href="<?php echo $this->url('auth', array('action' => 'logout')); ?>"><?php echo $this->translate("Logout"); ?></a></li>
                </ul>

diff --git 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 <strong>'.$this->restore_params['client'].'</strong> 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
@@ -31,7 +31,7 @@ $this->headTitle($title);
 <?php if($this->acl_alert) : echo $this->ACLAlert($this->required_commands); elseif(!$this->acl_alert) : ?>
 
 <?php
-   if(isset($this->errors)) {
+   if(isset($this->errors) && !empty($this->errors)) {
       echo '<div class="alert alert-danger" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
   <strong>Error: </strong>'.$this->errors.'</div>';
    }