From 266894bfdb3fce275a1c1a589724fef8ad0b0d0a Mon Sep 17 00:00:00 2001
From: Yoshiyuki Asaba <y-asaba at pgfoundry.org>
Date: Thu, 27 Dec 2007 06:57:43 +0000
Subject: [PATCH] Fix pgpool shutdown handling. shutdown mode was always
 'smart' mode.

---
 status.php           |  4 ++--
 templates/status.tpl | 53 ++++++++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/status.php b/status.php
index 4e02111..fc1056d 100644
--- a/status.php
+++ b/status.php
@@ -98,7 +98,7 @@ switch ($action) {
         break;
 
     case 'stop':
-        $m = $_POST['m'];
+        $m = $_POST['stop_mode'];
 
         $ret = execPcp('PCP_STOP_PGPOOL', $m);
         if(!array_key_exists('SUCCESS', $ret)) {
@@ -127,7 +127,7 @@ switch ($action) {
         /**
          * Stop Pgpool
          */
-        $m = $_POST['m'];
+        $m = $_POST['restart_mode'];
 
         $ret = execPcp('PCP_STOP_PGPOOL', $m);
         if(!array_key_exists('SUCCESS', $ret)) {
diff --git a/templates/status.tpl b/templates/status.tpl
index 3790c93..97c5898 100644
--- a/templates/status.tpl
+++ b/templates/status.tpl
@@ -245,23 +245,23 @@ function changeView(chView){
     <input type="button" name="command" onclick="cancelCmd()" value="{$message.strCancel|escape}" />
     </td></tr></tfoot>
     <tbody>
-          <tr><td>{$message.strCmdM|escape}(-m)</td><td><select name="m">
+          <tr><td>{$message.strCmdM|escape}(-m)</td><td><select name="stop_mode">
           {if $m == 's'}
-               <option value="s" selected="selected">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s" selected="selected">smart</option>
+               <option value="f">fast</option>
+               <option value="i">immediate</option>
           {elseif $m == 'f'}  
-               <option value="s">smart</optgroup>
-               <option value="f" selected="selected">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f" selected="selected">fast</option>
+               <option value="i">immediate</option>
           {elseif $m == 'i'}  
-               <option value="s">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i" selected="selected">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f">fast</option>
+               <option value="i" selected="selected">immediate</option>
           {else}  
-               <option value="s">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f">fast</option>
+               <option value="i">immediate</option>
           {/if}  
           </td></tr>
     </tbody>
@@ -298,24 +298,25 @@ function changeView(chView){
           <td><input type="checkbox" name="d" /></td>
           {/if}
           </tr>
-          <tr><td>{$message.strCmdM|escape}(-m)</td><td><select name="m">
+          <tr><td>{$message.strCmdM|escape}(-m)</td><td><select name="restart_mode">
           {if $m == 's'}
-               <option value="s" selected="selected">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s" selected="selected">smart</option>
+               <option value="f">fast</option>
+               <option value="i">immediate</option>
           {elseif $m == 'f'}  
-               <option value="s">smart</optgroup>
-               <option value="f" selected="selected">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f" selected="selected">fast</option>
+               <option value="i">immediate</option>
           {elseif $m == 'i'}  
-               <option value="s">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i" selected="selected">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f">fast</option>
+               <option value="i" selected="selected">immediate</option>
           {else}  
-               <option value="s">smart</optgroup>
-               <option value="f">fast</optgroup>
-               <option value="i">immediate</optgroup>
+               <option value="s">smart</option>
+               <option value="f">fast</option>
+               <option value="i">immediate</option>
           {/if}  
+	  </select>
           </td></tr>
           <tr><td>{$message.strCmdPgpoolFile|escape}(-f)</td>
           <td>{$pgpoolConf|escape}</td>
-- 
2.39.5