From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Mon, 23 Feb 2015 04:53:04 +0000 (+0900)
Subject: Add selected attribute to <select> of "pgpool-II version"
X-Git-Tag: V3_5_BETA1~23
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=a25cd844c024c704a8997ddb86dd944b92dfe7da;p=pgpooladmin.git

Add selected attribute to <select> of "pgpool-II version"
---

diff --git a/install/checkParameter.php b/install/checkParameter.php
index e5dfa0d..df2f0ce 100644
--- a/install/checkParameter.php
+++ b/install/checkParameter.php
@@ -41,6 +41,13 @@ if (isset($_POST['action'])) {
     $action = $_POST['action'];
 }
 
+// check version
+if (isset($_POST['version']) && $_POST['version']) {
+    $version = $_POST['version'];
+} else {
+    $version = NULL;
+}
+
 // check pgpool.conf
 if (isset($_POST['pgpool2_config_file']) && $_POST['pgpool2_config_file']) {
     $pgpool2_config_file = $_POST['pgpool2_config_file'];
@@ -279,7 +286,8 @@ if (!$error && $action == 'next') {
     <td><select name="version" />
         <?php
         foreach (versions() as $v) {
-            echo '<option value="'. $v. '">'. $v. '</optgroup>';
+            printf('<option value="%s"%s>%s</optgroup>',
+                   $v, ($v == $version) ? ' selected' : NULL, $v);
         }
         ?>
         </select>