From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Wed, 26 Mar 2014 01:41:05 +0000 (+0900)
Subject: Fix to update strings parameteres for backends
X-Git-Tag: V3_4_0_ALPHA1~5
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=df313a30ae0672f6aea39225964d39e4b66fbd03;p=pgpooladmin.git

Fix to update strings parameteres for backends

Previously the way to use the function checkString() was wrong, and
updating backend_hostnamex, backend_data_directoryx, backend_flagx failed.
---

diff --git a/pgconfig.php b/pgconfig.php
index ac2a250..4d93971 100644
--- a/pgconfig.php
+++ b/pgconfig.php
@@ -19,7 +19,7 @@
  * is" without express or implied warranty.
  *
  * @author     Ryuma Ando <ando@ecomas.co.jp>
- * @copyright  2003-2013 PgPool Global Development Group
+ * @copyright  2003-2014 PgPool Global Development Group
  * @version    CVS: $Id$
  */
 
@@ -746,7 +746,7 @@ function doCheck()
 
             // backend_hostname
             $result = checkString($configValue['backend_hostname'][$i],
-                                  $pgpoolConfigBackendParam['backend_hostname']['regexp']);
+                                  $pgpoolConfigBackendParam['backend_hostname']);
             if (!$result) {
                 $error['backend_hostname'][$i] = TRUE;
             }
@@ -769,7 +769,7 @@ function doCheck()
 
             // backend_data_directory
             $result = checkString($configValue['backend_data_directory'][$i],
-                                  $pgpoolConfigBackendParam['backend_data_directory']['regexp']);
+                                  $pgpoolConfigBackendParam['backend_data_directory']);
             if (!$result) {
                 $error['backend_data_directory'][$i] = TRUE;
             }
@@ -777,7 +777,7 @@ function doCheck()
             // backend_flag
             if (paramExists('backend_flag')) {
                 $result = checkString($configValue['backend_flag'][$i],
-                                      $pgpoolConfigBackendParam['backend_flag']['regexp']);
+                                      $pgpoolConfigBackendParam['backend_flag']);
                 if (!$result) {
                     $error['backend_flag'][$i] = TRUE;
                 }
@@ -799,7 +799,7 @@ function doCheck()
 
             // heartbeat_destination
             $result = checkString($configValue['heartbeat_destination'][$i],
-                                  $pgpoolConfigHbDestinationParam['heartbeat_destination']['regexp']);
+                                  $pgpoolConfigHbDestinationParam['heartbeat_destination']);
             if (!$result) {
                 $error['heartbeat_destination'][$i] = TRUE;
             }
@@ -814,7 +814,7 @@ function doCheck()
 
             // heartbeat_device
             $result = checkString($configValue['heartbeat_device'][$i],
-                                  $pgpoolConfigHbDestinationParam['heartbeat_device']['regexp']);
+                                  $pgpoolConfigHbDestinationParam['heartbeat_device']);
             if (!$result) {
                 $error['heartbeat_device'][$i] = TRUE;
             }
@@ -835,7 +835,7 @@ function doCheck()
 
             // other_pgpool_hostname
             $result = checkString($configValue['other_pgpool_hostname'][$i],
-                                  $pgpoolConfigWdOtherParam['other_pgpool_hostname']['regexp']);
+                                  $pgpoolConfigWdOtherParam['other_pgpool_hostname']);
             if (!$result) {
                 $error['other_pgpool_hostname'][$i] = TRUE;
             }