Lots of help page mappings to newly created content. Adjust package editing logic a tad.

1 files changed, 41 insertions, 45 deletions

diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index 5dae9af..963381d 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -51,6 +51,46 @@ $helppages = array(
 	'diag_dns.php' => 'http://doc.pfsense.org/index.php/DNS_Lookup',
 	'diag_dump_states.php' => 'http://doc.pfsense.org/index.php/Show_States',
 	'diag_resetstate.php' => 'http://doc.pfsense.org/index.php/Reset_States',
+	'diag_logs.php' => 'http://doc.pfsense.org/index.php/System_Logs',
+	'diag_logs_auth.php' => 'http://doc.pfsense.org/index.php/Captive_Portal_Authentication_Logs',
+	'diag_logs_dhcp.php' => 'http://doc.pfsense.org/index.php/DHCP_Logs',
+	'diag_logs_filter.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs',
+	'diag_logs_filter_dynamic.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs',
+	'diag_logs_filter_summary.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs',
+	'diag_logs_ntpd.php' => 'http://doc.pfsense.org/index.php/NTP_Logs',
+	'diag_logs_ppp.php' => 'http://doc.pfsense.org/index.php/PPP_Logs',
+	'diag_logs_relayd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs',
+	'diag_logs_settings.php' => 'http://doc.pfsense.org/index.php/Log_Settings',
+	'diag_logs_slbd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs',
+	'diag_logs_vpn.php' => 'http://doc.pfsense.org/index.php/PPTP_VPN_Logs',
+	'diag_logs_ipsec.php' => 'http://doc.pfsense.org/index.php/IPsec_Logs',
+	'diag_logs_openvpn.php' => 'http://doc.pfsense.org/index.php/OpenVPN_Logs',
+	'diag_nanobsd.php' => 'http://doc.pfsense.org/index.php/NanoBSD_Diagnostics',
+	'diag_patterns.php' => 'http://doc.pfsense.org/index.php/Layer7_Pattern_Diagnostics',
+	'diag_ping.php' => 'http://doc.pfsense.org/index.php/Ping_Host',
+	'diag_pkglogs.php' => 'http://doc.pfsense.org/index.php/Package_Logs',
+	'diag_showbogons.php' => 'http://doc.pfsense.org/index.php/Show_Bogons',
+	'diag_system_activity.php' => 'http://doc.pfsense.org/index.php/System_Activity',
+	'diag_traceroute.php' => 'http://doc.pfsense.org/index.php/Traceroute',
+	'easyrule.php' => 'http://doc.pfsense.org/index.php/Easy_Rule',
+	'edit.php' => 'http://doc.pfsense.org/index.php/Edit_File',
+	'exec.php' => 'http://doc.pfsense.org/index.php/Execute_Command',
+	'firewall_nat_1to1.php' => 'http://doc.pfsense.org/index.php/1:1_NAT',
+	'firewall_nat_1to1_edit.php' => 'http://doc.pfsense.org/index.php/1:1_NAT',
+	'halt.php' => 'http://doc.pfsense.org/index.php/Halt_System',
+	'reboot.php' => 'http://doc.pfsense.org/index.php/Reboot_System',
+	'status_filter_reload.php' => 'http://doc.pfsense.org/index.php/Filter_Reload_Status',
+	'status_gateway_groups.php' => 'http://doc.pfsense.org/index.php/Gateway_Status',
+	'status_gateways.php' => 'http://doc.pfsense.org/index.php/Gateway_Status',
+	'status_graph.php' => 'http://doc.pfsense.org/index.php/Traffic_Graph',
+	'status_graph_cpu.php' => 'http://doc.pfsense.org/index.php/CPU_Load',
+	'status_interfaces.php' => 'http://doc.pfsense.org/index.php/Interface_Status',
+	'status_services.php' => 'http://doc.pfsense.org/index.php/Services_Status',
+	'status_wireless.php' => 'http://doc.pfsense.org/index.php/Wireless_Status',
+	'pkg_mgr.php' => 'http://doc.pfsense.org/index.php/Package_Manager',
+	'pkg_mgr_install.php' => 'http://doc.pfsense.org/index.php/Package_Manager',
+	'pkg_mgr_installed.php' => 'http://doc.pfsense.org/index.php/Package_Manager',
+	'pkg_mgr_settings.php' => 'http://doc.pfsense.org/index.php/Package_Manager_Settings',
 
 
 	/* Below here are pages that may need some cleanup or have not been fully looked at yet */
@@ -58,7 +98,6 @@ $helppages = array(
 	'diag_ipsec.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'diag_ipsec_sad.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'diag_ipsec_spd.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
-	'diag_logs_ipsec.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'vpn_ipsec.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'vpn_ipsec_ca.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'vpn_ipsec_ca_edit.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
@@ -70,7 +109,6 @@ $helppages = array(
 	'vpn_ipsec_phase1.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 	'vpn_ipsec_phase2.php' => 'http://doc.pfsense.org/index.php/Category:IPsec',
 
-	'diag_logs_openvpn.php' => 'http://doc.pfsense.org/index.php/Category:OpenVPN',
 	'status_openvpn.php' => 'http://doc.pfsense.org/index.php/Category:OpenVPN',
 	'vpn_openvpn.php' => 'http://doc.pfsense.org/index.php/Category:OpenVPN',
 	'vpn_openvpn_ccd.php' => 'http://doc.pfsense.org/index.php/Category:OpenVPN',
@@ -195,31 +233,6 @@ be removed.(e.g. xmlrpc.php)
 
 Below this is a list of .xml files from built-in and add-on packages
 
-	'diag_logs.php' => '',
-	'diag_logs_auth.php' => '',
-	'diag_logs_dhcp.php' => '',
-	'diag_logs_filter.php' => '',
-	'diag_logs_filter_dynamic.php' => '',
-	'diag_logs_filter_summary.php' => '',
-	'diag_logs_ntpd.php' => '',
-	'diag_logs_ppp.php' => '',
-	'diag_logs_relayd.php' => '',
-	'diag_logs_settings.php' => '',
-	'diag_logs_slbd.php' => '',
-	'diag_logs_vpn.php' => '',
-	'diag_nanobsd.php' => '',
-	'diag_patterns.php' => '',
-	'diag_ping.php' => '',
-	'diag_pkglogs.php' => '',
-	'diag_showbogons.php' => '',
-	'diag_system_activity.php' => '',
-	'diag_traceroute.php' => '',
-	'easyrule.php' => '',
-	'edit.php' => '',
-	'exec.php' => '',
-	'firewall_nat_1to1.php' => '',
-	'firewall_nat_1to1_edit.php' => '',
-	'halt.php' => '',
 	'interfaces.php' => '',
 	'interfaces_assign.php' => '',
 	'interfaces_bridge.php' => '',
@@ -237,14 +250,6 @@ Below this is a list of .xml files from built-in and add-on packages
 	'interfaces_qinq.php' => '',
 	'interfaces_qinq_edit.php' => '',
 	'interfaces_wlan_scan.php' => '',
-	'pkg.php' => '',
-	'pkg_edit.php' => '',
-	'pkg_mgr.php' => '',
-	'pkg_mgr_install.php' => '',
-	'pkg_mgr_installed.php' => '',
-	'pkg_mgr_settings.php' => '',
-	'reboot.php' => '',
-	'restart_httpd.php' => '',
 	'services_dhcp.php' => '',
 	'services_dhcp_edit.php' => '',
 	'services_dhcp_relay.php' => '',
@@ -263,14 +268,6 @@ Below this is a list of .xml files from built-in and add-on packages
 	'services_usermanager.php' => '',
 	'services_wol.php' => '',
 	'services_wol_edit.php' => '',
-	'status_filter_reload.php' => '',
-	'status_gateway_groups.php' => '',
-	'status_gateways.php' => '',
-	'status_graph.php' => '',
-	'status_graph_cpu.php' => '',
-	'status_interfaces.php' => '',
-	'status_services.php' => '',
-	'status_wireless.php' => '',
 	'system.php' => '',
 	'system_advanced.php' => '',
 	'system_advanced_admin.php' => '',
@@ -311,7 +308,6 @@ Below this is a list of .xml files from built-in and add-on packages
 	'vpn_pptp.php' => '',
 	'vpn_pptp_users.php' => '',
 	'vpn_pptp_users_edit.php' => '',
-	'wizard.php' => '',
 
 	'olsrd.xml' => '',
 	'openntpd.xml' => '',
@@ -404,7 +400,7 @@ if (empty($pagename)) {
 
 	/* If the filename is pkg_edit.php or wizard.php, reparse looking
 		for the .xml filename */
-	if (($pagename == "pkg_edit.php") || ($pagename == "wizard.php")) {
+	if (($pagename == "pkg.php") || ($pagename == "pkg_edit.php") || ($pagename == "wizard.php")) {
 		$param_split = explode('&', $uri_split[2]);
 		foreach ($param_split as $param) {
 			if (substr($param, 0, 4) == "xml=") {