From b1d528d2a6cddba24166e9c17bdf8750ec4378e3 Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Tue, 22 Mar 2011 14:58:47 +0100
Subject: [PATCH] bacula-web: Moved bweb.inc.php into classes folder

 - Changed include path in config.inc.php and all other scripts
---
 gui/bacula-web/backupjob-report.php          |  2 +-
 gui/bacula-web/{ => classes}/bweb.inc.php    |  0
 gui/bacula-web/classes/cfg/config.classe.php | 38 ++++++++++++++++++++
 gui/bacula-web/config.inc.php                |  3 +-
 gui/bacula-web/jobs.php                      |  2 +-
 gui/bacula-web/pools.php                     |  2 +-
 gui/bacula-web/report.php                    | 17 +--------
 gui/bacula-web/test.php                      |  2 +-
 8 files changed, 45 insertions(+), 21 deletions(-)
 rename gui/bacula-web/{ => classes}/bweb.inc.php (100%)

diff --git a/gui/bacula-web/backupjob-report.php b/gui/bacula-web/backupjob-report.php
index 5453662a5f..23115dbdd8 100644
--- a/gui/bacula-web/backupjob-report.php
+++ b/gui/bacula-web/backupjob-report.php
@@ -1,6 +1,6 @@
 <?php
   session_start();
-  include_once( 'bweb.inc.php' );
+  include_once( 'config.inc.php' );
 
   $dbSql = new Bweb();
 
diff --git a/gui/bacula-web/bweb.inc.php b/gui/bacula-web/classes/bweb.inc.php
similarity index 100%
rename from gui/bacula-web/bweb.inc.php
rename to gui/bacula-web/classes/bweb.inc.php
diff --git a/gui/bacula-web/classes/cfg/config.classe.php b/gui/bacula-web/classes/cfg/config.classe.php
index 62a2de0c86..4ee62fae70 100644
--- a/gui/bacula-web/classes/cfg/config.classe.php
+++ b/gui/bacula-web/classes/cfg/config.classe.php
@@ -1,3 +1,41 @@
 <?php
 
+ class BW_Config {
+	function __construct()
+	{
+		
+	}
+	
+	public function Check_Config_file()
+	{
+	
+	}
+	
+	public function Get_Config()
+	{
+		
+	}
+	
+	public function Get_Config_Params( $params = array() )
+	{
+	
+	}
+	
+	public function Count_Catalogs()
+	{
+	
+	}
+	
+	public function Get_Dsn( $catalog_id )
+	{
+		
+	}
+		
+	function __destruct()
+	{
+	
+	}
+	
+ } // end classe BW_Config
+ 
 ?>
diff --git a/gui/bacula-web/config.inc.php b/gui/bacula-web/config.inc.php
index 48b9e3034e..409e24b8ea 100644
--- a/gui/bacula-web/config.inc.php
+++ b/gui/bacula-web/config.inc.php
@@ -14,8 +14,9 @@
  require_once "DB.php";   
  
  // Internal libs
+ require_once BW_OBJ . "cfg/config.classe.php";
  require_once BW_OBJ . "graph/bgraph.inc.php";
- require_once "bweb.inc.php";
+ require_once BW_OBJ . "bweb.inc.php";
  
  // Global constants
  define('CONFIG_DIR', BW_ROOT . "/configs/");
diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index 71f01b51ce..27f551a8ea 100644
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -1,6 +1,6 @@
 <?php
   session_start();
-  include_once( 'bweb.inc.php' );
+  include_once( 'config.inc.php' );
 
   $dbSql = new Bweb();
   // Jobs list
diff --git a/gui/bacula-web/pools.php b/gui/bacula-web/pools.php
index 90a4958ca4..eea94bc22a 100644
--- a/gui/bacula-web/pools.php
+++ b/gui/bacula-web/pools.php
@@ -1,6 +1,6 @@
 <?php
   session_start();
-  include_once( 'bweb.inc.php' );
+  include_once( 'config.inc.php' );
 
   $dbSql = new Bweb();
 
diff --git a/gui/bacula-web/report.php b/gui/bacula-web/report.php
index 08def41ed1..c6dda68afc 100644
--- a/gui/bacula-web/report.php
+++ b/gui/bacula-web/report.php
@@ -1,21 +1,6 @@
 <?php
-/* 
-+-------------------------------------------------------------------------+
-| Copyright (C) 2004-2005 Juan Luis Frances Jiminez                       |
-|                                                                         |
-| This program is free software; you can redistribute it and/or           |
-| modify it under the terms of the GNU General Public License             |
-| as published by the Free Software Foundation; either version 2          |
-| of the License, or (at your option) any later version.                  |
-|                                                                         |
-| This program is distributed in the hope that it will be useful,         |
-| but WITHOUT ANY WARRANTY; without even the implied warranty of          |
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
-| GNU General Public License for more details.                            |
-+-------------------------------------------------------------------------+ 
-*/
 session_start();
-include_once( 'bweb.inc.php' );
+include_once( 'config.inc.php' );
 
 $dbSql = new Bweb();
 
diff --git a/gui/bacula-web/test.php b/gui/bacula-web/test.php
index a595a65d84..916a3bcd04 100644
--- a/gui/bacula-web/test.php
+++ b/gui/bacula-web/test.php
@@ -1,5 +1,5 @@
 <?php
-	require_once ("bweb.inc.php");
+	require_once ("config.inc.php");
 	$bw = new Bweb();
 	
 	// Check result icon
-- 
2.39.5