Merge pull request #67 from toerb/master

add simple catalog handling
bareos · Jul 14, 2016 · f1b9048 · f1b9048
2 parents fe68ddb + 94d4d4d
commit f1b9048
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -134,6 +134,13 @@ function read_dir_config($config, $file)
             $arr[key($config)]['allowed_cns'] = "";
          }
 
+         if(array_key_exists('catalog', $instance) && isset($instance['catalog'])) {
+            $arr[key($config)]['catalog'] = $instance['catalog'];
+         }
+         else {
+            $arr[key($config)]['catalog'] = "MyCatalog";
+         }
+
       }
 
       next($config);

diff --git a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
@@ -78,6 +78,7 @@ class BareosBSock implements BareosBSockInterface
       'cert_file' => null,
       'cert_file_passphrase' => null,
       'allowed_cns' => null,
+      'catalog' => null,
    );
 
    private $socket = null;
@@ -870,7 +871,7 @@ public function send_command($cmd, $api=0, $jobid=null)
             break;
       }
 
-      if(self::send("use")) {
+      if(self::send("use catalog=" . $this->config['catalog'])) {
          $debug = self::receive_message();
       }