diff options
| -rw-r--r-- | config/openospfd/openospfd.xml | 58 | ||||
| -rw-r--r-- | config/openospfd/status_ospfd.php | 18 |
2 files changed, 37 insertions, 39 deletions
diff --git a/config/openospfd/openospfd.xml b/config/openospfd/openospfd.xml index add96bb7..cd32972c 100644 --- a/config/openospfd/openospfd.xml +++ b/config/openospfd/openospfd.xml @@ -60,42 +60,42 @@ <type>input</type> <required/> </field> - <field> - <fielddescr>Update FIB (Routing table)</fielddescr> - <fieldname>updatefib</fieldname> - <description>Disables the updating of the host routing table(turns into stub router).</description> - <type>checkbox</type> - </field> - <field> - <fielddescr>Redistribute connected subnets</fielddescr> - <fieldname>redistributeconnectedsubnets</fieldname> - <description>Enables the redistribution of connected networks (Default no)</description> - <type>checkbox</type> - </field> - <field> - <fielddescr>Redistribute default route</fielddescr> - <fieldname>redistributedefaultroute</fieldname> - <description>Enables the redistribution of a default route to this device (Default no)</description> - <type>checkbox</type> - </field> <field> - <fielddescr>Redistribute static</fielddescr> - <fieldname>redistributestatic</fieldname> - <description>Enables the redistribution of static routes</description> - <type>checkbox</type> - </field> + <fielddescr>Update FIB (Routing table)</fielddescr> + <fieldname>updatefib</fieldname> + <description>Disables the updating of the host routing table(turns into stub router).</description> + <type>checkbox</type> + </field> + <field> + <fielddescr>Redistribute connected subnets</fielddescr> + <fieldname>redistributeconnectedsubnets</fieldname> + <description>Enables the redistribution of connected networks (Default no)</description> + <type>checkbox</type> + </field> + <field> + <fielddescr>Redistribute default route</fielddescr> + <fieldname>redistributedefaultroute</fieldname> + <description>Enables the redistribution of a default route to this device (Default no)</description> + <type>checkbox</type> + </field> + <field> + <fielddescr>Redistribute static</fielddescr> + <fieldname>redistributestatic</fieldname> + <description>Enables the redistribution of static routes</description> + <type>checkbox</type> + </field> <field> <fielddescr>SPF Hold Time</fielddescr> <fieldname>spfholdtime</fieldname> <description>Set the SPF holdtime in seconds. The minimum time between two consecutive shortest path first calculations. The default value is 5 seconds; the valid range is 1-5 seconds.</description> <type>input</type> - </field> + </field> <field> <fielddescr>SPF Delay</fielddescr> <fieldname>spfdelay</fieldname> <description>Set SPF delay in seconds. The delay between receiving an update to the link state database and starting the shortest path first calculation. The default value is 1; valid range is 1-10 seconds.</description> <type>input</type> - </field> + </field> <field> <fielddescr>RFC 1583 compatible</fielddescr> <fieldname>rfc1583</fieldname> @@ -120,13 +120,13 @@ <type>input</type> <size>25</size> </rowhelperfield> - </rowhelper> + </rowhelper> </field> </fields> <custom_php_resync_config_command> - ospfd_install_conf(); - </custom_php_resync_config_command> + ospfd_install_conf(); + </custom_php_resync_config_command> <custom_php_validation_command> ospfd_validate_input(); </custom_php_validation_command> -</packagegui> +</packagegui>
\ No newline at end of file diff --git a/config/openospfd/status_ospfd.php b/config/openospfd/status_ospfd.php index b20b7d04..c60335de 100644 --- a/config/openospfd/status_ospfd.php +++ b/config/openospfd/status_ospfd.php @@ -35,8 +35,8 @@ include("head.inc"); /* List all of the commands as an index. */ function listCmds() { global $commands; - echo "<p>This status page includes the following information:\n"; - echo "<ul width=\"700\">\n"; + echo "<br/>This status page includes the following information:\n"; + echo "<ul width=\"100%\">\n"; for ($i = 0; isset($commands[$i]); $i++ ) { echo "<li><strong><a href=\"#" . $commands[$i][0] . "\">" . $commands[$i][0] . "</a></strong></li>\n"; } @@ -107,7 +107,7 @@ if(strstr($pfSversion, "1.2")) <?php endif; ?> <?php if ($savemsg) print_info_box($savemsg); ?> <div id="mainlevel"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> <?php $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=openospfd.xml&id=0"); @@ -116,15 +116,11 @@ if(strstr($pfSversion, "1.2")) display_top_tabs($tab_array); ?> </table> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="tabcont" > - <form action="status_ospfd.php" method="post"> - </form> - </td> - </tr> <tr> <td class="tabcont" > + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td> <?php defCmdT("OpenOSPFD Summary","/usr/local/sbin/ospfctl show summary"); defCmdT("OpenOSPFD Neighbors","/usr/local/sbin/ospfctl show neighbor"); @@ -137,6 +133,8 @@ if(strstr($pfSversion, "1.2")) <?php listCmds(); ?> <?php execCmds(); ?> </div> + </td> + </tr> </td> </tr> </table> |