From: Davide Franco <bacula-dev@dflc.ch>
Date: Thu, 14 Jul 2011 14:55:26 +0000 (+0200)
Subject: bacula-web: Added PHP PDO support check and removed PEAR DB check
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ec4c40926beca35af325491b651434873569117;p=bacula%2Fbacula

bacula-web: Added PHP PDO support check and removed PEAR DB check
---

diff --git a/gui/bacula-web/templates/test.tpl b/gui/bacula-web/templates/test.tpl
index 3857f5e823..4eea202ef0 100644
--- a/gui/bacula-web/templates/test.tpl
+++ b/gui/bacula-web/templates/test.tpl
@@ -16,9 +16,15 @@
 	<table border="0">
 		{foreach from=$checks item=check}
 		  <tr>
-		    <td style="font-weight:bold;font-size:10pt;vertical-align:middle;text-align:left;padding:10px 5px 5px 30px;">{$check.check_label}</td>
-			<td style="text-align:left;vertical-align:middle;">{$check.check_descr}</td>
-			<td  style="text-align:center;"> <img src='style/images/{$check.check_result}' width='20' alt=''/></td>
+		    <td style="font-weight:bold;font-size:10pt;vertical-align:middle;text-align:left;padding:10px 5px 5px 30px;">
+				{$check.check_label}
+			</td>
+			<td style="text-align:left;vertical-align:middle;">
+				{$check.check_descr}
+			</td>
+			<td  style="text-align:center;width=60px;">
+				<img src='style/images/{$check.check_result}' width='25' alt=''/>
+			</td>
 		  </tr>
 		{/foreach}
 	</table>
diff --git a/gui/bacula-web/test.php b/gui/bacula-web/test.php
index 244b3077be..985e51053f 100644
--- a/gui/bacula-web/test.php
+++ b/gui/bacula-web/test.php
@@ -25,18 +25,18 @@
  $check_list = array( array( 'check_cmd'   		=> 'php-gettext', 
  	 						 'check_label' 		=> 'PHP - Gettext support', 
 							 'check_descr' 		=> 'If you want Bacula-web in your language, please compile PHP with Gettext support' ),
-					  array( 'check_cmd'   		=> 'pear-db', 
-							 'check_label' 		=> 'PEAR DB module', 
-							 'check_descr' 		=> 'PEAR DB support not found, please read the Bacula-web installation document'),
-					  array( 'check_cmd'   		=> 'php-gd',
+  					  array( 'check_cmd'   		=> 'php-gd',
 					 		 'check_label' 		=> 'PHP - GD support',
-				 			 'check_descr' 		=> 'This is required by phplot, please compile php with GD support'),
+				 			 'check_descr' 		=> 'This is required by phplot, please compile PHP with GD support'),
 					  array( 'check_cmd'   		=> 'php-mysql',
 							 'check_label' 		=> 'PHP - MySQL support',
 							 'check_descr'		=> 'PHP MySQL support must be installed in order to run bacula-web with MySQL bacula catalog'),
 					  array( 'check_cmd'   		=> 'php-postgres',
 							 'check_label' 		=> 'PHP - PostgreSQL support',
 							 'check_descr'		=> 'PHP PostgreSQL support must be installed in order to run bacula-web with PostgreSQL bacula catalog'),								
+					  array( 'check_cmd'   		=> 'php-pdo',
+							 'check_label' 		=> 'PHP - PDO support',
+							 'check_descr'		=> 'PHP PDO support is required, please compile PHP with this option'),
 					  array( 'check_cmd'   		=> 'smarty-cache',
 							 'check_label' 		=> 'Smarty cache folder write permission',
 							 'check_descr'		=> 'Smarty template engine need write permissions to templates_c folder'),
@@ -64,6 +64,9 @@
 		 case 'php-postgres':
 			 $check['check_result'] = $icon_result[ function_exists('pg_connect') ];
 		 break;
+		 case 'php-pdo':
+			 $check['check_result'] = $icon_result[ class_exists('PDO') ];
+		 break;
 		 case 'smarty-cache':
 			 $check['check_result'] = $icon_result[ is_writable( "./templates_c" ) ];
 		 break;