From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Wed, 8 Apr 2015 04:22:31 +0000 (+0900)
Subject: Modified installer to check if pgsql extension is loaded
X-Git-Tag: V3_5_BETA1~21
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=1f2ad1b02bf78fdc259c9e6bdff91ce32488e5c1;p=pgpooladmin.git

Modified installer to check if pgsql extension is loaded
Patch contributed by Rodrigo Ramirez Norambuena
---

diff --git a/install/checkParameter.php b/install/checkParameter.php
index df2f0ce..e5a3b3a 100644
--- a/install/checkParameter.php
+++ b/install/checkParameter.php
@@ -195,6 +195,12 @@ if (isset($_POST['pcp_refreshTime']) && $_POST['pcp_refreshTime']) {
     $pcp_refreshTime =  _PGPOOL2_STATUS_REFRESH_TIME;
 }
 
+$msgPhpPgsql= '';
+if (!extension_loaded('pgsql')){
+    $msgPhpPgsql = 'not installed';
+    $error = TRUE;
+}
+
 /* --------------------------------------------------------------------- */
 /* Write pgmt.conf.php                                                   */
 /* --------------------------------------------------------------------- */
@@ -296,6 +302,21 @@ if (!$error && $action == 'next') {
   </tr>
   </table>
 
+<?php
+/* --------------------------------------------------------------------- */
+/* Dependencies                                                          */
+/* --------------------------------------------------------------------- */
+?>
+  <h3><?php echo $message['strDependencies'] ?></h3>
+  <table>
+  <tr>
+    <th><label><?php echo $message['strPgPhp'] ?></label></th>
+    <td>
+    <?php showResult($msgPhpPgsql); ?>
+    </td>
+  </tr>
+  </table>
+
 <?php
 /* --------------------------------------------------------------------- */
 /* Config File                                                           */
diff --git a/install/finish.php b/install/finish.php
index 3984c75..f11374d 100644
--- a/install/finish.php
+++ b/install/finish.php
@@ -47,7 +47,9 @@ $installDir = dirname(__FILE__);
   <h2>Welcome to pgpool-II Administration Tool</h2>
   <h3><?php echo $message['msgCongratulations'] ?></h3>
   <?php echo $installDir . $message['msgDeleteInstallDir'] ?>
-  <p><a href='../index.php'><?php echo $message['msgToTop'] ?></a></p>
+  <p>
+    <input type="submit" onclick="window.location.href='../index.php'" value="<?php echo $message['msgToTop'] ?>" />
+  </p>
 </div>
     <div id="footer">
       <address>Version <?php echo $version;?><br />
diff --git a/install/lang/en.lang.php b/install/lang/en.lang.php
index f4de87b..49d0635 100644
--- a/install/lang/en.lang.php
+++ b/install/lang/en.lang.php
@@ -52,6 +52,8 @@ $message = array(
     'strPcpTimeout' => 'PCP Timeout',
     'strPcpHostName' => 'PCP Hostname',
     'strPcpRefreshTime' => 'Refresh Time',
+    'strDependencies' => 'Dependencies',
+    'strPgPhp' => 'PHP PostgreSQL (pgsql)',
     'msgCongratulations' => 'Congratulations. pgpool Administration Tool was installed!',
     'msgDeleteInstallDir' => ' : Please remove this directory',
     'msgToTop' => 'top'
diff --git a/install/lang/ja.lang.php b/install/lang/ja.lang.php
index a0a9577..81e8f8c 100644
--- a/install/lang/ja.lang.php
+++ b/install/lang/ja.lang.php
@@ -52,6 +52,8 @@ $message = array(
     'strPcpTimeout' => 'PCPタイムアウト',
     'strPcpHostName' => 'PCPホスト名',
     'strPcpRefreshTime' => '更新間隔(0で自動更新しない)',
+    'strDependencies' => '依存 PHP モジュール',
+    'strPgPhp' => 'PHP PostgreSQL (pgsql)',
     'msgCongratulations' => 'おめでとうございます。インストールは終了しました。',
     'msgDeleteInstallDir' => 'を削除してください',
     'msgToTop' => 'トップ画面へ移動'