bacula-web: Added constant for config file path

 - Changed constant usage in bweb classe constructor

diff --git a/gui/bacula-web/bweb.inc.php b/gui/bacula-web/bweb.inc.php
index d57090bedbe6fea1c0f5e2461c143127b4c2bb47..040885cf4571cfd3b7ebdc9558467c0b857773ee 100644 (file)
--- a/gui/bacula-web/bweb.inc.php
+++ b/gui/bacula-web/bweb.inc.php
@@ -37,7 +37,7 @@ class Bweb extends DB {
                $this->catalogs = array();
                
                // Loading configuration
-               $this->config_file = getcwd() . '/configs/bacula.conf';
+               $this->config_file = CONFIG_FILE;
                
                if( !$this->load_config() )
                        die( "Unable to load configuration");

diff --git a/gui/bacula-web/config.inc.php b/gui/bacula-web/config.inc.php
index 4fb949660eb21492ff6b6820b685b61e5997a31c..48b9e3034e963dc71ad56d7427fb90cddab1173a 100644 (file)
--- a/gui/bacula-web/config.inc.php
+++ b/gui/bacula-web/config.inc.php
@@ -18,12 +18,9 @@
  require_once "bweb.inc.php";
  
  // Global constants
- define('CONFIG_DIR', "configs");
- define('CONFIG_FILE', "bacula.conf");
- define('BACULA_TYPE_BYTES_FILES', 1);
- define('BACULA_TYPE_FILES_JOBID', 2);
- define('BACULA_TYPE_BYTES_ENDTIME_ALLJOBS', 69);
-
+ define('CONFIG_DIR', BW_ROOT . "/configs/");
+ define('CONFIG_FILE', CONFIG_DIR . "bacula.conf");
+ 
  // Time intervals in secondes
  define( 'LAST_DAY', 86400 );
  define( 'LAST_WEEK', 604800 );