baculum: Assign Baculum copyright to Kern Sibbald

[bacula/bacula] / gui / baculum / protected / Class / Bconsole.php

diff --git a/gui/baculum/protected/Class/Bconsole.php b/gui/baculum/protected/Class/Bconsole.php
index 93b6bac68f4555a52ccd9945fffd71e49990cbb8..073f90aaf2c67a862092d1a7a962e051841dd32a 100644 (file)
--- a/gui/baculum/protected/Class/Bconsole.php
+++ b/gui/baculum/protected/Class/Bconsole.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('Application.Class.ConfigurationManager');
@@ -25,11 +28,13 @@ class Bconsole extends TModule {
 
        const SUDO = 'sudo';
 
-       const BCONSOLE_COMMAND_PATTERN = "%s%s -c %s %s <<END_OF_DATA\n%s\nquit\n<<END_OF_DATA";
+       const BCONSOLE_COMMAND_PATTERN = "%s%s -c %s %s <<END_OF_DATA\n%s\nquit\nEND_OF_DATA";
 
        const BCONSOLE_DIRECTORS_PATTERN = "%s%s -c %s -l";
 
-       private $availableCommands = array('version', 'status', 'list', 'messages', 'show', 'mount', 'umount', 'release', 'prune', 'purge', 'update', 'estimate', 'run', '.bvfs_update', '.bvfs_lsdirs', '.bvfs_lsfiles', '.bvfs_versions', '.bvfs_get_jobids', '.bvfs_restore', '.bvfs_clear_cache', 'restore', 'cancel', 'delete', '.jobs', 'label', 'reload', '.fileset', '.storage');
+       const BCONSOLE_CFG_USER_KEYWORD = '{user}';
+
+       private $availableCommands = array('version', 'status', 'list', 'messages', 'show', 'mount', 'umount', 'release', 'prune', 'purge', 'update', 'estimate', 'run', '.bvfs_update', '.bvfs_lsdirs', '.bvfs_lsfiles', '.bvfs_versions', '.bvfs_get_jobids', '.bvfs_restore', '.bvfs_clear_cache', 'restore', 'cancel', 'delete', '.jobs', 'label', 'reload', '.fileset', '.storage', '.client', '.pool');
 
        private $useSudo = false;
 
@@ -37,19 +42,23 @@ class Bconsole extends TModule {
 
        private $bconsoleCfgPath;
 
+       private $bconsoleCfgCustomPath;
+
        public function init($config) {
                if($this->Application->getModule('configuration')->isApplicationConfig() === true) {
                        $params = ConfigurationManager::getApplicationConfig();
                        $useSudo = ((integer)$params['bconsole']['use_sudo'] === 1);
                        $bconsoleCmdPath = $params['bconsole']['bin_path'];
                        $bconsoleCfgPath = $params['bconsole']['cfg_path'];
-                       $this->setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, $useSudo);
+                       $bconsoleCfgCustomPath = array_key_exists('cfg_custom_path', $params['bconsole']) ? $params['bconsole']['cfg_custom_path'] : null;
+                       $this->setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, $bconsoleCfgCustomPath, $useSudo);
                }
        }
 
-       private function setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, $useSudo) {
+       private function setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, $bconsoleCfgCustomPath, $useSudo) {
                $this->bconsoleCmdPath = $bconsoleCmdPath;
                $this->bconsoleCfgPath = $bconsoleCfgPath;
+               $this->bconsoleCfgCustomPath = $bconsoleCfgCustomPath;
                $this->useSudo = $useSudo;
        }
 
@@ -68,20 +77,21 @@ class Bconsole extends TModule {
                        }
                }
                $output = count($output) > 1 ? array_values($output) : array_shift($output);
-               return (object)array('output' => $output, 'exitcode' => $exitcode);
+               return (object)array('output' => $output, 'exitcode' => (integer)$exitcode);
        }
 
-       public function bconsoleCommand($director, array $command) {
+       public function bconsoleCommand($director, array $command, $user = null) {
                $baseCommand = count($command) > 0 ? $command[0] : null;
                if($this->isCommandValid($baseCommand) === true) {
-                       $result = $this->execCommand($director, $command);
+                       $result = $this->execCommand($director, $command, $user);
                } else {
                        $result = $this->prepareResult(array(BconsoleError::MSG_ERROR_INVALID_COMMAND, ''), BconsoleError::ERROR_INVALID_COMMAND, ' ');
                }
                return $result;
        }
 
-       private function execCommand($director, array $command) {
+       private function execCommand($director, array $command, $user) {
+               $cmd = '';
                if(!is_null($director) && $this->isValidDirector($director) === false) {
                        $output = array(BconsoleError::MSG_ERROR_INVALID_DIRECTOR, '');
                        $exitcode = BconsoleError::ERROR_INVALID_DIRECTOR;
@@ -90,6 +100,9 @@ class Bconsole extends TModule {
                        $dir = is_null($director) ? '': '-D ' . $director;
                        $sudo = ($this->useSudo === true) ? self::SUDO . ' ' : '';
                        $bconsoleCommand = implode(' ', $command);
+                       if(!is_null($this->bconsoleCfgCustomPath) && !is_null($user)) {
+                               $this->bconsoleCfgPath = str_replace(self::BCONSOLE_CFG_USER_KEYWORD, $user, $this->bconsoleCfgCustomPath);
+                       }
                        $cmd = sprintf(self::BCONSOLE_COMMAND_PATTERN, $sudo, $this->bconsoleCmdPath, $this->bconsoleCfgPath, $dir, $bconsoleCommand);
                        exec($cmd, $output, $exitcode);
                        if($exitcode != 0) {
@@ -123,9 +136,10 @@ class Bconsole extends TModule {
        }
 
        public function testBconsoleCommand(array $command, $bconsoleCmdPath, $bconsoleCfgPath, $useSudo) {
-               $this->setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, $useSudo);
+               $this->setEnvironmentParams($bconsoleCmdPath, $bconsoleCfgPath, null, $useSudo);
                $director = array_shift($this->getDirectors()->output);
-               return $this->bconsoleCommand($director, $command);             
+               $result = $this->bconsoleCommand($director, $command);
+               return $result;
        }
 }
-?>
\ No newline at end of file
+?>