bacula-web: php code cleanup

[bacula/bacula] / gui / bacula-web / jobs.php

diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php
index b3741aa10da88dbd054ef53d73906f219d0c2ef5..c54dc2c9efe37c37aef90bcf1a3db69aed27de2e 100644 (file)
--- a/gui/bacula-web/jobs.php
+++ b/gui/bacula-web/jobs.php
@@ -19,17 +19,26 @@
 
   $dbSql = new Bweb();
   // Jobs list
-  $query          = "";
-  $last_jobs = array();
+  $query           = "";
+  $last_jobs   = array();
   
   // Job Status list
-  $job_status = array( 'Any', 'Waiting', 'Running', 'Completed', 'Failed', 'Canceled' );
+  define( 'STATUS_ALL',                  0 );
+  define( 'STATUS_RUNNING',   1 );
+  define( 'STATUS_WAITING',   2 );
+  define( 'STATUS_COMPLETED', 3 );
+  define( 'STATUS_FAILED',       4 );
+  define( 'STATUS_CANCELED',  5 );
+  
+  $job_status = array( STATUS_ALL       => 'All', 
+                                          STATUS_RUNNING   => 'Running', 
+                                          STATUS_WAITING   => 'Waiting',
+                                          STATUS_COMPLETED => 'Completed',
+                                          STATUS_FAILED        => 'Failed',
+                                          STATUS_CANCELED      => 'Canceled' );
+                                          
   $dbSql->tpl->assign( 'job_status', $job_status );
   
-  // Jobs per page
-  $jobs_per_page = array( 25,50,75,100,150 );
-  $dbSql->tpl->assign( 'jobs_per_page', $jobs_per_page );
-
   // Global variables
   $job_level = array( 'D' => 'Diff', 'I' => 'Incr', 'F' => 'Full' );
   
@@ -40,42 +49,45 @@
   
   // Filter by status
   if( isset( $_POST['status'] ) ) {
-       switch( strtolower( $_POST['status'] ) )
+       switch( $_POST['status'] ) 
        {
-               case 'running':
+               case STATUS_RUNNING:
                        $query .= "WHERE Job.JobStatus = 'R' ";
                break;
-               case 'waiting':
+               case STATUS_WAITING:
                        $query .= "WHERE Job.JobStatus IN ('F','S','M','m','s','j','c','d','t','p','C') ";
                break;
-               case 'completed':
+               case STATUS_COMPLETED:
                        $query .= "WHERE Job.JobStatus IN ('T', 'E') ";
                break;
-               case 'failed':
+               case STATUS_FAILED:
                        $query .= "WHERE Job.JobStatus = 'f' ";
                break;
-               case 'canceled':
+               case STATUS_CANCELED:
                        $query .= "WHERE Job.JobStatus = 'A' ";
                break;
        }
+    $dbSql->tpl->assign('job_status_filter', $_POST['status'] );
   }
   
   // order by
   $query .= "ORDER BY Job.JobId DESC ";
   
+  // Jobs per page
+  $jobs_per_page = array( 25 => '25', 50 => '50', 75 => '75', 100 => '100', 150 => '150' );
+    
   // Determine how many jobs to display
-  if( isset($_POST['jobs_per_page']) )
+  if( isset($_POST['jobs_per_page']) ) {
        $query .= "LIMIT " . $_POST['jobs_per_page'];
-  else
+    $dbSql->tpl->assign( 'jobs_per_page_selected', $_POST['jobs_per_page'] );
+  }else
        $query .= "LIMIT 25 ";
-  
-  //echo $query . '<br />';
+  $dbSql->tpl->assign( 'jobs_per_page', $jobs_per_page );
   
   $jobsresult = $dbSql->db_link->query( $query );
   
   if( PEAR::isError( $jobsresult ) ) {
-         echo "SQL query = $query <br />";
-         die("Unable to get last failed jobs from catalog" . $jobsresult->getMessage() );
+         $dbSql->TriggerDBError( "Unable to get last failed jobs from catalog", $jobresult );
   }else {
          while( $job = $jobsresult->fetchRow( DB_FETCHMODE_ASSOC ) ) {
                
@@ -123,7 +135,7 @@
                // Job Level
         $job['Level'] = $job_level[ $job['level'] ];
                // Job Size
-               $job['JobBytes'] = CUtils::Get_Human_Size( $job['jobbytes'] );
+               $job['jobbytes'] = CUtils::Get_Human_Size( $job['jobbytes'] );
 
                array_push( $last_jobs, $job);
          }