From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 27 Jun 2011 13:56:50 +0000 (+0200)
Subject: bacula-web: Improved catalog selection trough PHP session variable
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=472c700e9e346153dd9c897a9483568e5d56e00b;p=bacula%2Fbacula

bacula-web: Improved catalog selection trough PHP session variable
---

diff --git a/gui/bacula-web/includes/bweb.inc.php b/gui/bacula-web/includes/bweb.inc.php
index 52b2687585..992b175faf 100644
--- a/gui/bacula-web/includes/bweb.inc.php
+++ b/gui/bacula-web/includes/bweb.inc.php
@@ -26,6 +26,7 @@ class Bweb extends DB
 	private $config;						// Loaded config from bacula.conf
 	private $catalogs = array();			// Catalog array
 	public  $catalog_nb;
+	private	$catalog_current_id;
 	private $bwcfg;
 
     function __construct()
@@ -37,11 +38,27 @@ class Bweb extends DB
 		$this->bwcfg->Load_Config();
 		$this->catalog_nb = $this->bwcfg->Count_Catalogs();
 		
-		// Select which catalog to connect to
-		if( isset( $_POST['catalog_id'] ) )
-			$dsn = $this->bwcfg->Get_Dsn( $_POST['catalog_id'] );
-		else
-			$dsn = $this->bwcfg->Get_Dsn( 0 );
+		// Initialize smarty template classe
+		$this->init_tpl();
+		// Initialize smarty gettext function
+		$this->init_gettext();
+		
+		// Check catalog id
+		if( isset($_POST['catalog_id']) ) {
+			$this->catalog_current_id = $_POST['catalog_id'];
+			$_SESSION['catalog_id'] = $this->catalog_current_id;
+		}
+		elseif( isset( $_SESSION['catalog_id'] ) )
+			$this->catalog_current_id = $_SESSION['catalog_id'];
+		else {
+			$this->catalog_current_id = 0;
+			$_SESSION['catalog_id'] = $this->catalog_current_id;
+		}
+
+		$this->tpl->assign( 'catalog_current_id', $this->catalog_current_id );
+		
+		// Get DSN
+		$dsn = $this->bwcfg->Get_Dsn( $this->catalog_current_id );
 		
 		// Connect to the database
 		$options = array( 'portability' => DB_PORTABILITY_ALL );
@@ -55,18 +72,12 @@ class Bweb extends DB
 			$this->db_link->setFetchMode(DB_FETCHMODE_ASSOC);
 		}
 		
-		// Initialize smarty template classe
-		$this->init_tpl();
-		// Initialize smarty gettext function
-		$this->init_gettext();
-		
 		// Catalog selection		
 		if( $this->catalog_nb > 1 ) {
-			// Set current catalog in header template
-			if(isset( $_POST['catalog_id'] ) )
-				$this->tpl->assign( 'catalog_current', $_POST['catalog_id'] );
-			
+			// Catalogs list
 			$this->tpl->assign( 'catalogs', $this->bwcfg->Get_Catalogs() );			
+			// Catalogs count
+			$this->tpl->assign( 'catalog_nb', $this->catalog_nb );
 		}
 	}
                 
diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index a89bed4e74..15a66510b3 100644
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -20,9 +20,6 @@ include_once( 'config.inc.php' );
 
 $dbSql = new Bweb();
 
-// How many catalog configured
-$dbSql->tpl->assign( 'catalog_nb', $dbSql->catalog_nb );
-
 // Stored files number 
 $dbSql->tpl->assign('stored_files', $dbSql->GetStoredFiles( ALL ) );
   
diff --git a/gui/bacula-web/templates/header.tpl b/gui/bacula-web/templates/header.tpl
index d4b833545e..190b9a1b12 100644
--- a/gui/bacula-web/templates/header.tpl
+++ b/gui/bacula-web/templates/header.tpl
@@ -14,7 +14,7 @@
 		<form method="post" action="index.php">
 			Catalog&nbsp;
 			<select name="catalog_id" OnChange="submit()">
-				{html_options options=$catalogs selected=$smarty.post.catalog_id} 
+				{html_options options=$catalogs selected=$catalog_current_id}
 			</select>
 		</form>
 	</li>