baculum: Assign Baculum copyright to Kern Sibbald

[bacula/bacula] / gui / baculum / protected / Portlets / StorageConfiguration.php

diff --git a/gui/baculum/protected/Portlets/StorageConfiguration.php b/gui/baculum/protected/Portlets/StorageConfiguration.php
index 9002ab8452aefdd85aa962b44170f38fba2e6bdc..02c50b7460eedbd653d57af59c5fb9e13ddc7540 100644 (file)
--- a/gui/baculum/protected/Portlets/StorageConfiguration.php
+++ b/gui/baculum/protected/Portlets/StorageConfiguration.php
@@ -1,20 +1,23 @@
 <?php
-/**
- * Bacula® - The Network Backup Solution
- * Baculum - Bacula web interface
+/*
+ * Bacula(R) - The Network Backup Solution
+ * Baculum   - Bacula web interface
  *
- * Copyright (C) 2013-2014 Marcin Haba
+ * Copyright (C) 2013-2016 Kern Sibbald
  *
  * The main author of Baculum is Marcin Haba.
- * The main author of Bacula is Kern Sibbald, with contributions from many
- * others, a complete list can be found in the file AUTHORS.
+ * The original author of Bacula is Kern Sibbald, with contributions
+ * from many others, a complete list can be found in the file AUTHORS.
  *
  * You may use this file and others of this release according to the
  * license defined in the LICENSE file, which includes the Affero General
  * Public License, v3.0 ("AGPLv3") and some additional permissions and
  * terms pursuant to its AGPLv3 Section 7.
  *
- * Bacula® is a registered trademark of Kern Sibbald.
+ * This notice must be preserved when any source code is
+ * conveyed and/or propagated.
+ *
+ * Bacula(R) is a registered trademark of Kern Sibbald.
  */
 
 Prado::using('System.Web.UI.ActiveControls.TActiveCustomValidator');
@@ -43,7 +46,7 @@ class StorageConfiguration extends Portlets {
        }
 
        public function umount($sender, $param) {
-               $isValid = $this->DriveValidator->IsValid === true && $this->SlotValidator->IsValid === true;
+               $isValid = $this->DriveValidator->IsValid === true;
                if($isValid === false) {
                        return;
                }
@@ -54,7 +57,12 @@ class StorageConfiguration extends Portlets {
        }
 
        public function release($sender, $param) {
-               $release = $this->Application->getModule('api')->get(array('storages', 'release', $this->StorageID->Text))->output;
+               $isValid = $this->DriveValidator->IsValid === true;
+               if($isValid === false) {
+                       return;
+               }
+               $drive = ($this->AutoChanger->Visible === true) ? intval($this->Drive->Text) : 0;
+               $release = $this->Application->getModule('api')->get(array('storages', 'release', $this->StorageID->Text, $drive))->output;
                $this->ShowStorage->Text = implode(PHP_EOL, $release);
        }