diff options
author | Nozomi Anzai | 2012-05-31 06:51:15 +0000 |
---|---|---|
committer | Nozomi Anzai | 2012-05-31 06:51:15 +0000 |
commit | 99c418ac6495a51e15ebf11ce035f0ec65f5885f (patch) | |
tree | 51a504b6a5dc982b8fc209c5095b01b20140bb22 | |
parent | 42b1316cf2e27759dbe4620133deb1688f6635da (diff) |
Add new pgpoolAdmin's parameter: _PGPOOL_VERSION so that pgpoolAdmin can control any pgpool-II version (after V2.0)
-rw-r--r-- | conf/pgmgt.conf.php | 1 | ||||
-rw-r--r-- | config.php | 5 | ||||
-rw-r--r-- | definePgpoolConfParam.php | 12 | ||||
-rw-r--r-- | innerSummary.php | 2 | ||||
-rw-r--r-- | install/checkParameter.php | 54 | ||||
-rw-r--r-- | install/lang/en.lang.php | 1 | ||||
-rw-r--r-- | install/lang/ja.lang.php | 1 | ||||
-rw-r--r-- | lang/en.lang.php | 1 | ||||
-rw-r--r-- | lang/ja.lang.php | 1 | ||||
-rw-r--r-- | nodeStatus.php | 3 | ||||
-rw-r--r-- | pgconfig.php | 74 | ||||
-rw-r--r-- | screen.css | 14 | ||||
-rw-r--r-- | templates/config.tpl | 13 | ||||
-rw-r--r-- | templates/innerSummary.tpl | 14 | ||||
-rw-r--r-- | templates/menu.tpl | 2 | ||||
-rw-r--r-- | templates/pgconfig.tpl | 1768 | ||||
-rw-r--r-- | templates/status.tpl | 18 |
17 files changed, 909 insertions, 1075 deletions
diff --git a/conf/pgmgt.conf.php b/conf/pgmgt.conf.php index 8381360..5dca33a 100644 --- a/conf/pgmgt.conf.php +++ b/conf/pgmgt.conf.php @@ -1,5 +1,6 @@ <?php define('_PGPOOL2_LANG', 'ja'); +define('_PGPOOL2_VERSION', '3.2'); define('_PGPOOL2_CONFIG_FILE', '/usr/local/etc/pgpool.conf'); define('_PGPOOL2_PASSWORD_FILE', '/usr/local/etc/pcp.conf'); define('_PGPOOL2_COMMAND', '/usr/local/bin/pgpool'); @@ -57,6 +57,8 @@ $errors = array(); */ $params['lang'] = (defined('_PGPOOL2_LANG')) ? _PGPOOL2_LANG : $message['errNoDefined']; +$params['version'] = (defined('_PGPOOL2_LANG')) ? + _PGPOOL2_VERSION : $message['errNoDefined']; $params['pgpool_config_file'] = (defined('_PGPOOL2_CONFIG_FILE')) ? _PGPOOL2_CONFIG_FILE : $message['errNoDefined']; $params['password_file'] = (defined('_PGPOOL2_PASSWORD_FILE')) ? @@ -89,6 +91,7 @@ switch ( $action ) { case 'update': setValue('lang'); + setValue('version'); setValue('pgpool_config_file'); setValue('password_file'); @@ -232,6 +235,8 @@ function writePgmtConf($pgmgtConfigFile) fputs($fp, $str); write($fp, '_PGPOOL2_LANG', $params['lang']); + write($fp, '_PGPOOL2_VERSION', $params['version']); + write($fp, '_PGPOOL2_CONFIG_FILE', $params['pgpool_config_file']); write($fp, '_PGPOOL2_PASSWORD_FILE', $params['password_file']); write($fp, '_PGPOOL2_COMMAND', $params['pgpool_command']); diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php index 0f6437c..59d621a 100644 --- a/definePgpoolConfParam.php +++ b/definePgpoolConfParam.php @@ -511,7 +511,7 @@ $pgpoolConfigParam[$key]['max'] = NUM_MAX; $key = 'client_idle_limit_in_recovery'; $pgpoolConfigParam[$key]['type'] = 'N'; $pgpoolConfigParam[$key]['default'] = 0; -$pgpoolConfigParam[$key]['min'] = -1; +$pgpoolConfigParam[$key]['min'] = (3.0 <= _PGPOOL2_VERSION) ? -1 : 0; $pgpoolConfigParam[$key]['max'] = NUM_MAX; #------------------------------------------------------------------------------ @@ -596,4 +596,14 @@ $pgpoolConfigParam[$key]['type'] = 'N'; $pgpoolConfigParam[$key]['default'] = 0; $pgpoolConfigParam[$key]['min'] = 0; $pgpoolConfigParam[$key]['max'] = NUM_MAX; + +#------------------------------------------------------------------------------ +# Deleted +#------------------------------------------------------------------------------ + +$key = 'backend_socket_dir'; +$pgpoolConfigParam[$key]['type'] ='C'; +$pgpoolConfigParam[$key]['default'] ='/tmp'; +$pgpoolConfigParam[$key]['regexp'] = "$dirreg"; + ?> diff --git a/innerSummary.php b/innerSummary.php index 2ee985b..ac42986 100644 --- a/innerSummary.php +++ b/innerSummary.php @@ -32,6 +32,8 @@ if (!isset($_SESSION[SESSION_LOGIN_USER])) { $params = readConfigParams(array('parallel_mode', 'master_slave_mode', 'master_slave_sub_mode', + 'memory_cache_enabled', + 'memqcache_method', 'enable_query_cache', 'replication_mode', 'load_balance_mode', diff --git a/install/checkParameter.php b/install/checkParameter.php index 9f907e9..b41d658 100644 --- a/install/checkParameter.php +++ b/install/checkParameter.php @@ -196,6 +196,7 @@ if ($error || (isset($_POST['submitBack']) && $_POST['submitBack'] != NULL)) { } else { $params['lang'] = $_SESSION['lang']; + $params['version'] = $_POST['version']; $params['pgpool2_config_file'] = $pgpool2_config_file; $params['password_file'] = $password_file; $params['pcp_client_dir'] = $pcp_client_dir; @@ -211,6 +212,8 @@ if (!$error && $action == 'next') { fputs($fp, "<?php"."\n"); write($fp, '_PGPOOL2_LANG', $_SESSION['lang']); + write($fp, '_PGPOOL2_VERSION', $_POST['version']); + write($fp, '_PGPOOL2_CONFIG_FILE', $_POST['pgpool2_config_file']); write($fp, '_PGPOOL2_PASSWORD_FILE', $_POST['password_file']); write($fp, '_PGPOOL2_COMMAND', $_POST['pgpool_command']); @@ -254,7 +257,6 @@ if (!$error && $action == 'next') { <div id="content"> <h2>Welcome to pgpool-II Administration Tool</h2> - <h3><?php echo $message['strParameterCheck']; ?></h3> <form action="checkParameter.php" method="post" name="CheckPath" id="CheckPath"> <?php if ($error) { @@ -264,8 +266,36 @@ if (!$error && $action == 'next') { } ?> -<table> - <tbody> +<?php +/* --------------------------------------------------------------------- */ +/* Version */ +/* --------------------------------------------------------------------- */ +?> + <h3><?php echo $message['strVersion'] ?></h3> + + <table> + <tr> + <th><label><?php echo $message['strVersion'] ?></label></th> + <td><select name="version" /> + <?php + foreach (versions() as $v) { + echo '<option value="'. $v. '">'. $v. '</optgroup>'; + } + ?> + </select> + <?php showResult($msgCmdM); ?> + </td> + </tr> + </table> + +<?php +/* --------------------------------------------------------------------- */ +/* Config File */ +/* --------------------------------------------------------------------- */ +?> + <h3><?php echo $message['strParameterCheck'] ?></h3> + + <table> <tr> <th><label><?php echo $message['strPgConfFile'] ?></label></th> <td><input name="pgpool2_config_file" type="text" value="<?php echo $pgpool2_config_file?>" size="50" /> @@ -284,11 +314,16 @@ if (!$error && $action == 'next') { <?php showResult($msgPgpoolCommand); ?> </td> </tr> + </table> - <tr> - <th colspan="3"><h3><?php echo $message['strPgpoolCommandOption'] ?></h3></th> - </tr> +<?php +/* --------------------------------------------------------------------- */ +/* Command options */ +/* --------------------------------------------------------------------- */ +?> + <h3><?php echo $message['strPgpoolCommandOption'] ?></h3> + <table> <tr> <th><label><?php echo $message['strCmdC'] ?></label></th> <td><input type="checkbox" name="c" /> @@ -360,7 +395,6 @@ if (!$error && $action == 'next') { <?php showResult($msgPcpRefreshTime); ?> </td> </tr> - </tbody> </table> <p> @@ -388,6 +422,12 @@ else { /* Function */ /* --------------------------------------------------------------------- */ +function versions() +{ + return array('3.2', '3.1', '3.0', + '2.3', '2.2', '2.1', '2.0'); +} + function write($fp, $defname, $val) { fputs($fp, "define('{$defname}', '{$val}');\n"); diff --git a/install/lang/en.lang.php b/install/lang/en.lang.php index 91fe970..f4de87b 100644 --- a/install/lang/en.lang.php +++ b/install/lang/en.lang.php @@ -26,6 +26,7 @@ $message = array( 'lang' => 'en', 'strLang' => 'English', + 'strVersion' => 'pgpool-II version', 'strNext' => 'Next', 'strCheck' => 'Check', 'strDirectoryCheck' => 'Directory Check', diff --git a/install/lang/ja.lang.php b/install/lang/ja.lang.php index 700380f..a0a9577 100644 --- a/install/lang/ja.lang.php +++ b/install/lang/ja.lang.php @@ -26,6 +26,7 @@ $message = array( 'lang' => 'ja', 'strLang' => '日本語', + 'strVersion' => 'pgpool-II バージョン', 'strNext' => '次へ', 'strCheck' => 'チェック', 'strDirectoryCheck' => 'ディレクトリ確認', diff --git a/lang/en.lang.php b/lang/en.lang.php index 95cffe0..951d540 100644 --- a/lang/en.lang.php +++ b/lang/en.lang.php @@ -291,6 +291,7 @@ $message = array( 'strUp' => 'Up', 'strUpdate' => 'Update', 'strValue' => 'Value', + 'strVersion' => 'pgpool-II version', 'strWeight' => 'Weight', 'e1' => 'pgmgt.conf.php not found.', diff --git a/lang/ja.lang.php b/lang/ja.lang.php index ad7feae..c3a0bc6 100644 --- a/lang/ja.lang.php +++ b/lang/ja.lang.php @@ -283,6 +283,7 @@ $message = array( 'strUp' => 'アップ', 'strUpdate' => '更新', 'strValue' => '値', + 'strVersion' => 'pgpool-II バージョン', 'strWeight' => 'ウェイト', 'e1' => 'pgmgt.conf.phpが見つかりません', diff --git a/nodeStatus.php b/nodeStatus.php index baedb7f..13580cd 100644 --- a/nodeStatus.php +++ b/nodeStatus.php @@ -106,7 +106,8 @@ for ($i = 0; $i < $nodeCount; $i++) { } else { array_push($nodeInfo[$i], 'none'); } - if (useStreaming()) { + // pcp_promote_node exists after V3.1 + if (hasPcpPromote() && useStreaming()) { array_push($nodeInfo[$i], 'promote'); } break; diff --git a/pgconfig.php b/pgconfig.php index 66ec637..42cef69 100644 --- a/pgconfig.php +++ b/pgconfig.php @@ -57,7 +57,7 @@ switch ($action) { } else { $configValue[$key] = 'off'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -66,19 +66,19 @@ switch ($action) { if (isset($_POST['backend_hostname'])) { $configValue['backend_hostname'] = $_POST['backend_hostname']; } else { - $configValue['backend_hostname'] = array(); + $configValue['backend_hostname'] = array(); } if (isset($_POST['backend_port'])) { $configValue['backend_port'] = $_POST['backend_port']; } else { - $configValue['backend_port'] = array(); + $configValue['backend_port'] = array(); } if (isset($_POST['backend_weight'])) { $configValue['backend_weight'] = $_POST['backend_weight']; } else { - $configValue['backend_weight'] = array(); + $configValue['backend_weight'] = array(); } if (isset($_POST['backend_data_directory'])) { @@ -87,10 +87,12 @@ switch ($action) { $configValue['backend_data_directory'] = array(); } - if (isset($_POST['backend_flag'])) { - $configValue['backend_flag'] = $_POST['backend_flag']; - } else { - $configValue['backend_flag'] = array(); + if (paramExists('backend_flag')) { + if (isset($_POST['backend_flag'])) { + $configValue['backend_flag'] = $_POST['backend_flag']; + } else { + $configValue['backend_flag'] = array(); + } } $tpl->assign('params', $configValue); @@ -109,7 +111,7 @@ switch ($action) { } else { $configValue[$key] = 'off'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -170,7 +172,7 @@ switch ($action) { } else { $configValue[$key] = 'false'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -178,7 +180,7 @@ switch ($action) { /** * Confirmations of value except backend host */ - foreach( $pgpoolConfigParam as $key => $value) { + foreach ($pgpoolConfigParam as $key => $value) { check($key, $value, $configValue, $error); } @@ -195,59 +197,45 @@ switch ($action) { */ if (isset($configValue['backend_hostname'])) { for ($i = 0; $i < count($configValue['backend_hostname']); $i++) { - $hostname = $configValue['backend_hostname'][$i]; - $port = $configValue['backend_port'][$i]; - $weight = $configValue['backend_weight'][$i]; - $data_directory = $configValue['backend_data_directory'][$i]; - $flag = $configValue['backend_flag'][$i]; - $result = FALSE; // backend_hostname - $result = checkString($hostname, + $result = checkString($configValue['backend_hostname'][$i], $pgpoolConfigBackendParam['backend_hostname']['regexp']); if (!$result) { $error['backend_hostname'][$i] = TRUE; - } else { - $error['backend_hostname'][$i] = FALSE; } // backend_port - $result = checkInteger($port, + $result = checkInteger($configValue['backend_port'][$i], $pgpoolConfigBackendParam['backend_port']['min'], $pgpoolConfigBackendParam['backend_port']['max']); if (!$result) { $error['backend_port'][$i] = TRUE; - } else { - $error['backend_port'][$i] = FALSE; } // backend_weight - $result = checkFloat($weight, + $result = checkFloat($configValue['backend_weight'][$i], $pgpoolConfigBackendParam['backend_weight']['min'], $pgpoolConfigBackendParam['backend_weight']['max']); if (!$result) { $error['backend_weight'][$i] = TRUE; - } else { - $error['backend_weight'][$i] = FALSE; } // backend_data_directory - $result = checkString($data_directory, + $result = checkString($configValue['backend_data_directory'][$i], $pgpoolConfigBackendParam['backend_data_directory']['regexp']); if (!$result) { $error['backend_data_directory'][$i] = TRUE; - } else { - $error['backend_data_directory'][$i] = FALSE; } // backend_flag - $result = checkString($flag, - $pgpoolConfigBackendParam['backend_flag']['regexp']); - if (!$result) { - $error['backend_flag'][$i] = TRUE; - } else { - $error['backend_flag'][$i] = FALSE; + if (paramExists('backend_flag')) { + $result = checkString($configValue['backend_flag'][$i], + $pgpoolConfigBackendParam['backend_flag']['regexp']); + if (!$result) { + $error['backend_flag'][$i] = TRUE; + } } } } @@ -503,7 +491,7 @@ function writeConfigFile($configValue, $pgpoolConfigParam) } if (isset($configValue['backend_hostname'])) { - for ($i = 0; $i<count($configValue['backend_hostname']); $i++) { + for ($i = 0; $i < count($configValue['backend_hostname']); $i++) { $line = "backend_hostname$i = '" . $configValue['backend_hostname'][$i] . "'\n"; $configFile[] = $line; @@ -517,8 +505,10 @@ function writeConfigFile($configValue, $pgpoolConfigParam) $line = "backend_data_directory$i = '" . $configValue['backend_data_directory'][$i] . "'\n"; $configFile[] = $line; - $line = "backend_flag$i= '" . $configValue['backend_flag'][$i] . "'\n"; - $configFile[] = $line; + if (paramExists('backend_flag')) { + $line = "backend_flag$i= '" . $configValue['backend_flag'][$i] . "'\n"; + $configFile[] = $line; + } } } @@ -535,7 +525,7 @@ function writeConfigFile($configValue, $pgpoolConfigParam) * @param int $num * @param array $configValue */ -function deleteBackendHost($num, &$configValue) +function deleteBackendHost($num, &$configValue) { unset($configValue['backend_hostname'][$num]); $configValue['backend_hostname'] = array_values($configValue['backend_hostname']); @@ -549,8 +539,10 @@ function deleteBackendHost($num, &$configValue) unset($configValue['backend_data_directory'][$num]); $configValue['backend_data_directory'] = array_values($configValue['backend_data_directory']); - unset($configValue['backend_flag'][$num]); - $configValue['backend_flag'] = array_values($configValue['backend_flag']); + if (paramExists('backend_flag')) { + unset($configValue['backend_flag'][$num]); + $configValue['backend_flag'] = array_values($configValue['backend_flag']); + } } ?> @@ -156,6 +156,20 @@ p { border-right: 1px solid lightsteelblue; border-collapse: collapse; } +.message { + margin-top: 10px; + border: 5px solid lightsteelblue; + border-radius: 5px; + background-color: ghostwhite; + padding: 10px; +} +.message h3 { + color: #4682B4; +} +.message p { + font-family: monospace; + border-bottom: 1px dotted #cccccc; +} #help { float: right; diff --git a/templates/config.tpl b/templates/config.tpl index 258f661..70b1cf7 100644 --- a/templates/config.tpl +++ b/templates/config.tpl @@ -52,6 +52,19 @@ </select> </td> </tr> + <th><label>{$message.strVersion|escape}</label> + (float)</th> + <td class="input"><select name="version"> + {foreach key=key item=str from=versions()} + {if $params.version == $str} + <option value="{$str|escape}" selected="selected">{$str|escape}</option> + {else} + <option value="{$str|escape}">{$str|escape}</option> + {/if} + {/foreach} + </select> + </td> + </tr> <tr> {if isset($errors.pgpool_config_file)}<th class="error">{else}<th>{/if} <label>{$message.strPgConfFile|escape}</label> diff --git a/templates/innerSummary.tpl b/templates/innerSummary.tpl index 7c3f458..f11146e 100644 --- a/templates/innerSummary.tpl +++ b/templates/innerSummary.tpl @@ -67,10 +67,18 @@ td > img { <tr><td>{$message.strQueryCache|escape}</td> <td> - {if $params.enable_query_cache == 'on'} - <img src="images/check.png"> {$message.strOn|escape} + {if hasMemqcache()} + {if $params.memory_cache_enabled == 'on'} + <img src="images/check.png"> {$message.strOn|escape} / {$params.memqcache_method} + {else} + <img src="images/no.png"> {$message.strOff|escape} + {/if} {else} - <img src="images/no.png"> {$message.strOff|escape} + {if $params.enable_query_cache == 'on'} + <img src="images/check.png"> {$message.strOn|escape} + {else} + <img src="images/no.png"> {$message.strOff|escape} + {/if} {/if} </td></tr> diff --git a/templates/menu.tpl b/templates/menu.tpl index 52490f1..e07b307 100644 --- a/templates/menu.tpl +++ b/templates/menu.tpl @@ -2,7 +2,9 @@ {if $isLogin == 'true'} <li><strong><a href="status.php">{$message.strPgpoolStatus|escape}</a></strong></li> <li><a href="nodeServerStatus.php">{$message.strNodeStatus|escape}</a></li> + {if hasMemqCache() == false} <li><a href="queryCache.php">{$message.strQueryCache|escape}</a></li> + {/if} <li><a href="systemDb.php">{$message.strSystemDb|escape}</a></li> <li><a href="pgconfig.php">{$message.strPgConfSetting|escape}</a></li> <li><a href="config.php">{$message.strSetting|escape}</a></li> diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl index b245456..0fc3ceb 100644 --- a/templates/pgconfig.tpl +++ b/templates/pgconfig.tpl @@ -85,12 +85,17 @@ function cancelNode() { <li><a href="#replication_mode">Replication Mode</a></li> <li><a href="#load_balancing_mode">Load Balancing Mode</a></li> <li><a href="#master_slave_mode">Mater/Slave Mode</a></li> - <li><a href="#parallel_mode">Parallel Mode and Query Cache</a></li> + <li><a href="#parallel_mode">{if hasMemqcache()}Parallel Mode + {else}Parallel Mode and Query Cache{/if}</a></li> <li><a href="#health-check">Health Check</a></li> <li><a href="#failover">Failover and Failback</a></li> <li><a href="#recovery">Online Recovery</a></li> + {if hasMemqcache()} <li><a href="#memqcache">On Memory Query Cache</a></li> + {/if} + {if paramExists('relcache_expire')} <li><a href="#others">Others</a></li> + {/if} </ul> </div> @@ -121,151 +126,121 @@ function cancelNode() { <tr><th class="category" colspan="2">pgpool Connection Settings</th></tr> - <tr> {if isset($error.listen_addresses)} - <th class="error"><label>{$message.descListen_addresses|escape}</label> - <br />listen_addresses (string) *</th> - {else} - <th><label>{$message.descListen_addresses|escape}</label> - <br />listen_addresses (string) *</th> - {/if} - <td><input type="text" name="listen_addresses" value="{$params.listen_addresses|escape}"/></td> + <tr> + <th{if isset($error.listen_addresses)} class="error"{/if}> + <label>{$message.descListen_addresses|escape}</label> + <br />listen_addresses (string) *</th> + <td><input type="text" name="listen_addresses" value="{$params.listen_addresses|escape}"/></td> </tr> - <tr> {if isset($error.port)} - <th class="error"><label>{$message.descPort|escape}</label> - <br />port (integer) *</th> - {else} - <th><label>{$message.descPort|escape}</label> - <br />port (integer) *</th> - {/if} - <td><input type="text" name="port" value="{$params.port|escape}"/></td> + <tr> + <th{if isset($error.port)} class="error"{/if}> + <label>{$message.descPort|escape}</label> + <br />port (integer) *</th> + <td><input type="text" name="port" value="{$params.port|escape}"/></td> </tr> - <tr> {if isset($error.socket_dir)} - <th class="error"><label>{$message.descSocket_dir|escape}</label> - <br />socket_dir (string) *</th> - {else} - <th><label>{$message.descSocket_dir|escape}</label> - <br />socket_dir (string) *</th> - {/if} - <td><input type="text" name="socket_dir" value="{$params.socket_dir|escape}"/></td> - </tr> + <tr> + <th{if isset($error.socket_dir)} class="error"{/if}> + <label>{$message.descSocket_dir|escape}</label> + <br />socket_dir (string) *</th> + <td><input type="text" name="socket_dir" value="{$params.socket_dir|escape}"/></td> + </tr> + + {if paramExists('backend_socket_dir')} + <tr> + <th{if isset($error.backend_socket_dir)} class="error"{/if}> + <label>{$message.descBackend_socket_dir|escape}</label> + <br />backend_socket_dir (string) *</th> + <td><input type="text" name="backend_socket_dir" + value="{$params.backend_socket_dir|escape}"/></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} <tr><th class="category" colspan="2">pgpool Communication Manager Connection Settings</th></tr> - <tr> {if isset($error.pcp_port)} - <th class="error"><label>{$message.descPcp_port|escape}</label> - <br />pcp_port (integer) *</th> - {else} - <th><label>{$message.descPcp_port|escape}</label> - <br />pcp_port (integer) *</th> - {/if} - <td><input type="text" name="pcp_port" value="{$params.pcp_port|escape}"/></td> + <tr> + <th{if isset($error.pcp_port)} class="error"{/if}> + <label>{$message.descPcp_port|escape}</label> + <br />pcp_port (integer) *</th> + <td><input type="text" name="pcp_port" value="{$params.pcp_port|escape}"/></td> </tr> - <tr> {if isset($error.pcp_socket_dir)} - <th class="error"><label>{$message.descPcp_socket_dir|escape}</label> - <br />pcp_socket_dir (string) *</th> - {else} - <th><label>{$message.descPcp_socket_dir|escape}</label> - <br />pcp_socket_dir (string) *</th> - {/if} - <td><input type="text" name="pcp_socket_dir" value="{$params.pcp_socket_dir|escape}"/></td> + <tr> + <th{if isset($error.pcp_socket_dir)} class="error"{/if}> + <label>{$message.descPcp_socket_dir|escape}</label> + <br />pcp_socket_dir (string) *</th> + <td><input type="text" name="pcp_socket_dir" value="{$params.pcp_socket_dir|escape}"/></td> </tr> {* --------------------------------------------------------------------- *} <tr><th class="category" colspan="2">Authentication</th></tr> - <tr> {if isset($error.enable_pool_hba)} - <th class="error"><label>{$message.descEnable_pool_hba|escape}</label> - <br />enable_pool_hba (bool)</th> - {else} - <th><label>{$message.descEnable_pool_hba|escape}</label> - <br />enable_pool_hba (bool)</th> - {/if} - {if $params.enable_pool_hba == 'on'} - <td><input type="checkbox" name="enable_pool_hba" id="enable_pool_hba" checked="checked" /></td> - {else} - <td><input type="checkbox" name="enable_pool_hba" id="enable_pool_hba" /></td> - {/if} + <tr> + <th{if isset($error.enable_pool_hba)} class="error"{/if}> + <label>{$message.descEnable_pool_hba|escape}</label> + <br />enable_pool_hba (bool)</th> + <td><input type="checkbox" name="enable_pool_hba" id="enable_pool_hba" + {if $params.enable_pool_hba == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.authentication_timeout)} - <th class="error"><label>{$message.descAuthentication_timeout|escape}</label> - <br />authentication_timeout (integer)</th> - {else} - <th><label>{$message.descAuthentication_timeout|escape}</label> - <br />authentication_timeout (integer)</th> - {/if} - <td><input type="text" name="authentication_timeout" value="{$params.authentication_timeout|escape}"/></td> + <tr> + <th{if isset($error.authentication_timeout)} class="error"{/if}> + <label>{$message.descAuthentication_timeout|escape}</label> + <br />authentication_timeout (integer)</th> + <td><input type="text" name="authentication_timeout" value="{$params.authentication_timeout|escape}"/></td> </tr> {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">SSL Connections</th></tr> - - <tr> {if isset($error.ssl)} - <th class="error"><label>{$message.descSsl|escape}</label> - <br />ssl (bool)</th> - {else} - <th><label>{$message.descSsl|escape}</label> - <br />ssl (bool)</th> - {/if} - {if $params.ssl == 'on'} - <td><input type="checkbox" name="ssl" id="ssl" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="ssl" id="ssl" value="false" /></td> - {/if} </tr> - </tr> - - <tr> {if isset($error.ssl_key)} - <th class="error"><label>{$message.descSsl_key|escape}</label> - <br />ssl_key (string)</th> - {else} - <th><label>{$message.descSsl_key|escape}</label> - <br />ssl_key (string)</th> - {/if} - <td><input type="text" name="ssl_key" id="ssl_key" value="{$params.ssl_key|escape}" /></td> - </tr> - - <tr> {if isset($error.ssl_cert)} - <th class="error"><label>{$message.descSsl_cert|escape}</label> - <br />ssl_cert (string)</th> - {else} - <th><label>{$message.descSsl_cert|escape}</label> - <br />ssl_cert (string)</th> - {/if} - <td><input type="text" name="ssl_cert" id="ssl_cert" value="{$params.ssl_cert|escape}" /></td> - </tr> - - <tr> {if isset($error.ssl_ca_cert)} - <th class="error"><label>{$message.descSsl_ca_cert|escape}</label> - <br />ssl_ca_cert (string)</th> - {else} - <th><label>{$message.descSsl_ca_cert|escape}</label> - <br />ssl_ca_cert (string)</th> - {/if} - <td><input type="text" name="ssl_ca_cert" id="ssl_ca_cert" value="{$params.ssl_ca_cert|escape}" /></td> - </tr> - - <tr> {if isset($error.ssl_ca_cert_dir)} - <th class="error"><label>{$message.descSsl_ca_cert_dir|escape}</label> - <br />ssl_ca_cert_dir (string)</th> - {else} - <th><label>{$message.descSsl_ca_cert_dir|escape}</label> - <br />ssl_ca_cert_dir (string)</th> - {/if} - <td><input type="text" name="ssl_ca_cert_dir" id="ssl_ca_cert_dir" - value="{$params.ssl_ca_cert_dir|escape}" /></td> - </tr> + {if paramExists('ssl')} + <tr><th class="category" colspan="2">SSL Connections</th></tr> + + <tr> + <th{if isset($error.ssl)} class="error"{/if}> + <label>{$message.descSsl|escape}</label> + <br />ssl (bool)</th> + <td><input type="checkbox" name="ssl" id="ssl" value="true" + {if $params.ssl == 'on'} checked="checked"{/if} /></td> + </tr> + + <tr> + <th{if isset($error.ssl_key)} class="error"{/if}> + <label>{$message.descSsl_key|escape}</label> + <br />ssl_key (string)</th> + <td><input type="text" name="ssl_key" id="ssl_key" value="{$params.ssl_key|escape}" /></td> + </tr> + + <tr> + <th{if isset($error.ssl_cert)} class="error"{/if}> + <label>{$message.descSsl_cert|escape}</label> + <br />ssl_cert (string)</th> + <td><input type="text" name="ssl_cert" id="ssl_cert" value="{$params.ssl_cert|escape}" /></td> + </tr> + + <tr> + <th{if isset($error.ssl_ca_cert)} class="error"{/if}> + <label>{$message.descSsl_ca_cert|escape}</label> + <br />ssl_ca_cert (string)</th> + <td><input type="text" name="ssl_ca_cert" id="ssl_ca_cert" value="{$params.ssl_ca_cert|escape}" /></td> + </tr> + + <tr> + <th{if isset($error.ssl_ca_cert_dir)} class="error"{/if}> + <label>{$message.descSsl_ca_cert_dir|escape}</label> + <br />ssl_ca_cert_dir (string)</th> + <td><input type="text" name="ssl_ca_cert_dir" id="ssl_ca_cert_dir" + value="{$params.ssl_ca_cert_dir|escape}" /></td> + </tr> + {/if} </table> {* --------------------------------------------------------------------- * - * Connections * + * Pools * * --------------------------------------------------------------------- *} <h3><a name="pools" id="pools">Pools</a></h3> @@ -287,68 +262,50 @@ function cancelNode() { <tr><th class="category" colspan="2">Pool size</th></tr> - <tr> {if isset($error.num_init_children)} - <th class="error"><label>{$message.descNum_init_children|escape}</label> - <br />num_init_children (integer) *</th> - {else} - <th><label>{$message.descNum_init_children|escape}</label> - <br />num_init_children (integer) *</th> - {/if} - <td><input type="text" name="num_init_children" value="{$params.num_init_children|escape}"/></td> + <tr> + <th{if isset($error.num_init_children)} class="error"{/if}> + <label>{$message.descNum_init_children|escape}</label> + <br />num_init_children (integer) *</th> + <td><input type="text" name="num_init_children" value="{$params.num_init_children|escape}"/></td> </tr> - <tr> {if isset($error.max_pool)} - <th class="error"><label>{$message.descMax_pool|escape}</label> - <br />max_pool (integer) *</th> - {else} - <th><label>{$message.descMax_pool|escape}</label> - <br />max_pool (integer) *</th> - {/if} - <td><input type="text" name="max_pool" value="{$params.max_pool|escape}"/></td> + <tr> + <th{if isset($error.max_pool)} class="error"{/if}> + <label>{$message.descMax_pool|escape}</label> + <br />max_pool (integer) *</th> + <td><input type="text" name="max_pool" value="{$params.max_pool|escape}"/></td> </tr> {* --------------------------------------------------------------------- *} <tr><th class="category" colspan="2">Life time</th></tr> - <tr> {if isset($error.child_life_time)} - <th class="error"><label>{$message.descChild_life_time|escape}</label> - <br />child_life_time (integer)</th> - {else} - <th><label>{$message.descChild_life_time|escape}</label> - <br />child_life_time (integer)</th> - {/if} - <td><input type="text" name="child_life_time" value="{$params.child_life_time|escape}"/></td> + <tr> + <th{if isset($error.child_life_time)} class="error"{/if}> + <label>{$message.descChild_life_time|escape}</label> + <br />child_life_time (integer)</th> + <td><input type="text" name="child_life_time" value="{$params.child_life_time|escape}"/></td> </tr> - <tr> {if isset($error.child_max_connections)} - <th class="error"><label>{$message.descChild_max_connections|escape}</label> - <br />child_max_connections (integer)</th> - {else} - <th><label>{$message.descChild_max_connections|escape}</label> - <br />child_max_connections (integer)</th> - {/if} - <td><input type="text" name="child_max_connections" value="{$params.child_max_connections|escape}"/></td> + <tr> + <th{if isset($error.child_max_connections)} class="error"{/if}> + <label>{$message.descChild_max_connections|escape}</label> + <br />child_max_connections (integer)</th> + <td><input type="text" name="child_max_connections" value="{$params.child_max_connections|escape}"/></td> </tr> - <tr> {if isset($error.connection_life_time)} - <th class="error"><label>{$message.descConnection_life_time|escape}</label> - <br />connection_life_time (integer)</th> - {else} - <th><label>{$message.descConnection_life_time|escape}</label> - <br />connection_life_time (integer)</th> - {/if} - <td><input type="text" name="connection_life_time" value="{$params.connection_life_time|escape}"/></td> + <tr> + <th{if isset($error.connection_life_time)} class="error"{/if}> + <label>{$message.descConnection_life_time|escape}</label> + <br />connection_life_time (integer)</th> + <td><input type="text" name="connection_life_time" value="{$params.connection_life_time|escape}"/></td> </tr> - <tr> {if isset($error.client_idle_limit)} - <th class="error"><label>{$message.descClient_idle_limit|escape}</label> - <br />client_idle_limit (integer)</th> - {else} - <th><label>{$message.descClient_idle_limit|escape}</label> - <br />client_idle_limit (integer)</th> - {/if} - <td><input type="text" name="client_idle_limit" value="{$params.client_idle_limit|escape}"/></td> + <tr> + <th{if isset($error.client_idle_limit)} class="error"{/if}> + <label>{$message.descClient_idle_limit|escape}</label> + <br />client_idle_limit (integer)</th> + <td><input type="text" name="client_idle_limit" value="{$params.client_idle_limit|escape}"/></td> </tr> </tbody> @@ -370,118 +327,108 @@ function cancelNode() { </thead> {if isset($isAdd) && $isAdd == true} - <tfoot> - <tr> - <td colspan="3"> - <input type="button" name="cancel" value="{$message.strCancel|escape}" onclick="cancelNode()" /></td> - </tr> - </tfoot> + <tfoot> + <tr> + <td colspan="3"> + <input type="button" name="cancel" value="{$message.strCancel|escape}" onclick="cancelNode()" /></td> + </tr> + </tfoot> {else} - <tfoot> - <tr> - <td colspan="3"> - <input type="button" name="add" value="{$message.strAdd|escape}" onclick="addNode()" /></td> - </tr> - </tfoot> - {/if} - <tbody> - - {section name=num loop=$params.backend_hostname} - <tr> {if isset($error.backend_hostname[num])} - <th class="error"><label>{$message.descBackend_hostname|escape}</label> - <br />backend_hostname{$smarty.section.num.index} (string)</th> - {else} - <th><label>{$message.descBackend_hostname|escape}</label> - <br />backend_hostname{$smarty.section.num.index} (string)</th> - {/if} - <td><input type="text" name="backend_hostname[]" value="{$params.backend_hostname[num]|escape}" /></td> - <td rowspan="5"> - <input type="button" name="delete" value="{$message.strDelete|escape}" onclick="del({$smarty.section.num.index})" /></td> - </tr> - - <tr> {if isset($error.backend_port[num])} - <th class="error"><label>{$message.descBackend_port|escape}</label> - <br />backend_port{$smarty.section.num.index|escape} (integer)</th> - {else} - <th><label>{$message.descBackend_port|escape}</label> - <br />backend_port{$smarty.section.num.index|escape} (integer)</th> - {/if} - <td><input type="text" name="backend_port[]" value="{$params.backend_port[num]|escape}" /></td> - </tr> - - <tr> {if isset($error.backend_weight[num])} - <th class="error"><label>{$message.descBackend_weight|escape}</label> - <br />backend_weight{$smarty.section.num.index|escape} (float)</th> - {else} - <th><label>{$message.descBackend_weight|escape}</label> - <br />backend_weight{$smarty.section.num.index|escape} (float)</th> - {/if} - <td><input type="text" name="backend_weight[]" value="{$params.backend_weight[num]|escape}" /></td> - </tr> - - <tr> {if isset($error.backend_data_directory[num])} - <th class="error"><label>{$message.descBackend_data_directory|escape}</label> - <br />backend_data_directory{$smarty.section.num.index|escape} (string)</th> - {else} - <th><label>{$message.descBackend_data_directory|escape}</label> - <br />backend_data_directory{$smarty.section.num.index|escape} (string)</th> - {/if} - <td><input type="text" name="backend_data_directory[]" - value="{$params.backend_data_directory[num]|escape}" /></td> - </tr> - - <tr> {if isset($error.backend_flag[num])} - <th class="error"><label>{$message.descBackend_flag|escape}</label> - <br />backend_flag{$smarty.section.num.index|escape} (string) *</th> - {else} - <th><label>{$message.descBackend_flag|escape}</label> - <br />backend_flag{$smarty.section.num.index|escape} (string) *</th> - {/if} - <td><select name="backend_flag[]" id="backend_flag[]"> - <option value="ALLOW_TO_FAILOVER" - {if $params.backend_flag[num] == 'ALLOW_TO_FAILOVER'}selected{/if}>ALLOW_TO_FAILOVER</option> - <option value="DISALLOW_TO_FAILOVER" - {if $params.backend_flag[num] == 'DISALLOW_TO_FAILOVER'}selected{/if}>DISALLOW_TO_FAILOVER</option> - </select></td> - </tr> - {/section} - - {if isset($isAdd) && $isAdd == true} - <tr> - <th><label>{$message.descBackend_hostname|escape}</label> - <br />backend_hostname{$smarty.section.num.index} (string)</th> - <td><input type="text" name="backend_hostname[]" value="" /></td> - <td rowspan="5"></td> - </tr> - - </tr> - <tr> - <th><label>{$message.descBackend_port|escape}</label> - <br />backend_port{$smarty.section.num.index|escape} (integer)</th> - <td><input type="text" name="backend_port[]" value="" /></td> - </tr> - - <tr> - <th><label>{$message.descBackend_weight|escape}</label> - <br />backend_weight{$smarty.section.num.index|escape} (float)</th> - <td><input type="text" name="backend_weight[]" value="" /></td> - </tr> - - <tr> - <th><label>{$message.descBackend_data_directory|escape}</label> - <br />backend_data_directory{$smarty.section.num.index|escape} (string)</th> - <td><input type="text" name="backend_data_directory[]" value="" /></td> - </tr> - - <tr> - <th><label>{$message.descBackend_flag|escape}</label> - <br />backend_flag{$smarty.section.num.index|escape} *</th> - <td><select name="backend_flag[]" id="backend_flag[]"> - <option value="ALLOW_TO_FAILOVER" selected>ALLOW_TO_FAILOVER</option> - <option value="DISALLOW_TO_FAILOVER">DISALLOW_TO_FAILOVER</option> - </select></td> - </tr> + <tfoot> + <tr> + <td colspan="3"> + <input type="button" name="add" value="{$message.strAdd|escape}" onclick="addNode()" /></td> + </tr> + </tfoot> {/if} + <tbody> + + {section name=num loop=$params.backend_hostname} + <tr> + <th{if isset($error.backend_hostname[num])} class="error"{/if}> + <label>{$message.descBackend_hostname|escape}</label> + <br />backend_hostname{$smarty.section.num.index} (string)</th> + <td><input type="text" name="backend_hostname[]" value="{$params.backend_hostname[num]|escape}" /></td> + <td rowspan="{if paramExists('backend_flag')}5{else}4{/if}"> + <input type="button" name="delete" value="{$message.strDelete|escape}" + onclick="del({$smarty.section.num.index})" /></td> + </tr> + + <tr> + <th{if isset($error.backend_port[num])} class="error"{/if}> + <label>{$message.descBackend_port|escape}</label> + <br />backend_port{$smarty.section.num.index|escape} (integer)</th> + <td><input type="text" name="backend_port[]" value="{$params.backend_port[num]|escape}" /></td> + </tr> + + <tr> + <th{if isset($error.backend_weight[num])} class="error"{/if}> + <label>{$message.descBackend_weight|escape}</label> + <br />backend_weight{$smarty.section.num.index|escape} (float)</th> + <td><input type="text" name="backend_weight[]" value="{$params.backend_weight[num]|escape}" /></td> + </tr> + + <tr> + <th{if isset($error.backend_data_directory[num])} class="error"{/if}> + <label>{$message.descBackend_data_directory|escape}</label> + <br />backend_data_directory{$smarty.section.num.index|escape} (string)</th> + <td><input type="text" name="backend_data_directory[]" + value="{$params.backend_data_directory[num]|escape}" /></td> + </tr> + + {if paramExists('backend_flag')} + <tr> + <th{if isset($error.backend_flag[num])} class="error"{/if}> + <label>{$message.descBackend_flag|escape}</label> + <br />backend_flag{$smarty.section.num.index|escape} (string) *</th> + <td><select name="backend_flag[]" id="backend_flag[]"> + <option value="ALLOW_TO_FAILOVER" + {if $params.backend_flag[num] == 'ALLOW_TO_FAILOVER'}selected{/if}>ALLOW_TO_FAILOVER</option> + <option value="DISALLOW_TO_FAILOVER" + {if $params.backend_flag[num] == 'DISALLOW_TO_FAILOVER'}selected{/if}>DISALLOW_TO_FAILOVER</option> + </select></td> + </tr> + {/if} + {/section} + + {if isset($isAdd) && $isAdd == true} + <tr> + <th><label>{$message.descBackend_hostname|escape}</label> + <br />backend_hostname{$smarty.section.num.index} (string)</th> + <td><input type="text" name="backend_hostname[]" value="" /></td> + <td rowspan="{if paramExists('backend_flag')}5{else}4{/if}"> + </tr> + + </tr> + <tr> + <th><label>{$message.descBackend_port|escape}</label> + <br />backend_port{$smarty.section.num.index|escape} (integer)</th> + <td><input type="text" name="backend_port[]" value="" /></td> + </tr> + + <tr> + <th><label>{$message.descBackend_weight|escape}</label> + <br />backend_weight{$smarty.section.num.index|escape} (float)</th> + <td><input type="text" name="backend_weight[]" value="" /></td> + </tr> + + <tr> + <th><label>{$message.descBackend_data_directory|escape}</label> + <br />backend_data_directory{$smarty.section.num.index|escape} (string)</th> + <td><input type="text" name="backend_data_directory[]" value="" /></td> + </tr> + + {if paramExists('backend_flag')} + <tr> + <th><label>{$message.descBackend_flag|escape}</label> + <br />backend_flag{$smarty.section.num.index|escape} *</th> + <td><select name="backend_flag[]" id="backend_flag[]"> + <option value="ALLOW_TO_FAILOVER" selected>ALLOW_TO_FAILOVER</option> + <option value="DISALLOW_TO_FAILOVER">DISALLOW_TO_FAILOVER</option> + </select></td> + </tr> + {/if} + {/if} </tbody> </table> @@ -510,152 +457,120 @@ function cancelNode() { {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">Where to log</th></tr> - - <tr> {if isset($error.log_destination)} - <th class="error"><label>{$message.descLog_destination|escape}</label> - <br />master_slave_sub_mode (string) *</th> - {else} - <th><label>{$message.descLog_destination|escape}</label><br />log_destination *</th> + {if paramExists('log_destination')} + <tr><th class="category" colspan="2">Where to log</th></tr> + + <tr> + {if isset($error.log_destination)}<th class="error">{else}<th>{/if} + <label>{$message.descLog_destination|escape}</label> + <br />log_destination *</th> + <td><select name="log_destination" id="log_destination"> + <option value="stderr" {if $params.log_destination == 'stderr'}selected{/if}>stderr</option> + <option value="syslog" {if $params.log_destination == 'syslog'}selected{/if}>syslog</option> + </select></td> + </tr> {/if} - <td><select name="log_destination" id="log_destination"> - <option value="stderr" {if $params.log_destination == 'stderr'}selected{/if}>stderr</option> - <option value="syslog" {if $params.log_destination == 'syslog'}selected{/if}>syslog</option> - </select></td> - </tr> {* --------------------------------------------------------------------- *} <tr><th class="category" colspan="2">What to log</th></tr> - <tr> {if isset($error.print_timestamp)} - <th><label>{$message.descPrint_timestamp|escape}</label> - <br />print_timestamp (bool) *</th> - {else} - <th><label>{$message.descPrint_timestamp|escape}</label> - <br />print_timestamp (bool) *</th> - {/if} - {if $params.print_timestamp == 'on'} - <td><input type="checkbox" name="print_timestamp" - id="print_timestamp" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="print_timestamp" - id="print_timestamp" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.log_connections)} - <th class="error"><label>{$message.descLog_connections|escape}</label> - <br />log_connections (bool)</th> - {else} - <th><label>{$message.descLog_connections|escape}</label> - <br />log_connections (bool)</th> - {/if} - {if $params.log_connections == 'on'} - <td><input type="checkbox" name="log_connections" - id="log_connections" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="log_connections" - id="log_connections" value="false" /></td> - {/if} + <tr> + <th{if isset($error.print_timestamp)} class="error"{/if}> + <label>{$message.descPrint_timestamp|escape}</label> + <br />print_timestamp (bool) *</th> + {if $params.print_timestamp == 'on'} + <td><input type="checkbox" name="print_timestamp" + id="print_timestamp" value="true" + {if $params.print_timestamp == 'on'}checked="checked"{/if} /></td> + {/if} </tr> - <tr> {if isset($error.log_hostname)} - <th class="error"><label>{$message.descLog_hostname|escape}</label> - <br />log_hostname (bool)</th> - {else} - <th><label>{$message.descLog_hostname|escape}</label> - <br />log_hostname (bool)</th> - {/if} - {if $params.log_hostname == 'on'} - <td><input type="checkbox" name="log_hostname" id="log_hostname" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="log_hostname" id="log_hostname" value="false" /></td> - {/if} + <tr> + <th{if isset($error.log_connections)} class="error"{/if}> + <label>{$message.descLog_connections|escape}</label> + <br />log_connections (bool)</th> + {if $params.log_connections == 'on'} + <td><input type="checkbox" name="log_connections" id="log_connections" value="true" + {if $params.log_connections == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.log_statement)} - <th class="error"><label>{$message.descLog_statement|escape}</label> - <br />log_statement (bool)</th> - {else} - <th><label>{$message.descLog_statement|escape}</label> - <br />log_statement (bool)</th> - {/if} - {if $params.log_statement == 'on'} - <td><input type="checkbox" name="log_statement" id="log_statement" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="log_statement" id="log_statement" value="false" /></td> - {/if} + <tr> + <th{if isset($error.log_hostname)} class="error"{/if}> + <label>{$message.descLog_hostname|escape}</label> + <br />log_hostname (bool)</th> + {/if} + <td><input type="checkbox" name="log_hostname" id="log_hostname" value="true" + {if $params.log_hostname == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.log_per_node_statement)} - <th class="error"><label>{$message.descLog_per_node_statement|escape}</label> - <br />log_per_node_statement (bool)</th> - {else} - <th><label>{$message.descLog_per_node_statement|escape}</label> - <br />log_per_node_statement (bool)</th> - {/if} - {if $params.log_per_node_statement == 'on'} - <td><input type="checkbox" name="log_per_node_statement" - id="log_per_node_statement" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="log_per_node_statement" - id="log_per_node_statement" value="false" /></td> - {/if} - </tr> + <tr> + <th{if isset($error.log_statement)} class="error"{/if}> + <label>{$message.descLog_statement|escape}</label> + <br />log_statement (bool)</th> + <td><input type="checkbox" name="log_statement" id="log_statement" value="true" + {if $params.log_statement == 'on'}checked="checked"{/if} /></td> + </tr> + + {if paramExists('log_per_node_statement')} + <tr> + {if isset($error.log_per_node_statement)}<th class="error">{else}<th>{/if} + <label>{$message.descLog_per_node_statement|escape}</label> + <br />log_per_node_statement (bool)</th> + <td><input type="checkbox" name="log_per_node_statement" + id="log_per_node_statement" value="true" + {if $params.log_per_node_statement == 'on'}checked="checked"{/if} /></td> + </tr> + {/if} - <tr> {if isset($error.log_standby_delay)} - <th class="error"><label>{$message.descLog_standby_delay|escape}</label><br />log_standby_delay (string)</th> - {else} - <th><label>{$message.descLog_standby_delay|escape}</label><br />log_standby_delay (string)</th> - {/if} - <td><select name="log_standby_delay" id="log_standby_delay"> - <option value="always" - {if $params.log_standby_delay == 'always'}selected{/if}>always</option> - <option value="if_over_threshold" - {if $params.log_standby_delay == 'if_over_threshold'}selected{/if}>if_over_threshold</option> - <option value="none" - {if $params.log_standby_delay == 'none'}selected{/if}>none</option> - </select></td> - </tr> + {if paramExists('log_standby_delay')} + <tr> + <th{if isset($error.log_standby_delay)} class="error"{/if}> + <label>{$message.descLog_standby_delay|escape}</label> + <br />log_standby_delay (string)</th> + <td><select name="log_standby_delay" id="log_standby_delay"> + <option value="always" + {if $params.log_standby_delay == 'always'}selected{/if}>always</option> + <option value="if_over_threshold" + {if $params.log_standby_delay == 'if_over_threshold'}selected{/if}>if_over_threshold</option> + <option value="none" + {if $params.log_standby_delay == 'none'}selected{/if}>none</option> + </select></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">Syslog specific</th></tr> - - <tr> {if isset($error.syslog_facility)} - <th class="error"><label>{$message.descSyslog_facility|escape}</label> - <br />syslog_facility (string) *</th> - {else} - <th><label>{$message.descSyslog_facility|escape}</label> - <br />syslog_facility (string) *</th> - {/if} - <td><input type="text" name="syslog_facility" value="{$params.syslog_facility|escape}"/></td> - </tr> - - <tr> {if isset($error.syslog_ident)} - <th class="error"><label>{$message.descSyslog_ident|escape}</label> - <br />syslog_ident (string) *</th> - {else} - <th><label>{$message.descSyslog_ident|escape}</label> - <br />syslog_ident (string) *</th> - {/if} - <td><input type="text" name="syslog_ident" value="{$params.syslog_ident|escape}"/></td> - </tr> + {if paramExists('syslog_facility')} + <tr><th class="category" colspan="2">Syslog specific</th></tr> + + <tr> + {if isset($error.syslog_facility)}<th class="error">{else}<th>{/if} + <label>{$message.descSyslog_facility|escape}</label> + <br />syslog_facility (string) *</th> + <td><input type="text" name="syslog_facility" value="{$params.syslog_facility|escape}"/></td> + </tr> + + <tr> + {if isset($error.syslog_ident)}<th class="error">{else}<th>{/if} + <label>{$message.descSyslog_ident|escape}</label> + <br />syslog_ident (string) *</th> + <td><input type="text" name="syslog_ident" value="{$params.syslog_ident|escape}"/></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">Debug</th></tr> + {if paramExists('debug_level')} + <tr><th class="category" colspan="2">Debug</th></tr> - <tr> {if isset($error.debug_level)} - <th class="error"><label>{$message.descDebug_level|escape}</label> - <br />debug_level (integer)</th> - {else} - <th><label>{$message.descDebug_level|escape}</label> - <br />debug_level (integer)</th> - {/if} - <td><input type="text" name="debug_level" value="{$params.debug_level|escape}"/></td> - </tr> + <tr> + <th{if isset($error.debug_level)} class="error"{/if}> + <label>{$message.descDebug_level|escape}</label> + <br />debug_level (integer)</th> + <td><input type="text" name="debug_level" value="{$params.debug_level|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -679,25 +594,21 @@ function cancelNode() { </tfoot> <tbody> - <tr> {if isset($error.logdir)} - <th class="error"><label>{$message.descLogdir|escape}</label> - <br />logdir (string) *</th> - {else} - <th><label>{$message.descLogdir|escape}</label> - <br />logdir (string) *</th> - {/if} - <td><input type="text" name="logdir" value="{$params.logdir|escape}"/></td> - </tr> - - <tr> {if isset($error.pid_file_name)} - <th class="error"><label>{$message.descPid_file_name|escape}</label> - <br />pid_file_name (string) *</th> - {else} - <th><label>{$message.descPid_file_name|escape}</label> - <br />pid_file_name (string) *</th> - {/if} - <td><input type="text" name="pid_file_name" value="{$params.pid_file_name|escape}"/></td> - </tr> + <tr> + <th{if isset($error.logdir)} class="error"{/if}> + <label>{$message.descLogdir|escape}</label> + <br />logdir (string) *</th> + <td><input type="text" name="logdir" value="{$params.logdir|escape}"/></td> + </tr> + + {if paramExists('pid_file_name')} + <tr> + <th{if isset($error.pid_file_name)} class="error"{/if}> + <label>{$message.descPid_file_name|escape}</label> + <br />pid_file_name (string) *</th> + <td><input type="text" name="pid_file_name" value="{$params.pid_file_name|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -722,30 +633,20 @@ function cancelNode() { <tbody> - <tr> {if isset($error.connection_cache)} - <th class="error"><label>{$message.descConnection_cache|escape}</label> - <br />connection_cache (bool) *</th> - {else} - <th><label>{$message.descConnection_cache|escape}</label> - <br />connection_cache (bool)*</th> - {/if} - {if $params.connection_cache == 'on'} - <td><input type="checkbox" name="connection_cache" - id="connection_cache" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="connection_cache" - id="connection_cache" value="false" /></td> - {/if} + <tr> + <th{if isset($error.connection_cache)} class="error"{/if}> + <label>{$message.descConnection_cache|escape}</label> + <br />connection_cache (bool)*</th> + <td><input type="checkbox" name="connection_cache" + id="connection_cache" value="true" + {if $params.connection_cache == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.reset_query_list)} - <th class="error"><label>{$message.descReset_query_list|escape}</label> - <br />reset_query_list (string)</th> - {else} - <th><label>{$message.descReset_query_list|escape}</label> - <br />reset_query_list (string)</th> - {/if} - <td><input type="text" name="reset_query_list" value="{$params.reset_query_list|escape}"/></td> + <tr> + <th{if isset($error.reset_query_list)} class="error"{/if}> + <label>{$message.descReset_query_list|escape}</label> + <br />reset_query_list (string)</th> + <td><input type="text" name="reset_query_list" value="{$params.reset_query_list|escape}"/></td> </tr> </tbody> @@ -770,107 +671,74 @@ function cancelNode() { </tfoot> <tbody> - <tr> {if isset($error.replication_mode)} - <th class="error"><label>{$message.descReplication_mode|escape}</label> - <br />replication_mode (bool) *</th> - {else} - <th><label>{$message.descReplication_mode|escape}</label> - <br />replication_mode (bool) *</th> - {/if} - {if $params.replication_mode == 'on'} - <td><input type="checkbox" name="replication_mode" - id="replication_mode" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="replication_mode" - id="replication_mode" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.replicate_select)} - <th class="error"><label>{$message.descReplicate_select|escape}</label> - <br />replicate_select (bool)</th> - {else} - <th><label>{$message.descReplicate_select|escape}</label> - <br />replicate_select (bool)</th> - {/if} - {if $params.replicate_select == 'on'} - <td><input type="checkbox" name="replicate_select" - id="replicate_select" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="replicate_select" - id="replicate_select" value="false" /></td> - {/if} + <tr> + <th{if isset($error.replication_mode)} class="error"{/if}> + <label>{$message.descReplication_mode|escape}</label> + <br />replication_mode (bool) *</th> + <td><input type="checkbox" name="replication_mode" + id="replication_mode" value="true" + {if $params.replication_mode == 'on'} checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.insert_lock)} - <th class="error"><label>{$message.descInsert_lock|escape}</label> - <br />insert_lock (bool)</th> - {else} - <th><label>{$message.descInsert_lock|escape}</label> - <br />insert_lock (bool)</th> - {/if} - {if $params.insert_lock == 'on'} - <td><input type="checkbox" name="insert_lock" id="insert_lock" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="insert_lock" id="insert_lock" value="false" /></td> - {/if} + <tr> + <th{if isset($error.replicate_select)} class="error"{/if}> + <label>{$message.descReplicate_select|escape}</label> + <br />replicate_select (bool)</th> + <td><input type="checkbox" name="replicate_select" + id="replicate_select" value="true" + {if $params.replicate_select == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.lobj_lock_table)} - <th class="error"><label>{$message.descLobj_lock_table|escape}</label> - <br />lobj_lock_table (string)</th> - {else} - <th><label>{$message.descLobj_lock_table|escape}</label> - <br />lobj_lock_table (string)</th> - {/if} - <td><input type="text" name="lobj_lock_table" - id="lobj_lock_table" value="{$params.lobj_lock_table|escape}" /></td> - </tr> + <tr> + <th{if isset($error.insert_lock)} class="error"{/if}> + <label>{$message.descInsert_lock|escape}</label> + <br />insert_lock (bool)</th> + <td><input type="checkbox" name="insert_lock" id="insert_lock" value="true" + {if $params.insert_lock == 'on'}checked="checked"{/if} /></td> + </tr> + + {if paramExists('lobj_lock_table')} + <tr> + <th{if isset($error.lobj_lock_table)} class="error"{/if}> + <label>{$message.descLobj_lock_table|escape}</label> + <br />lobj_lock_table (string)</th> + <td><input type="text" name="lobj_lock_table" + id="lobj_lock_table" value="{$params.lobj_lock_table|escape}" /></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} <tr><th class="category" colspan="2">Degenerate handling</th></tr> - <tr> {if isset($error.replication_stop_on_mismatch)} - <th class="error"><label>{$message.descReplication_stop_on_mismatch|escape}</label> - <br />replication_stop_on_mismatch (bool)</th> - {else} - <th><label>{$message.descReplication_stop_on_mismatch|escape}</label> - <br />replication_stop_on_mismatch (bool)</th> - {/if} - {if $params.replication_stop_on_mismatch == 'on'} - <td><input type="checkbox" name="replication_stop_on_mismatch" - id="replication_stop_on_mismatch" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="replication_stop_on_mismatch" - id="replication_stop_on_mismatch" value="false" /></td> - {/if} </tr> - - <tr> {if isset($error.replication_stop_on_mismatch)} - <th class="error"><label>{$message.descFailover_if_affected_tuples_mismatch|escape}</label> - <br />failover_if_affected_tuples_mismatch (bool)</th> - {else} - <th><label>{$message.descFailover_if_affected_tuples_mismatch|escape}</label> - <br />failover_if_affected_tuples_mismatch (bool)</th> - {/if} - {if $params.failover_if_affected_tuples_mismatch == 'on'} - <td><input type="checkbox" name="failover_if_affected_tuples_mismatch" - id="failover_if_affected_tuples_mismatch" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="failover_if_affected_tuples_mismatch" - id="failover_if_affected_tuples_mismatch" value="false" /></td> - {/if} - </tr> + <tr> + <th{if isset($error.replication_stop_on_mismatch)} class="error"{/if}> + <label>{$message.descReplication_stop_on_mismatch|escape}</label> + <br />replication_stop_on_mismatch (bool)</th> + <td><input type="checkbox" name="replication_stop_on_mismatch" + id="replication_stop_on_mismatch" value="true" + {if $params.replication_stop_on_mismatch == 'on'}checked="checked"{/if} /></td> + </tr> + + {if paramExists('failover_if_affected_tuples_mismatch')} + <tr> + <th{if isset($error.failover_if_affected_tuples_mismatch)} class="error"{/if}> + <label>{$message.descFailover_if_affected_tuples_mismatch|escape}</label> + <br />failover_if_affected_tuples_mismatch (bool)</th> + <td><input type="checkbox" name="failover_if_affected_tuples_mismatch" + id="failover_if_affected_tuples_mismatch" value="true" + {if $params.failover_if_affected_tuples_mismatch == 'on'}checked="checked"{/if} /></td> + </tr> + {/if} - <tr> {if isset($error.replication_timeout)} - <th class="error"><label>{$message.descReplication_timeout|escape}</label> - <br />replication_timeout (integer)</th> - {else} - <th><label>{$message.descReplication_timeout|escape}</label> - <br />replication_timeout (integer)</th> - {/if} - <td><input type="text" name="replication_timeout" value="{$params.replication_timeout|escape}"/></td> - </tr> + {if paramExists('replication_timeout')} + <tr> + <th{if isset($error.replication_timeout)} class="error"{/if}> + <label>{$message.descReplication_timeout|escape}</label> + <br />replication_timeout (integer)</th> + <td><input type="text" name="replication_timeout" value="{$params.replication_timeout|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -895,57 +763,39 @@ function cancelNode() { <tbody> - <tr> {if isset($error.load_balance_mode)} - <th class="error"><label>{$message.descLoad_balance_mode|escape}</label> - <br />load_balance_mode (bool) *</th> - {else} - <th><label>{$message.descLoad_balance_mode|escape}</label> - <br />load_balance_mode (bool) *</th> - {/if} - {if $params.load_balance_mode == 'on'} - <td><input type="checkbox" name="load_balance_mode" - id="load_balance_mode" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="load_balance_mode" - id="load_balance_mode" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.ignore_leading_white_space)} - <th class="error"><label>{$message.descIgnore_leading_white_space|escape}</label> - <br />ignore_leading_white_space (bool)</th> - {else} - <th><label>{$message.descIgnore_leading_white_space|escape}</label> - <br />ignore_leading_white_space (bool)</th> - {/if} - {if $params.ignore_leading_white_space == 'on'} - <td><input type="checkbox" name="ignore_leading_white_space" - id="ignore_leading_white_space" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="ignore_leading_white_space" - id="ignore_leading_white_space" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.white_function_list)} - <th class="error"><label>{$message.descWhite_function_list|escape}</label> - <br />white_function_list (string)</th> - {else} - <th><label>{$message.descWhite_function_list|escape}</label> - <br />white_function_list (string)</th> - {/if} - <td><input type="text" name="white_function_list" value="{$params.white_function_list|escape}"/></td> + <tr> + <th{if isset($error.load_balance_mode)} class="error"{/if}> + <label>{$message.descLoad_balance_mode|escape}</label> + <br />load_balance_mode (bool) *</th> + <td><input type="checkbox" name="load_balance_mode" + id="load_balance_mode" value="true" + {if $params.load_balance_mode == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.black_function_list)} - <th class="error"><label>{$message.descBlack_function_list|escape}</label> - <br />black_function_list (string)</th> - {else} - <th><label>{$message.descBlack_function_list|escape}</label> - <br />black_function_list (string)</th> - {/if} - <td><input type="text" name="black_function_list" value="{$params.black_function_list|escape}"/></td> - </tr> + <tr> + <th{if isset($error.ignore_leading_white_space)} class="error"{/if}> + <label>{$message.descIgnore_leading_white_space|escape}</label> + <br />ignore_leading_white_space (bool)</th> + <td><input type="checkbox" name="ignore_leading_white_space" + id="ignore_leading_white_space" value="true" + {if $params.ignore_leading_white_space == 'on'}checked="checked"{/if} /></td> + </tr> + + {if paramExists('white_function_list')} + <tr> + <th{if isset($error.white_function_list)} class="error"{/if}> + <label>{$message.descWhite_function_list|escape}</label> + <br />white_function_list (string)</th> + <td><input type="text" name="white_function_list" value="{$params.white_function_list|escape}"/></td> + </tr> + + <tr> + <th{if isset($error.black_function_list)} class="error"{/if}> + <label>{$message.descBlack_function_list|escape}</label> + <br />black_function_list (string)</th> + <td><input type="text" name="black_function_list" value="{$params.black_function_list|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -970,94 +820,79 @@ function cancelNode() { <tbody> - <tr> {if isset($error.master_slave_mode)} - <th class="error"><label>{$message.descMaster_slave_mode|escape}</label> - <br />master_slave_mode (bool) *</th> - {else} - <th><label>{$message.descMaster_slave_mode|escape}</label> - <br />master_slave_mode (bool) *</th> - {/if} - {if $params.master_slave_mode == 'on'} - <td><input type="checkbox" name="master_slave_mode" - id="master_slave_mode" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="master_slave_mode" - id="master_slave_mode" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.master_slave_sub_mode)} - <th class="error"><label>{$message.descMaster_slave_sub_mode|escape}</label> - <br />master_slave_sub_mode (string) *</th> - {else} - <th><label>{$message.descMaster_slave_sub_mode|escape}</label> - <br />master_slave_sub_mode (string) *</th> - {/if} - <td><select name="master_slave_sub_mode" id="master_slave_sub_mode"> - <option value="slony" - {if $params.master_slave_sub_mode == 'slony'}selected{/if}>slony</option> - <option value="stream" - {if $params.master_slave_sub_mode == 'stream'}selected{/if}>stream</option> - </select></td> - </tr> + <tr> + <th{if isset($error.master_slave_mode)} class="error"{/if}> + <label>{$message.descMaster_slave_mode|escape}</label> + <br />master_slave_mode (bool) *</th> + <td><input type="checkbox" name="master_slave_mode" + id="master_slave_mode" value="true" + {if $params.master_slave_mode == 'on'}checked="checked"{/if} /></td> + </tr> + + {if paramExists('master_slave_sub_mode')} + <tr> + <th{if isset($error.master_slave_sub_mode)} class="error"{/if}> + <label>{$message.descMaster_slave_sub_mode|escape}</label> + <br />master_slave_sub_mode (string) *</th> + <td><select name="master_slave_sub_mode" id="master_slave_sub_mode"> + <option value="slony" + {if $params.master_slave_sub_mode == 'slony'}selected{/if}>slony</option> + <option value="stream" + {if $params.master_slave_sub_mode == 'stream'}selected{/if}>stream</option> + </select></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">Streaming</th></tr> - - <tr> {if isset($error.sr_check_period)} - <th class="error"><label>{$message.descSr_check_period|escape}</label> - <br />sr_check_period (integer) *</th> - {else} - <th><label>{$message.descSr_check_period|escape}</label> - <br />sr_check_period (integer) *</th> - {/if} - <td><input type="text" name="sr_check_period" value="{$params.sr_check_period|escape}"/></td> - </tr> - - <tr> {if isset($error.sr_check_user)} - <th class="error"><label>{$message.descSr_check_user|escape}</label> - <br />sr_check_user (string) *</th> - {else} - <th><label>{$message.descSr_check_user|escape}</label> - <br />sr_check_user (string) *</th> - {/if} - <td><input type="text" name="sr_check_user" value="{$params.sr_check_user|escape}"/></td> - </tr> - - <tr> {if isset($error.sr_check_password)} - <th class="error"><label>{$message.descSr_check_password|escape}</label> - <br />sr_check_password (string) *</th> - {else} - <th><label>{$message.descSr_check_password|escape}</label> - <br />sr_check_password (string) *</th> - {/if} - <td><input type="text" name="sr_check_password" value="{$params.sr_check_password|escape}"/></td> - </tr> + {if paramExists('sr_check_period')} + <tr><th class="category" colspan="2">Streaming</th></tr> + + <tr> + <th{if isset($error.sr_check_period)} class="error"{/if}> + <label>{$message.descSr_check_period|escape}</label> + <br />sr_check_period (integer) *</th> + <td><input type="text" name="sr_check_period" value="{$params.sr_check_period|escape}"/></td> + </tr> + + <tr> + <th{if isset($error.sr_check_user)} class="error"{/if}> + <label>{$message.descSr_check_user|escape}</label> + <br />sr_check_user (string) *</th> + <td><input type="text" name="sr_check_user" value="{$params.sr_check_user|escape}"/></td> + </tr> + + <tr> + <th{if isset($error.sr_check_password)} class="error"{/if}> + <label>{$message.descSr_check_password|escape}</label> + <br />sr_check_password (string) *</th> + <td><input type="text" name="sr_check_password" value="{$params.sr_check_password|escape}"/></td> + </tr> + {/if} - <tr> {if isset($error.delay_threshold)} - <th class="error"><label>{$message.descDelay_threshold|escape}</label><br />delay_threshold (bool)</th> - {else} - <th><label>{$message.descDelay_threshold|escape}</label><br />delay_threshold (bool)</th> - {/if} - <td><input type="text" name="delay_threshold" - id="delay_threshold" value="{$params.delay_threshold|escape}" /></td> - </tr> + {if paramExists('delay_threshold')} + <tr> + <th{if isset($error.delay_threshold)} class="error"{/if}> + <label>{$message.descDelay_threshold|escape}</label> + <br />delay_threshold (bool)</th> + <td><input type="text" name="delay_threshold" + id="delay_threshold" value="{$params.delay_threshold|escape}" /></td> + </tr> + {/if} {* --------------------------------------------------------------------- *} - <tr><th class="category" colspan="2">Special commands</th></tr> + {if paramExists('follow_master_command')} + <tr><th class="category" colspan="2">Special commands</th></tr> - <tr> {if isset($error.follow_master_command)} - <th class="error"><label>{$message.descFollow_master_command|escape}</label> - <br />follow_master_command (string) *</th> - {else} - <th><label>{$message.descFollow_master_command|escape}</label> - <br />follow_master_command (string) *</th> - {/if} - <td><input type="text" name="follow_master_command" - value="{$params.follow_master_command|escape}"/></td> - </tr> + <tr> + <th{if isset($error.follow_master_command)} class="error"{/if}> + <label>{$message.descFollow_master_command|escape}</label> + <br />follow_master_command (string) *</th> + <td><input type="text" name="follow_master_command" + value="{$params.follow_master_command|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -1082,37 +917,27 @@ function cancelNode() { <tbody> - <tr> {if isset($error.parallel_mode)} - <th class="error"><label>{$message.descParallel_mode|escape}</label> - <br />parallel_mode (bool) *</th> - {else} - <th><label>{$message.descParallel_mode|escape}</label> - <br />parallel_mode (bool) *</th> - {/if} - {if $params.parallel_mode == 'on'} - <td><input type="checkbox" name="parallel_mode" - id="parallel_mode" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="parallel_mode" - id="parallel_mode" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.enable_query_cache)} - <th class="error"><label>{$message.descEnable_query_cache|escape}</label> - <br />enable_query_cache (bool) *</th> - {else} - <th><label>{$message.descEnable_query_cache|escape}</label> - <br />enable_query_cache (bool) *</th> - {/if} - {if $params.enable_query_cache == 'on'} - <td><input type="checkbox" name="enable_query_cache" id="enable_query_cache" checked="checked" /></td> - {else} - <td><input type="checkbox" name="enable_query_cache" id="enable_query_cache" /></td> - {/if} - </tr> + <tr> + <th{if isset($error.parallel_mode)} class="error"{/if}> + <label>{$message.descParallel_mode|escape}</label> + <br />parallel_mode (bool) *</th> + <td><input type="checkbox" name="parallel_mode" + id="parallel_mode" value="true" + {if $params.parallel_mode == 'on'}checked="checked"{/if} /></td> + </tr> + + {if hasMemqcache() == false} + <tr> + <th{if isset($error.enable_query_cache)} class="error"{/if}> + <label>{$message.descEnable_query_cache|escape}</label> + <br />enable_query_cache (bool) *</th> + <td><input type="checkbox" name="enable_query_cache" id="enable_query_cache" + {if $params.enable_query_cache == 'on'}checked="checked"{/if} /></td> + </tr> + {/if} - <tr> {if isset($error.pgpool2_hostname)} + <tr> + {if isset($error.pgpool2_hostname)} <th><label>{$message.descPgpool2_hostname|escape}</label> <br />pgpool2_hostname (string) *</th> {else} @@ -1126,64 +951,46 @@ function cancelNode() { <tr><th class="category" colspan="2">System DB info</th></tr> - <tr> {if isset($error.system_db_hostname)} - <th class="error"><label>{$message.descSystem_db_hostname|escape}</label> - <br />system_db_hostname (string) *</th> - {else} - <th><label>{$message.descSystem_db_hostname|escape}</label> - <br />system_db_hostname (string) *</th> - {/if} - <td><input type="text" name="system_db_hostname" value="{$params.system_db_hostname|escape}"/></td> + <tr> + <th{if isset($error.system_db_hostname)} class="error"{/if}> + <label>{$message.descSystem_db_hostname|escape}</label> + <br />system_db_hostname (string) *</th> + <td><input type="text" name="system_db_hostname" value="{$params.system_db_hostname|escape}"/></td> </tr> - <tr> {if isset($error.system_db_port)} - <th class="error"><label>{$message.descSystem_db_port|escape}</label> - <br />system_db_port (integer) *</th> - {else} - <th><label>{$message.descSystem_db_port|escape}</label> - <br />system_db_port (integer) *</th> - {/if} - <td><input type="text" name="system_db_port" value="{$params.system_db_port|escape}"/></td> + <tr> + <th{if isset($error.system_db_port)} class="error"{/if}> + <label>{$message.descSystem_db_port|escape}</label> + <br />system_db_port (integer) *</th> + <td><input type="text" name="system_db_port" value="{$params.system_db_port|escape}"/></td> </tr> - <tr> {if isset($error.system_db_dbname)} - <th class="error"><label>{$message.descSystem_db_dbname|escape}</label> - <br />system_db_dbname (string) *</th> - {else} - <th><label>{$message.descSystem_db_dbname|escape}</label> - <br />system_db_dbname (string) *</th> - {/if} - <td><input type="text" name="system_db_dbname" value="{$params.system_db_dbname|escape}"/></td> + <tr> + <th{if isset($error.system_db_name)} class="error"{/if}> + <label>{$message.descSystem_db_dbname|escape}</label> + <br />system_db_dbname (string) *</th> + <td><input type="text" name="system_db_dbname" value="{$params.system_db_dbname|escape}"/></td> </tr> - <tr> {if isset($error.system_db_schema)} - <th class="error"><label>{$message.descSystem_db_schema|escape}</label> - <br />system_db_schema (string) *</th> - {else} - <th><label>{$message.descSystem_db_schema|escape}</label> - <br />system_db_schema (string) *</th> - {/if} - <td><input type="text" name="system_db_schema" value="{$params.system_db_schema|escape}"/></td> + <tr> + <th{if isset($error.system_db_schema)} class="error"{/if}> + <label>{$message.descSystem_db_schema|escape}</label> + <br />system_db_schema (string) *</th> + <td><input type="text" name="system_db_schema" value="{$params.system_db_schema|escape}"/></td> </tr> - <tr> {if isset($error.system_db_user)} - <th class="error"><label>{$message.descSystem_db_user|escape}</label> - <br />system_db_user (string) *</th> - {else} - <th><label>{$message.descSystem_db_user|escape}</label> - <br />system_db_user (string) *</th> - {/if} - <td><input type="text" name="system_db_user" value="{$params.system_db_user|escape}"/></td> + <tr> + <th{if isset($error.system_db_schema)} class="error"{/if}> + <label>{$message.descSystem_db_user|escape}</label> + <br />system_db_user (string) *</th> + <td><input type="text" name="system_db_user" value="{$params.system_db_user|escape}"/></td> </tr> - <tr> {if isset($error.system_db_password)} - <th class="error"><label>{$message.descSystem_db_password|escape}</label> - <br />system_db_password (string) *</th> - {else} - <th><label>{$message.descSystem_db_password|escape}</label> - <br />system_db_password (string) *</th> - {/if} - <td><input type="password" name="system_db_password" value="{$params.system_db_password|escape}"/></td> + <tr> + <th{if isset($error.system_db_password)} class="error"{/if}> + <label>{$message.descSystem_db_password|escape}</label> + <br />system_db_password (string) *</th> + <td><input type="password" name="system_db_password" value="{$params.system_db_password|escape}"/></td> </tr> </tbody> @@ -1208,65 +1015,51 @@ function cancelNode() { </tfoot> <tbody> - <tr> {if isset($error.health_check_timeout)} - <th class="error"><label>{$message.descHealth_check_timeout|escape}</label> - <br />health_check_timeout (integer)</th> - {else} - <th><label>{$message.descHealth_check_timeout|escape}</label> - <br />health_check_timeout (integer)</th> - {/if} - <td><input type="text" name="health_check_timeout" value="{$params.health_check_timeout|escape}"/></td> - </tr> - - <tr> {if isset($error.health_check_period)} - <th class="error"><label>{$message.descHealth_check_period|escape}</label> - <br />health_check_period (integer)</th> - {else} - <th><label>{$message.descHealth_check_period|escape}</label> - <br />health_check_period (integer)</th> - {/if} - <td><input type="text" name="health_check_period" value="{$params.health_check_period|escape}"/></td> - </tr> - - <tr> {if isset($error.health_check_user)} - <th class="error"><label>{$message.descHealth_check_user|escape}</label> - <br />health_check_user (string)</th> - {else} - <th><label>{$message.descHealth_check_user|escape}</label> - <br />health_check_user (string)</th> - {/if} - <td><input type="text" name="health_check_user" value="{$params.health_check_user|escape}"/></td> + <tr> + <th{if isset($error.health_check_timeout)} class="error"{/if}> + <label>{$message.descHealth_check_timeout|escape}</label> + <br />health_check_timeout (integer)</th> + <td><input type="text" name="health_check_timeout" value="{$params.health_check_timeout|escape}"/></td> </tr> - <tr> {if isset($error.health_check_password)} - <th class="error"><label>{$message.descHealth_check_password|escape}</label> - <br />health_check_password (string)</th> - {else} - <th><label>{$message.descHealth_check_password|escape}</label> - <br />health_check_password (string)</th> - {/if} - <td><input type="text" name="health_check_password" value="{$params.health_check_password|escape}"/></td> + <tr> + <th{if isset($error.health_check_period)} class="error"{/if}> + <label>{$message.descHealth_check_period|escape}</label> + <br />health_check_period (integer)</th> + <td><input type="text" name="health_check_period" value="{$params.health_check_period|escape}"/></td> </tr> - <tr> {if isset($error.health_check_max_retries)} - <th class="error"><label>{$message.descHealth_check_max_retries|escape}</label> - <br />health_check_max_retries (integer)</th> - {else} - <th><label>{$message.descHealth_check_max_retries|escape}</label> - <br />health_check_max_retries (integer)</th> - {/if} - <td><input type="text" name="health_check_max_retries" value="{$params.health_check_max_retries|escape}"/></td> - </tr> + <tr> + <th{if isset($error.health_check_user)} class="error"{/if}> + <label>{$message.descHealth_check_user|escape}</label> + <br />health_check_user (string)</th> + <td><input type="text" name="health_check_user" value="{$params.health_check_user|escape}"/></td> + </tr> + + {if paramExists('health_check_password')} + <tr> + <th{if isset($error.health_check_password)} class="error"{/if}> + <label>{$message.descHealth_check_password|escape}</label> + <br />health_check_password (string)</th> + <td><input type="text" name="health_check_password" value="{$params.health_check_password|escape}"/></td> + </tr> + {/if} - <tr> {if isset($error.health_check_retry_delay)} - <th class="error"><label>{$message.descHealth_check_retry_delay|escape}</label> - <br />health_check_retry_delay (integer)</th> - {else} - <th><label>{$message.descHealth_check_retry_delay|escape}</label> - <br />health_check_retry_delay (integer)</th> - {/if} - <td><input type="text" name="health_check_retry_delay" value="{$params.health_check_retry_delay|escape}"/></td> - </tr> + {if paramExists('health_check_max_retries')} + <tr> + <th{if isset($error.health_check_max_retries)} class="error"{/if}> + <label>{$message.descHealth_check_max_retries|escape}</label> + <br />health_check_max_retries (integer)</th> + <td><input type="text" name="health_check_max_retries" value="{$params.health_check_max_retries|escape}"/></td> + </tr> + + <tr> + <th{if isset($error.health_check_retry_delay)} class="error"{/if}> + <label>{$message.descHealth_check_retry_delay|escape}</label> + <br />health_check_retry_delay (integer)</th> + <td><input type="text" name="health_check_retry_delay" value="{$params.health_check_retry_delay|escape}"/></td> + </tr> + {/if} </tbody> </table> @@ -1290,40 +1083,30 @@ function cancelNode() { <tbody> - <tr> {if isset($error.failover_command)} - <th class="error"><label>{$message.descFailover_command|escape}</label> - <br />failover_command (string)</th> - {else} - <th><label>{$message.descFailover_command|escape}</label> - <br />failover_command (string)</th> - {/if} - <td><input type="text" name="failover_command" value="{$params.failover_command|escape}"/></td> - </tr> - - <tr> {if isset($error.failback_command)} - <th class="error"><label>{$message.descFailback_command|escape}</label> - <br />failback_command (string)</th> - {else} - <th><label>{$message.descFailback_command|escape}</label> - <br />failback_command (string)</th> - {/if} - <td><input type="text" name="failback_command" value="{$params.failback_command|escape}"/></td> + <tr> + <th{if isset($error.failover_command)} class="error"{/if}> + <label>{$message.descFailover_command|escape}</label> + <br />failover_command (string)</th> + <td><input type="text" name="failover_command" value="{$params.failover_command|escape}"/></td> </tr> - <tr> {if isset($error.fail_over_on_backend_error)} - <th class="error"><label>{$message.descFail_over_on_backend_error|escape}</label> - <br />fail_over_on_backend_error</th> - {else} - <th><label>{$message.descFail_over_on_backend_error|escape}</label> - <br />fail_over_on_backend_error</th> - {/if} - {if $params.fail_over_on_backend_error == 'on'} - <td><input type="checkbox" name="fail_over_on_backend_error" - id="fail_over_on_backend_error" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="fail_over_on_backend_error" - id="fail_over_on_backend_error" value="false" /></td> - {/if} </tr> + <tr> + <th{if isset($error.failback_command)} class="error"{/if}> + <label>{$message.descFailback_command|escape}</label> + <br />failback_command (string)</th> + <td><input type="text" name="failback_command" value="{$params.failback_command|escape}"/></td> + </tr> + + {if paramExists('fail_over_on_backend_error')} + <tr> + <th{if isset($error.fail_over_on_backend_error)} class="error"{/if}> + <label>{$message.descFail_over_on_backend_error|escape}</label> + <br />fail_over_on_backend_error</th> + <td><input type="checkbox" name="fail_over_on_backend_error" + id="fail_over_on_backend_error" value="true" + {if $params.fail_over_on_backend_error == 'on'}checked="checked"{/if} /></td> + </tr> + {/if} </tbody> </table> @@ -1347,71 +1130,56 @@ function cancelNode() { </tfoot> <tbody> - <tr> {if isset($error.recovery_user)} - <th class="error"><label>{$message.descRecovery_user|escape}</label> - <br />recovery_user (string)</th> - {else} - <th><label>{$message.descRecovery_user|escape}</label> - <br />recovery_user (string)</th> - {/if} - <td><input type="text" name="recovery_user" value="{$params.recovery_user|escape}"/></td> - </tr> - - <tr> {if isset($error.recovery_password)} - <th class="error"><label>{$message.descRecovery_password|escape}</label> - <br />recovery_password (string)</th> - {else} - <th><label>{$message.descRecovery_password|escape}</label> - <br />recovery_password (string)</th> - {/if} - <td><input type="password" name="recovery_password" value="{$params.recovery_password|escape}"/></td> + <tr> + <th{if isset($error.recovery_user)} class="error"{/if}> + <label>{$message.descRecovery_user|escape}</label> + <br />recovery_user (string)</th> + <td><input type="text" name="recovery_user" value="{$params.recovery_user|escape}"/></td> </tr> - <tr> {if isset($error.recovery_1st_stage_command)} - <th class="error"><label>{$message.descRecovery_1st_stage_command|escape}</label> - <br />recovery_1st_stage_command (string)</th> - {else} - <th><label>{$message.descRecovery_1st_stage_command|escape}</label> - <br />recovery_1st_stage_command (string)</th> - {/if} - <td><input type="text" name="recovery_1st_stage_command" - value="{$params.recovery_1st_stage_command|escape}"/></td> + <tr> + <th{if isset($error.recovery_password)} class="error"{/if}> + <label>{$message.descRecovery_password|escape}</label> + <br />recovery_password (string)</th> + <td><input type="password" name="recovery_password" value="{$params.recovery_password|escape}"/></td> </tr> - <tr> {if isset($error.recovery_2nd_stage_command)} - <th class="error"><label>{$message.descRecovery_2nd_stage_command|escape}</label> - <br />recovery_2nd_stage_command (string)</th> - {else} - <th><label>{$message.descRecovery_2nd_stage_command|escape}</label> - <br />recovery_2nd_stage_command (string)</th> - {/if} - <td><input type="text" name="recovery_2nd_stage_command" - value="{$params.recovery_2nd_stage_command|escape}"/></td> + <tr> + <th{if isset($error.recovery_1st_stage_command)} class="error"{/if}> + <label>{$message.descRecovery_1st_stage_command|escape}</label> + <br />recovery_1st_stage_command (string)</th> + <td><input type="text" name="recovery_1st_stage_command" + value="{$params.recovery_1st_stage_command|escape}"/></td> </tr> - <tr> {if isset($error.recovery_timeout)} - <th class="error"><label>{$message.descRecovery_timeout|escape}</label> - <br />recovery_timeout (integer)</th> - {else} - <th><label>{$message.descRecovery_timeout|escape}</label> - <br />recovery_timeout (integer)</th> - {/if} - <td><input type="text" name="recovery_timeout" value="{$params.recovery_timeout|escape}"/></td> + <tr> + <th{if isset($error.recovery_2nd_stage_command)} class="error"{/if}> + <label>{$message.descRecovery_2nd_stage_command|escape}</label> + <br />recovery_2nd_stage_command (string)</th> + <td><input type="text" name="recovery_2nd_stage_command" + value="{$params.recovery_2nd_stage_command|escape}"/></td> </tr> - <tr> {if isset($error.client_idle_limit_in_recovery)} - <th class="error"><label>{$message.descClient_idle_limit_in_recovery|escape}</label> - <br />client_idle_limit_in_recovery (integer)</th> - {else} - <th><label>{$message.descClient_idle_limit_in_recovery|escape}</label> - <br />client_idle_limit_in_recovery (integer)</th> - {/if} - <td><input type="text" name="client_idle_limit_in_recovery" - value="{$params.client_idle_limit_in_recovery|escape}"/></td> - </tr> + <tr> + <th{if isset($error.recovery_timeout)} class="error"{/if}> + <label>{$message.descRecovery_timeout|escape}</label> + <br />recovery_timeout (integer)</th> + <td><input type="text" name="recovery_timeout" value="{$params.recovery_timeout|escape}"/></td> + </tr> + + {if paramExists('client_idle_limit_in_recovery')} + <tr> + <th{if isset($error.client_idle_limit_in_recovery)} class="error"{/if}> + <label>{$message.descClient_idle_limit_in_recovery|escape}</label> + <br />client_idle_limit_in_recovery (integer)</th> + <td><input type="text" name="client_idle_limit_in_recovery" + value="{$params.client_idle_limit_in_recovery|escape}"/></td> + </tr> + {/if} </tbody> </table> + {if hasMemqcache()} {* --------------------------------------------------------------------- * * On Memory Query Cache * * --------------------------------------------------------------------- *} @@ -1431,26 +1199,18 @@ function cancelNode() { </tfoot> <tbody> - <tr> {if isset($error.memory_cache_enabled)} - <th class="error"><label>{$message.descMemory_cache_enabled|escape}</label> - <br />memory_cache_enabled (bool)</th> - {else} - <th><label>{$message.descMemory_cache_enabled|escape}</label> - <br />memory_cache_enabled (bool)</th> - {/if} - {if $params.memory_cache_enabled == 'on'} - <td><input type="checkbox" name="memory_cache_enabled" id="memory_cache_enabled" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="memory_cache_enabled" id="memory_cache_enabled" value="false" /></td> - {/if} + <tr> + <th{if isset($error.memory_cache_enabled)} class="error"{/if}> + <label>{$message.descMemory_cache_enabled|escape}</label> + <br />memory_cache_enabled (bool)</th> + <td><input type="checkbox" name="memory_cache_enabled" id="memory_cache_enabled" value="true" + {if $params.memory_cache_enabled == 'on'}checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.memqcache_method)} - <th class="error"><label>{$message.descMemqcache_method|escape}</label> + <tr> + <th{if isset($error.memqcache_method)} class="error"{/if}> + <label>{$message.descMemqcache_method|escape}</label> <br />memqcache_method (string) *</th> - {else} - <th><label>{$message.descMemqcache_method|escape}</label><br />memqcache_method (string) *</th> - {/if} <td><select name="memqcache_method" id="memqcache_method"> <option value="shmem" {if $params.memqcache_method == 'shmem'}selected{/if}>shmem</option> <option value="memcached" {if $params.memqcache_method == 'memcached'}selected{/if}>memcached</option> @@ -1459,158 +1219,122 @@ function cancelNode() { <tr><th class="category" colspan="2">Memcached specific</th></tr> - <tr> {if isset($error.memqcache_memcached_host)} - <th class="error"><label>{$message.descMemqcache_memcached_host|escape}</label> - <br />memqcache_memcached_host (strign) *</th> - {else} - <th><label>{$message.descMemqcache_memcached_host|escape}</label> - <br />memqcache_memcached_host (string) *</th> - {/if} - <td><input type="text" name="memqcache_memcached_host" value="{$params.memqcache_memcached_host|escape}"/></td> + <tr> + <th{if isset($error.memqcache_memcached_host)} class="error"{/if}> + <label>{$message.descMemqcache_memcached_host|escape}</label> + <br />memqcache_memcached_host (string) *</th> + <td><input type="text" name="memqcache_memcached_host" value="{$params.memqcache_memcached_host|escape}"/></td> </tr> - <tr> {if isset($error.memqcache_memcached_port)} - <th class="error"><label>{$message.descMemqcache_memcached_port|escape}</label> - <br />memqcache_memcached_port (integer) *</th> - {else} - <th><label>{$message.descMemqcache_memcached_port|escape}</label> - <br />memqcache_memcached_port (integer) *</th> - {/if} - <td><input type="text" name="memqcache_memcached_port" value="{$params.memqcache_memcached_port|escape}"/></td> + <tr> + <th{if isset($error.memqcache_memcached_port)} class="error"{/if}> + <label>{$message.descMemqcache_memcached_port|escape}</label> + <br />memqcache_memcached_port (integer) *</th> + <td><input type="text" name="memqcache_memcached_port" value="{$params.memqcache_memcached_port|escape}"/></td> </tr> <tr><th class="category" colspan="2">Shared memory specific</th></tr> - <tr> {if isset($error.memqcache_total_size)} - <th class="error"><label>{$message.descMemqcache_total_size|escape}</label> - <br />memqcache_total_size (integer) *</th> - {else} - <th><label>{$message.descMemqcache_total_size|escape}</label> - <br />memqcache_total_size (integer) *</th> - {/if} - <td><input type="text" name="memqcache_total_size" value="{$params.memqcache_total_size|escape}"/></td> + <tr> + <th{if isset($error.memqcache_total_size)} class="error"{/if}> + <label>{$message.descMemqcache_total_size|escape}</label> + <br />memqcache_total_size (integer) *</th> + <td><input type="text" name="memqcache_total_size" value="{$params.memqcache_total_size|escape}"/></td> </tr> - <tr> {if isset($error.memqcache_max_num_cache)} - <th class="error"><label>{$message.descMemqcache_max_num_cache|escape}</label> - <br />memqcache_max_num_cache (integer) *</th> - {else} - <th><label>{$message.descMemqcache_max_num_cache|escape}</label> - <br />memqcache_max_num_cache (integer) *</th> - {/if} - <td><input type="text" name="memqcache_max_num_cache" value="{$params.memqcache_max_num_cache|escape}"/></td> + <tr> + <th{if isset($error.memqcache_max_num_cache)} class="error"{/if}> + <label>{$message.descMemqcache_max_num_cache|escape}</label> + <br />memqcache_max_num_cache (integer) *</th> + <td><input type="text" name="memqcache_max_num_cache" value="{$params.memqcache_max_num_cache|escape}"/></td> </tr> - <tr> {if isset($error.memqcache_cache_block_size)} - <th class="error"><label>{$message.descMemqcache_cache_block_size|escape}</label> - <br />memqcache_cache_block_size (integer) *</th> - {else} - <th><label>{$message.descMemqcache_cache_block_size|escape}</label> - <br />memqcache_cache_block_size (integer) *</th> - {/if} - <td><input type="text" name="memqcache_cache_block_size" value="{$params.memqcache_cache_block_size|escape}"/></td> + <tr> + <th{if isset($error.memqcache_cache_block_size)} class="error"{/if}> + <label>{$message.descMemqcache_cache_block_size|escape}</label> + <br />memqcache_cache_block_size (integer) *</th> + <td><input type="text" name="memqcache_cache_block_size" value="{$params.memqcache_cache_block_size|escape}"/></td> </tr> <tr><th class="category" colspan="2">Common</th></tr> - <tr> {if isset($error.memqcache_expire)} - <th class="error"><label>{$message.descMemqcache_expire|escape}</label> - <br />memqcache_expire (integer) *</th> - {else} - <th><label>{$message.descMemqcache_expire|escape}</label> - <br />memqcache_expire (integer) *</th> - {/if} - <td><input type="text" name="memqcache_expire" value="{$params.memqcache_expire|escape}"/></td> - </tr> - - <tr> {if isset($error.memqcache_auto_cache_invalidation)} - <th class="error"><label>{$message.descMemqcache_auto_cache_invalidation|escape}</label> - <br />memqcache_auto_cache_invalidation *</th> - {else} - <th><label>{$message.descMemqcache_auto_cache_invalidation|escape}</label> - <br />memqcache_auto_cache_invalidation *</th> - {/if} - {if $params.memqcache_auto_cache_invalidation == 'on'} - <td><input type="checkbox" name="memqcache_auto_cache_invalidation" id="memqcache_auto_cache_invalidation" value="true" checked="checked" /></td> - {else} - <td><input type="checkbox" name="memqcache_auto_cache_invalidation" id="memqcache_auto_cache_invalidation" value="false" /></td> - {/if} - </tr> - - <tr> {if isset($error.memqcache_maxcache)} - <th class="error"><label>{$message.descMemqcache_maxcache|escape}</label> - <br />memqcache_maxcache (integer) *</th> - {else} - <th><label>{$message.descMemqcache_maxcache|escape}</label> - <br />memqcache_maxcache (integer) *</th> - {/if} - <td><input type="text" name="memqcache_maxcache" value="{$params.memqcache_maxcache|escape}"/></td> - </tr> - - <tr> {if isset($error.memqcache_oiddir)} - <th class="error"><label>{$message.descMemqcache_oiddir|escape}</label> - <br />memqcache_oiddir (string) *</th> - {else} - <th><label>{$message.descMemqcache_oiddir|escape}</label> - <br />memqcache_oiddir (string) *</th> - {/if} - <td><input type="text" name="memqcache_oiddir" value="{$params.memqcache_oiddir|escape}"/></td> + <tr> + <th{if isset($error.memqcache_expire)} class="error"{/if}> + <label>{$message.descMemqcache_expire|escape}</label> + <br />memqcache_expire (integer) *</th> + <td><input type="text" name="memqcache_expire" value="{$params.memqcache_expire|escape}"/></td> </tr> - <tr> {if isset($error.white_memqcache_table_list)} - <th class="error"><label>{$message.descWhite_memqcache_table_list|escape}</label> - <br />white_memqcache_table_list (string)</th> - {else} - <th><label>{$message.descWhite_memqcache_table_list|escape}</label> - <br />white_memqcache_table_list (string)</th> - {/if} - <td><input type="text" name="white_memqcache_table_list" value="{$params.white_memqcache_table_list|escape}"/></td> + <tr> + <th{if isset($error.memqcache_auto_cache_invalidation)} class="error"{/if}> + <label>{$message.descMemqcache_auto_cache_invalidation|escape}</label> + <br />memqcache_auto_cache_invalidation *</th> + <td><input type="checkbox" name="memqcache_auto_cache_invalidation" id="memqcache_auto_cache_invalidation" + value="true"{if $params.memqcache_auto_cache_invalidation == 'on'} checked="checked"{/if} /></td> </tr> - <tr> {if isset($error.black_memqcache_table_list)} - <th class="error"><label>{$message.descBlack_memqcache_table_list|escape}</label> - <br />black_memqcache_table_list (string)</th> - {else} - <th><label>{$message.descBlack_memqcache_table_list|escape}</label> - <br />black_memqcache_table_list (string)</th> - {/if} - <td><input type="text" name="black_memqcache_table_list" value="{$params.black_memqcache_table_list|escape}"/></td> + <tr> + <th{if isset($error.memqcache_maxcache)} class="error"{/if}> + <label>{$message.descMemqcache_maxcache|escape}</label> + <br />memqcache_maxcache (integer) *</th> + <td><input type="text" name="memqcache_maxcache" value="{$params.memqcache_maxcache|escape}"/></td> </tr> - </tbody> - </table> - - {* --------------------------------------------------------------------- * - * Others * - * --------------------------------------------------------------------- *} - <h3><a name="others" id="others">Others</a></h3> - - <table> - <thead> <tr> - <th>{$message.strParameter|escape}</th> - <th>{$message.strValue|escape}</th> + <th{if isset($error.memqcache_oiddir)} class="error"{/if}> + <label>{$message.descMemqcache_oiddir|escape}</label> + <br />memqcache_oiddir (string) *</th> + <td><input type="text" name="memqcache_oiddir" value="{$params.memqcache_oiddir|escape}"/></td> </tr> - </thead> - <tfoot> + <tr> - <td colspan="2"></td> + <th{if isset($error.white_memqcache_table_list)} class="error"{/if}> + <label>{$message.descWhite_memqcache_table_list|escape}</label> + <br />white_memqcache_table_list (string)</th> + <td><input type="text" name="white_memqcache_table_list" value="{$params.white_memqcache_table_list|escape}"/></td> </tr> - </tfoot> - <tbody> - <tr> {if isset($error.relcache_expire)} - <th class="error"><label>{$message.descRelcache_expire|escape}</label> - <br />relcache_expire (integer)</th> - {else} - <th><label>{$message.descRelcache_expire|escape}</label> - <br />relcache_expire (integer)</th> - {/if} - <td><input type="text" name="relcache_expire" value="{$params.relcache_expire|escape}"/></td> + <tr> + <th{if isset($error.black_memqcache_table_list)} class="error"{/if}> + <label>{$message.descBlack_memqcache_table_list|escape}</label> + <br />black_memqcache_table_list (string)</th> + <td><input type="text" name="black_memqcache_table_list" value="{$params.black_memqcache_table_list|escape}"/></td> </tr> </tbody> </table> + {/if} + + {if paramExists('relcache_expire')} + {* --------------------------------------------------------------------- * + * Others * + * --------------------------------------------------------------------- *} + <h3><a name="others" id="others">Others</a></h3> + + <table> + <thead> + <tr> + <th>{$message.strParameter|escape}</th> + <th>{$message.strValue|escape}</th> + </tr> + </thead> + <tfoot> + <tr> + <td colspan="2"></td> + </tr> + </tfoot> + <tbody> + + <tr> + <th{if isset($error.relcache_expire)} class="error"{/if}> + <label>{$message.descRelcache_expire|escape}</label> + <br />relcache_expire (integer)</th> + <td><input type="text" name="relcache_expire" value="{$params.relcache_expire|escape}"/></td> + </tr> + + </tbody> + </table> + {/if} {* --------------------------------------------------------------------- * * Form End * diff --git a/templates/status.tpl b/templates/status.tpl index 9cf57e7..d9d4c5b 100644 --- a/templates/status.tpl +++ b/templates/status.tpl @@ -197,6 +197,9 @@ function changeView(chView){ <input type="hidden" name="action" value="" /> <input type="hidden" name="nodeNumber" value="" /> +<h2>pgpool-II Version</h2> +{$smarty.const._PGPOOL2_VERSION} + {* --------------------------------------------------------------------- *} {* Status Info Buttons *} {* --------------------------------------------------------------------- *} @@ -244,6 +247,7 @@ function changeView(chView){ </tr></tfoot> <tbody> + {if hasMemqCache() == false} <tr><td>{$message.strCmdC|escape} (-c)</td> {if $c == 1} <td><input type="checkbox" name="c" checked="checked" /></td> @@ -251,6 +255,7 @@ function changeView(chView){ <td><input type="checkbox" name="c" /></td> {/if} </tr> + {/if} <tr><td>{$message.strCmdLargeD|escape} (-D)</td> {if $n == 1} @@ -268,6 +273,7 @@ function changeView(chView){ {/if} </tr> + {if hasMemqCache()} <tr><td>{$message.strCmdLargeC|escape} (-C)</td> {if $C == 1} <td><input type="checkbox" name="C" checked="checked" /></td> @@ -275,6 +281,7 @@ function changeView(chView){ <td><input type="checkbox" name="C" /></td> {/if} </tr> + {/if} <tr><td>{$message.strCmdD|escape} (-d)</td> {if $d == 1} @@ -360,6 +367,7 @@ function changeView(chView){ </tr></tfoot> <tbody> + {if hasMemqCache() == false} <tr><td>{$message.strCmdC|escape}(-c)</td> {if $c == 1} <td><input type="checkbox" name="c" checked="checked" /></td> @@ -367,6 +375,7 @@ function changeView(chView){ <td><input type="checkbox" name="c" /></td> {/if} </tr> + {/if} <tr><td>{$message.strCmdLargeD|escape}(-D)</td> {if $n == 1} @@ -384,6 +393,7 @@ function changeView(chView){ {/if} </tr> + {if hasMemqCache()} <tr><td>{$message.strCmdLargeC|escape} (-C)</td> {if $C == 1} <td><input type="checkbox" name="C" checked="checked" /></td> @@ -391,6 +401,7 @@ function changeView(chView){ <td><input type="checkbox" name="C" /></td> {/if} </tr> + {/if} <tr><td>{$message.strCmdD|escape}(-d)</td> {if $d == 1} @@ -437,13 +448,20 @@ function changeView(chView){ {/if} {* --------------------------------------------------------------------- *} +{* Start/Stop/Restart messages */ +{* --------------------------------------------------------------------- *} +{if isset($pgpoolStatus)} +<div class="message"> +<h3>Messages</h3> <p>{$pgpoolStatus|escape}</p> <p> {foreach from=$pgpoolMessage item=lines} {$lines|escape}<br /> {/foreach} </p> +</div> +{/if} </form> </div> |