From 183bb846a70103c531edba249bf07b409064ed4a Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 21 Mar 2011 18:56:45 +0100
Subject: [PATCH] bacula-web: Improved config.inc.php

 - Using constant instead of variable for include paths
 - Automatic detection of bacula-web installation path
 - Adapted include in index.php and bweb.inc.php
---
 gui/bacula-web/bweb.inc.php   |  2 +-
 gui/bacula-web/config.inc.php | 23 ++++++++++-------------
 gui/bacula-web/index.php      |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/gui/bacula-web/bweb.inc.php b/gui/bacula-web/bweb.inc.php
index 4490134421..d57090bedb 100644
--- a/gui/bacula-web/bweb.inc.php
+++ b/gui/bacula-web/bweb.inc.php
@@ -85,7 +85,7 @@ class Bweb extends DB {
 		global $smarty_gettext_path;
 		
 		if ( function_exists("gettext") ) {
-			require_once( $smarty_gettext_path."smarty_gettext.php" );     
+			require_once( BW_SMARTY_GETTEXT . "smarty_gettext.php" );     
 			$this->tpl->register_block('t','smarty_translate');
         
 			$language = $this->get_config_param("lang");
diff --git a/gui/bacula-web/config.inc.php b/gui/bacula-web/config.inc.php
index 6a28a47f73..e67d08ac6a 100644
--- a/gui/bacula-web/config.inc.php
+++ b/gui/bacula-web/config.inc.php
@@ -1,21 +1,18 @@
 <?php
- // PhPlot (version 5.3.1) 
- // http://www.phplot.com
- $phplot_path = "external_packages/phplot/";
-
- // Smarty (version 2.6.26)
- // http://smarty.php.net
- $smarty_path = "external_packages/smarty/libs/";
-
- // Smarty_gettext (version 0.9)
- // http://www.boom.org.il/smarty/gettext/
- $smarty_gettext_path = "external_packages/smarty_gettext-0.9/"; 
+ define( 'BW_ROOT', getcwd() );														
+ define( 'BW_PHPLOT', BW_ROOT . '/external_packages/phplot/'  );					
+ define( 'BW_SMARTY', BW_ROOT . '/external_packages/smarty/libs/' );				
+ define( 'BW_SMARTY_GETTEXT', BW_ROOT . '/external_packages/smarty_gettext-0.9/' );
  
- require_once( $smarty_path . "Smarty.class.php");
- require_once( $phplot_path . "phplot.php");
+ require_once( BW_SMARTY . "Smarty.class.php");			
+ require_once( BW_PHPLOT . "phplot.php");				
  
+ // PEAR-DB classe
  require_once "DB.php";   
+ 
+ // Internal libs
  require_once "bgraph.inc.php";
+ require_once "bweb.inc.php";
  
  // Global constants
  define('CONFIG_DIR', "configs");
diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 070347ac38..5e5ab16f64 100644
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -15,7 +15,7 @@
 +-------------------------------------------------------------------------+ 
 */
 session_start();
-include_once( 'bweb.inc.php' );
+include_once( 'config.inc.php' );
 
 $dbSql = new Bweb();
 
-- 
2.39.5