bacula-web: Modified internal php code for smarty classe instance name

diff --git a/gui/bacula-web/backupjob-report.php b/gui/bacula-web/backupjob-report.php
index 154dfe1545a8527bbe9ef80782113be6ff5989b4..2857e211a94e157219ef5b5e5ec847d66418aa09 100644 (file)
--- a/gui/bacula-web/backupjob-report.php
+++ b/gui/bacula-web/backupjob-report.php
@@ -1,22 +1,10 @@
 <?php\r
   session_start();\r
-  require_once ("paths.php");\r
-  require_once ($smarty_path."Smarty.class.php");\r
-  require_once ("bweb.inc.php");\r
-  require_once ("config.inc.php");  \r
+  require_once('paths.php');
+  include_once( 'bweb.inc.php' );
 \r
-  $smarty = new Smarty();     \r
   $dbSql = new Bweb();\r
 \r
-  // Smarty configuration\r
-  $smarty->compile_check = true;\r
-  $smarty->debugging = false;\r
-  $smarty->force_compile = true;\r
-\r
-  $smarty->template_dir = "./templates";\r
-  $smarty->compile_dir = "./templates_c";\r
-  $smarty->config_dir     = "./configs";\r
-\r
   $backupjob_name = "";\r
   $days  = array();\r
 \r
@@ -52,7 +40,7 @@
   $graph->SetGraphSize( 400, 230 );\r
 \r
   $graph->Render();\r
-  $smarty->assign('graph_stored_bytes', $graph->Get_Image_file() );    \r
+  $dbSql->tpl->assign('graph_stored_bytes', $graph->Get_Image_file() );        
   \r
   // Getting last 7 days stored files graph\r
   $graph = new BGraph("graph3.png" );\r
@@ -71,7 +59,7 @@
   $graph->SetGraphSize( 400, 230 );\r
 \r
   $graph->Render();\r
-  $smarty->assign('graph_stored_files', $graph->Get_Image_file() );\r
+  $dbSql->tpl->assign('graph_stored_files', $graph->Get_Image_file() );
 \r
   // Last 10 jobs\r
   $query    = "SELECT JobId, Level, JobFiles, JobBytes, JobStatus, EndTime, Name ";  \r
@@ -94,14 +82,14 @@
   }else\r
        die( "Unable to get last jobs from catalog " . $result->getMessage() );\r
     \r
-  $smarty->assign('jobs', $jobs );\r
+  $dbSql->tpl->assign('jobs', $jobs );
   \r
-  $smarty->assign('backupjob_name', $backupjob_name );\r
-  $smarty->assign('backupjob_period', $backupjob_period );\r
-  $smarty->assign('backupjob_bytes', $backupjob_bytes );\r
-  $smarty->assign('backupjob_files', $backupjob_files );\r
+  $dbSql->tpl->assign('backupjob_name', $backupjob_name );
+  $dbSql->tpl->assign('backupjob_period', $backupjob_period );
+  $dbSql->tpl->assign('backupjob_bytes', $backupjob_bytes );
+  $dbSql->tpl->assign('backupjob_files', $backupjob_files );
   \r
   // Process and display the template \r
-  $smarty->display('backupjob-report.tpl'); \r
+  $dbSql->tpl->display('backupjob-report.tpl'); 
   \r
 ?>\r

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index 5fb6fafbdbb79d44e282f18a7d3b17ee6699d5c9..daea6dbad37b8205d1d5ca75ab5b75bc964bf54a 100644 (file)
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -1,33 +1,20 @@
 <?php
   session_start();
-  require_once ("paths.php");
-  require_once ($smarty_path."Smarty.class.php");
-  require_once ("bweb.inc.php");
-  require_once ("config.inc.php");  
+  require_once('paths.php');
+  include_once( 'bweb.inc.php' );
 
-  $smarty = new Smarty();     
   $dbSql = new Bweb();
-
-  // Smarty configuration
-  $smarty->compile_check = true;
-  $smarty->debugging = false;
-  $smarty->force_compile = true;
-
-  $smarty->template_dir = "./templates";
-  $smarty->compile_dir = "./templates_c";
-  $smarty->config_dir     = "./configs";
-  
   // Jobs list
   $query          = "";
   $last_jobs = array();
   
   // Job Status list
   $job_status = array( 'Any', 'Waiting', 'Running', 'Completed', 'Failed', 'Canceled' );
-  $smarty->assign( 'job_status', $job_status );
+  $dbSql->tpl->assign( 'job_status', $job_status );
   
   // Jobs per page
   $jobs_per_page = array( 25,50,75,100,150 );
-  $smarty->assign( 'jobs_per_page', $jobs_per_page );
+  $dbSql->tpl->assign( 'jobs_per_page', $jobs_per_page );
 
   // Global variables
   $job_level = array( 'D' => 'Diff', 'I' => 'Incr', 'F' => 'Full' );
@@ -126,7 +113,7 @@
                array_push( $last_jobs, $job);
          }
   }
-  $smarty->assign( 'last_jobs', $last_jobs );
+  $dbSql->tpl->assign( 'last_jobs', $last_jobs );
   
   // Count jobs
   if( isset( $_POST['status'] ) )
@@ -134,8 +121,8 @@
   else
        $total_jobs = $dbSql->CountJobs( ALL );
   
-  $smarty->assign( 'total_jobs', $total_jobs );
+  $dbSql->tpl->assign( 'total_jobs', $total_jobs );
   
   // Process and display the template 
-  $smarty->display('jobs.tpl');
+  $dbSql->tpl->display('jobs.tpl');
 ?>

diff --git a/gui/bacula-web/pools.php b/gui/bacula-web/pools.php
index 0a2c682c98ae9a62c362897c397308a2769abd18..3391920d704269c8b6579b13716d0dc6abfa20aa 100644 (file)
--- a/gui/bacula-web/pools.php
+++ b/gui/bacula-web/pools.php
@@ -1,24 +1,12 @@
 <?php
   session_start();
-  require_once ("paths.php");
-  require_once ($smarty_path."Smarty.class.php");
-  require_once ("bweb.inc.php");
-  require_once ("config.inc.php");
+  require_once('paths.php');
+  include_once( 'bweb.inc.php' );
 
-  $smarty = new Smarty();
   $dbSql = new Bweb();
 
-  // Smarty configuration
-  $smarty->compile_check = true;
-  $smarty->debugging = false;
-  $smarty->force_compile = true;
-
-  $smarty->template_dir = "./templates";
-  $smarty->compile_dir = "./templates_c";
-  $smarty->config_dir     = "./configs";
-
   // Get volumes list (pools.tpl)
-  $smarty->assign('pools',$dbSql->GetVolumeList() );
+  $dbSql->tpl->assign('pools',$dbSql->GetVolumeList() );
 
-  $smarty->display('pools.tpl');
+  $dbSql->tpl->display('pools.tpl');
 ?>

diff --git a/gui/bacula-web/report.php b/gui/bacula-web/report.php
index 7312d2cfdffb55f796d51b65ef0ff3401935b92a..b43402e58c553b6e53496abdb00e08595a108cc5 100644 (file)
--- a/gui/bacula-web/report.php
+++ b/gui/bacula-web/report.php
@@ -15,19 +15,8 @@
 +-------------------------------------------------------------------------+ 
 */
 session_start();
-require ("paths.php");
-require($smarty_path."Smarty.class.php");
-include "bweb.inc.php";
-
-$smarty = new Smarty;
-
-//$smarty->compile_check = true;
-//$smarty->debugging = true;
-
-$smarty->template_dir   = "./templates";
-$smarty->compile_dir    = "./templates_c";
-$smarty->config_dir     = "./configs";
-$smarty->config_load("bacula.conf");
+require_once('paths.php');
+include_once( 'bweb.inc.php' );
 
 $dbSql = new Bweb();
 
@@ -74,5 +63,5 @@ $smarty->assign('time2',( (time())-2678400) );
 
 
 
-$smarty->display('report.tpl');
+$dbSql->tpl->display('report.tpl');
 ?>