From: Davide Franco <bacula-dev@dflc.ch>
Date: Tue, 22 Mar 2011 13:35:34 +0000 (+0100)
Subject: bacula-web: Added constant for config file path
X-Git-Tag: Release-5.2.1~347
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b02ddee4f4ad89ee30e400a14dd603304595bd7f;p=bacula%2Fbacula

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 d57090bedb..040885cf45 100644
--- 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 4fb949660e..48b9e3034e 100644
--- 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 );