diff options
| author | Colin Smith <colin@pfsense.org> | 2005-07-24 19:50:10 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-07-24 19:50:10 +0000 |
| commit | 301c0c2d6848c5d9e7a39d1a4dc1be497185e925 (patch) | |
| tree | 410b56351b74d480d3b35bb498d5c797370bbeaa /packages | |
| parent | 370fb83cd17d2ae4bc1b52715f82aaf4f7a74c58 (diff) | |
| download | pfsense-packages-301c0c2d6848c5d9e7a39d1a4dc1be497185e925.tar.gz pfsense-packages-301c0c2d6848c5d9e7a39d1a4dc1be497185e925.tar.bz2 pfsense-packages-301c0c2d6848c5d9e7a39d1a4dc1be497185e925.zip | |
Repair ntop package.
XXX: We need to allow packages to throw input_error style messages. The config isn't changed if these errors exist,
but the function to display isn't called.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ntop/ntop.xml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packages/ntop/ntop.xml b/packages/ntop/ntop.xml index 0a8fc5bd..161f26af 100644 --- a/packages/ntop/ntop.xml +++ b/packages/ntop/ntop.xml @@ -3,7 +3,6 @@ <title>Diagnostics: ntop Settings</title> <name>ntop</name> <version>3.0</version> - <preoutput>yes</preoutput> <savetext>Change</savetext> <aftersaveredirect>pkg_edit.php?xml=ntop.xml&id=0</aftersaveredirect> <!-- Menu is where this packages menu will appear --> @@ -53,8 +52,6 @@ <field> <fielddescr>Interface</fielddescr> <fieldname>iface</fieldname> - <size>3</size> - <multiple>true</multiple> <value>lan</value> <type>interfaces_selection</type> </field> @@ -65,22 +62,17 @@ config_lock(); global $config; global $input_errors; - $ntop_config =& $config['installedpackages']['ntop']['config'][0]; + $ntop_config =& $_POST; $if_final = ""; if($ntop_config['password'] and $ntop_config['passwordagain']) { if($ntop_config['password'] == $ntop_config['passwordagain']) { $ifaces = $ntop_config['iface']; - $isfirst = 0; $lan = $config['interfaces']['lan']['if']; - foreach($ifaces as $if) { - if($isfirst == 1) $if_final = ","; - $if_final .= convert_friendly_interface_to_real_interface_name($if); - $isfirst = 1; - } + $if_final .= convert_friendly_interface_to_real_interface_name($if); if(!$if_final) { $if_final = $lan; } - system("/usr/local/bin/ntop --set-admin-password=" . $_POST['password'] . " &"); + exec("/usr/local/bin/ntop --set-admin-password=" . $_POST['password'] . " &", $ntopout); $start = "/usr/local/bin/ntop -i " . $if_final . " -u root -d --ipv4 -M -x 8102 -X 8192 &"; write_rcfile(array( "file" => "ntop.sh", |