diff options
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/filter_log.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/priv.defs.inc | 34 | ||||
-rw-r--r-- | src/etc/inc/priv/user.priv.inc | 24 | ||||
-rw-r--r-- | src/etc/pfSense.obsoletedfiles | 17 |
4 files changed, 47 insertions, 30 deletions
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 22296cb..fbf7c3b 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -578,7 +578,7 @@ function handle_ajax($nentries, $tail = 50) { $icon_act = "fa-check icon-success"; } - $btn = '<i class="fa ' . $icon_act . ' icon-pointer" title="' . $log_row['act'] . '/' . $log_row['tracker'] . '" onclick="javascript:getURL(\'diag_logs_filter.php?getrulenum=' . $log_row['rulenum'] . ',' . $log_row['tracker'] . ',' . $log_row['act'] . '\', outputrule);"></i>'; + $btn = '<i class="fa ' . $icon_act . ' icon-pointer" title="' . $log_row['act'] . '/' . $log_row['tracker'] . '" onclick="javascript:getURL(\'status_logs_filter.php?getrulenum=' . $log_row['rulenum'] . ',' . $log_row['tracker'] . ',' . $log_row['act'] . '\', outputrule);"></i>'; $new_rules .= "{$btn}||{$log_row['time']}||{$log_row['interface']}||{$log_row['srcip']}||{$log_row['srcport']}||{$log_row['dstip']}||{$log_row['dstport']}||{$log_row['proto']}||{$log_row['version']}||" . time() . "||\n"; } } diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index fa9f19b..06d0418 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -23,7 +23,7 @@ $priv_list['page-status-carp'] = array(); $priv_list['page-status-carp']['name'] = gettext("WebCfg - Status: CARP"); $priv_list['page-status-carp']['descr'] = gettext("Allow access to the 'Status: CARP' page."); $priv_list['page-status-carp']['match'] = array(); -$priv_list['page-status-carp']['match'][] = "carp_status.php*"; +$priv_list['page-status-carp']['match'][] = "status_carp.php*"; $priv_list['page-diagnostics-crash-reporter'] = array(); $priv_list['page-diagnostics-crash-reporter']['name'] = gettext("WebCfg - Crash reporter"); @@ -89,25 +89,25 @@ $priv_list['page-status-ipsec'] = array(); $priv_list['page-status-ipsec']['name'] = gettext("WebCfg - Status: IPsec"); $priv_list['page-status-ipsec']['descr'] = gettext("Allow access to the 'Status: IPsec' page."); $priv_list['page-status-ipsec']['match'] = array(); -$priv_list['page-status-ipsec']['match'][] = "diag_ipsec.php*"; +$priv_list['page-status-ipsec']['match'][] = "status_ipsec.php*"; $priv_list['page-status-ipsec-leases'] = array(); $priv_list['page-status-ipsec-leases']['name'] = gettext("WebCfg - Status: IPsec: Leases"); $priv_list['page-status-ipsec-leases']['descr'] = gettext("Allow access to the 'Status: IPsec: Leases' page."); $priv_list['page-status-ipsec-leases']['match'] = array(); -$priv_list['page-status-ipsec-leases']['match'][] = "diag_ipsec_leases.php*"; +$priv_list['page-status-ipsec-leases']['match'][] = "status_ipsec_leases.php*"; $priv_list['page-status-ipsec-sad'] = array(); $priv_list['page-status-ipsec-sad']['name'] = gettext("WebCfg - Status: IPsec: SAD"); $priv_list['page-status-ipsec-sad']['descr'] = gettext("Allow access to the 'Status: IPsec: SAD' page."); $priv_list['page-status-ipsec-sad']['match'] = array(); -$priv_list['page-status-ipsec-sad']['match'][] = "diag_ipsec_sad.php*"; +$priv_list['page-status-ipsec-sad']['match'][] = "status_ipsec_sad.php*"; $priv_list['page-status-ipsec-spd'] = array(); $priv_list['page-status-ipsec-spd']['name'] = gettext("WebCfg - Status: IPsec: SPD"); $priv_list['page-status-ipsec-spd']['descr'] = gettext("Allow access to the 'Status: IPsec: SPD' page."); $priv_list['page-status-ipsec-spd']['match'] = array(); -$priv_list['page-status-ipsec-spd']['match'][] = "diag_ipsec_spd.php*"; +$priv_list['page-status-ipsec-spd']['match'][] = "status_ipsec_spd.php*"; $priv_list['page-diagnostics-limiter-info'] = array(); $priv_list['page-diagnostics-limiter-info']['name'] = gettext("WebCfg - Diagnostics: Limiter Info"); @@ -119,37 +119,37 @@ $priv_list['page-diagnostics-logs-system'] = array(); $priv_list['page-diagnostics-logs-system']['name'] = gettext("WebCfg - Status: Logs: System"); $priv_list['page-diagnostics-logs-system']['descr'] = gettext("Allow access to the 'Status: System Logs: General' page."); $priv_list['page-diagnostics-logs-system']['match'] = array(); -$priv_list['page-diagnostics-logs-system']['match'][] = "diag_logs.php"; +$priv_list['page-diagnostics-logs-system']['match'][] = "status_logs.php"; $priv_list['page-diagnostics-logs-firewall'] = array(); $priv_list['page-diagnostics-logs-firewall']['name'] = gettext("WebCfg - Status: Logs: Firewall"); $priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to the 'Status: Logs: Firewall' page."); $priv_list['page-diagnostics-logs-firewall']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall']['match'][] = "diag_logs_filter.php*"; +$priv_list['page-diagnostics-logs-firewall']['match'][] = "status_logs_filter.php*"; $priv_list['page-diagnostics-logs-firewall-dynamic'] = array(); $priv_list['page-diagnostics-logs-firewall-dynamic']['name'] = gettext("WebCfg - Status: System Logs: Firewall (Dynamic View)"); $priv_list['page-diagnostics-logs-firewall-dynamic']['descr'] = gettext("Allow access to the 'Status: System Logs: Firewall (Dynamic View)' page"); $priv_list['page-diagnostics-logs-firewall-dynamic']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall-dynamic']['match'][] = "diag_logs_filter_dynamic.php*"; +$priv_list['page-diagnostics-logs-firewall-dynamic']['match'][] = "status_logs_filter_dynamic.php*"; $priv_list['page-diagnostics-logs-firewall-summary'] = array(); $priv_list['page-diagnostics-logs-firewall-summary']['name'] = gettext("WebCfg - Status: System Logs: Firewall Log Summary"); $priv_list['page-diagnostics-logs-firewall-summary']['descr'] = gettext("Allow access to the 'Status: System Logs: Firewall Log Summary' page"); $priv_list['page-diagnostics-logs-firewall-summary']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall-summary']['match'][] = "diag_logs_filter_summary.php*"; +$priv_list['page-diagnostics-logs-firewall-summary']['match'][] = "status_logs_filter_summary.php*"; $priv_list['page-diagnostics-logs-settings'] = array(); $priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Status: Logs: Settings"); $priv_list['page-diagnostics-logs-settings']['descr'] = gettext("Allow access to the 'Status: Logs: Settings' page."); $priv_list['page-diagnostics-logs-settings']['match'] = array(); -$priv_list['page-diagnostics-logs-settings']['match'][] = "diag_logs_settings.php*"; +$priv_list['page-diagnostics-logs-settings']['match'][] = "status_logs_settings.php*"; $priv_list['page-diagnostics-logs-pptpvpn'] = array(); $priv_list['page-diagnostics-logs-pptpvpn']['name'] = gettext("WebCfg - Status: Logs: VPN"); $priv_list['page-diagnostics-logs-pptpvpn']['descr'] = gettext("Allow access to the 'Status: Logs: VPN' page."); $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array(); -$priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*"; +$priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "status_logs_vpn.php*"; $priv_list['page-diagnostics-nanobsd'] = array(); $priv_list['page-diagnostics-nanobsd']['name'] = gettext("WebCfg - Diagnostics: NanoBSD"); @@ -185,7 +185,7 @@ $priv_list['page-status-packagelogs'] = array(); $priv_list['page-status-packagelogs']['name'] = gettext("WebCfg - Status: Package logs"); $priv_list['page-status-packagelogs']['descr'] = gettext("Allow access to the 'Status: Package logs' page."); $priv_list['page-status-packagelogs']['match'] = array(); -$priv_list['page-status-packagelogs']['match'][] = "diag_pkglogs.php*"; +$priv_list['page-status-packagelogs']['match'][] = "status_pkglogs.php*"; $priv_list['page-diagnostics-resetstate'] = array(); $priv_list['page-diagnostics-resetstate']['name'] = gettext("WebCfg - Diagnostics: Reset states"); @@ -227,7 +227,7 @@ $priv_list['page-diagnostics-system-pftop'] = array(); $priv_list['page-diagnostics-system-pftop']['name'] = gettext("WebCfg - Diagnostics: pfTop"); $priv_list['page-diagnostics-system-pftop']['descr'] = gettext("Allows access to the 'Diagnostics: pfTop' page"); $priv_list['page-diagnostics-system-pftop']['match'] = array(); -$priv_list['page-diagnostics-system-pftop']['match'][] = "diag_system_pftop.php*"; +$priv_list['page-diagnostics-system-pftop']['match'][] = "diag_pftop.php*"; $priv_list['page-diagnostics-tables'] = array(); $priv_list['page-diagnostics-tables']['name'] = gettext("WebCfg - Diagnostics: pf Table IP addresses"); @@ -422,7 +422,7 @@ $priv_list['page-diagnostics-haltsystem'] = array(); $priv_list['page-diagnostics-haltsystem']['name'] = gettext("WebCfg - Diagnostics: Halt system"); $priv_list['page-diagnostics-haltsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Halt system' page."); $priv_list['page-diagnostics-haltsystem']['match'] = array(); -$priv_list['page-diagnostics-haltsystem']['match'][] = "halt.php*"; +$priv_list['page-diagnostics-haltsystem']['match'][] = "diag_halt.php*"; $priv_list['page-xmlrpcinterfacestats'] = array(); $priv_list['page-xmlrpcinterfacestats']['name'] = gettext("WebCfg - XMLRPC Interface Stats"); @@ -638,7 +638,7 @@ $priv_list['page-diagnostics-rebootsystem'] = array(); $priv_list['page-diagnostics-rebootsystem']['name'] = gettext("WebCfg - Diagnostics: Reboot System"); $priv_list['page-diagnostics-rebootsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Reboot System' page."); $priv_list['page-diagnostics-rebootsystem']['match'] = array(); -$priv_list['page-diagnostics-rebootsystem']['match'][] = "reboot.php*"; +$priv_list['page-diagnostics-rebootsystem']['match'][] = "diag_reboot.php*"; $priv_list['page-diagnostics-restart-httpd'] = array(); $priv_list['page-diagnostics-restart-httpd']['name'] = gettext("WebCfg - Diagnostics: Restart Web Server Daemon"); @@ -1278,13 +1278,13 @@ $priv_list['page-services-pppoeserver'] = array(); $priv_list['page-services-pppoeserver']['name'] = gettext("WebCfg - Services: PPPoE Server"); $priv_list['page-services-pppoeserver']['descr'] = gettext("Allow access to the 'Services: PPPoE Server' page."); $priv_list['page-services-pppoeserver']['match'] = array(); -$priv_list['page-services-pppoeserver']['match'][] = "vpn_pppoe.php*"; +$priv_list['page-services-pppoeserver']['match'][] = "services_pppoe.php*"; $priv_list['page-services-pppoeserver-edit'] = array(); $priv_list['page-services-pppoeserver-edit']['name'] = gettext("WebCfg - Services: PPPoE Server: Edit"); $priv_list['page-services-pppoeserver-edit']['descr'] = gettext("Allow access to the 'Services: PPPoE Server: Edit' page."); $priv_list['page-services-pppoeserver-edit']['match'] = array(); -$priv_list['page-services-pppoeserver-edit']['match'][] = "vpn_pppoe_edit.php*"; +$priv_list['page-services-pppoeserver-edit']['match'][] = "services_pppoe_edit.php*"; $priv_list['page-pfsensewizardsubsystem'] = array(); $priv_list['page-pfsensewizardsubsystem']['name'] = gettext("WebCfg - pfSense wizard subsystem"); diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc index d3290fe..fca9be2 100644 --- a/src/etc/inc/priv/user.priv.inc +++ b/src/etc/inc/priv/user.priv.inc @@ -22,7 +22,7 @@ $priv_list['page-dashboard-all']['match'][] = "graph.php*"; $priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*"; $priv_list['page-dashboard-all']['match'][] = "getstats.php*"; $priv_list['page-dashboard-all']['match'][] = "ifstats.php*"; -$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*"; +$priv_list['page-dashboard-all']['match'][] = "status_logs_filter_dynamic.php*"; $priv_list['page-dashboard-widgets'] = array(); $priv_list['page-dashboard-widgets']['name'] = gettext("WebCfg - Dashboard widgets (direct access)."); @@ -70,66 +70,66 @@ $priv_list['page-status-systemlogs-portalauth'] = array(); $priv_list['page-status-systemlogs-portalauth']['name'] = gettext("WebCfg - Status: System logs: Portal Auth"); $priv_list['page-status-systemlogs-portalauth']['descr'] = gettext("Allow access to the 'Status: System logs: Portal Auth' page."); $priv_list['page-status-systemlogs-portalauth']['match'] = array(); -$priv_list['page-status-systemlogs-portalauth']['match'][] = "diag_logs.php?logfile=portalauth"; +$priv_list['page-status-systemlogs-portalauth']['match'][] = "status_logs.php?logfile=portalauth"; $priv_list['page-diagnostics-logs-dhcp'] = array(); $priv_list['page-diagnostics-logs-dhcp']['name'] = gettext("WebCfg - Status: Logs: DHCP"); $priv_list['page-diagnostics-logs-dhcp']['descr'] = gettext("Allow access to the 'Status: Logs: DHCP' page."); $priv_list['page-diagnostics-logs-dhcp']['match'] = array(); -$priv_list['page-diagnostics-logs-dhcp']['match'][] = "diag_logs.php?logfile=dhcpd"; +$priv_list['page-diagnostics-logs-dhcp']['match'][] = "status_logs.php?logfile=dhcpd"; $priv_list['page-diagnostics-logs-gateways'] = array(); $priv_list['page-diagnostics-logs-gateways']['name'] = gettext("WebCfg - Status: Logs: Gateways"); $priv_list['page-diagnostics-logs-gateways']['descr'] = gettext("Allow access to the 'Status: Logs: System: Gateways' page."); $priv_list['page-diagnostics-logs-gateways']['match'] = array(); -$priv_list['page-diagnostics-logs-gateways']['match'][] = "diag_logs.php?logfile=gateways"; +$priv_list['page-diagnostics-logs-gateways']['match'][] = "status_logs.php?logfile=gateways"; $priv_list['page-diagnostics-logs-resolver'] = array(); $priv_list['page-diagnostics-logs-resolver']['name'] = gettext("WebCfg - Status: Logs: Resolver"); $priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to the 'Status: Logs: System: Resolver' page."); $priv_list['page-diagnostics-logs-resolver']['match'] = array(); -$priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs.php?logfile=resolver"; +$priv_list['page-diagnostics-logs-resolver']['match'][] = "status_logs.php?logfile=resolver"; $priv_list['page-status-systemlogs-ipsecvpn'] = array(); $priv_list['page-status-systemlogs-ipsecvpn']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN"); $priv_list['page-status-systemlogs-ipsecvpn']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); $priv_list['page-status-systemlogs-ipsecvpn']['match'] = array(); -$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "diag_logs.php?logfile=ipsec"; +$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "status_logs.php?logfile=ipsec"; $priv_list['page-status-systemlogs-ntpd'] = array(); $priv_list['page-status-systemlogs-ntpd']['name'] = gettext("WebCfg - Status: System logs: NTP"); $priv_list['page-status-systemlogs-ntpd']['descr'] = gettext("Allow access to the 'Status: System logs: NTP' page."); $priv_list['page-status-systemlogs-ntpd']['match'] = array(); -$priv_list['page-status-systemlogs-ntpd']['match'][] = "diag_logs.php?logfile=ntpd"; +$priv_list['page-status-systemlogs-ntpd']['match'][] = "status_logs.php?logfile=ntpd"; $priv_list['page-status-systemlogs-openvpn'] = array(); $priv_list['page-status-systemlogs-openvpn']['name'] = gettext("WebCfg - Status: System logs: OpenVPN"); $priv_list['page-status-systemlogs-openvpn']['descr'] = gettext("Allow access to the 'Status: System logs: OpenVPN' page."); $priv_list['page-status-systemlogs-openvpn']['match'] = array(); -$priv_list['page-status-systemlogs-openvpn']['match'][] = "diag_logs.php?logfile=openvpn"; +$priv_list['page-status-systemlogs-openvpn']['match'][] = "status_logs.php?logfile=openvpn"; $priv_list['page-status-systemlogs-ppp'] = array(); $priv_list['page-status-systemlogs-ppp']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN"); $priv_list['page-status-systemlogs-ppp']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); $priv_list['page-status-systemlogs-ppp']['match'] = array(); -$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs.php?logfile=ppp"; +$priv_list['page-status-systemlogs-ppp']['match'][] = "status_logs.php?logfile=ppp"; $priv_list['page-status-systemlogs-loadbalancer'] = array(); $priv_list['page-status-systemlogs-loadbalancer']['name'] = gettext("WebCfg - Status: System logs: Load Balancer"); $priv_list['page-status-systemlogs-loadbalancer']['descr'] = gettext("Allow access to the 'Status: System logs: Load Balancer' page."); $priv_list['page-status-systemlogs-loadbalancer']['match'] = array(); -$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "diag_logs.php?logfile=relayd"; +$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "status_logs.php?logfile=relayd"; $priv_list['page-status-systemlogs-routing'] = array(); $priv_list['page-status-systemlogs-routing']['name'] = gettext("WebCfg - Status: System logs: Routing"); $priv_list['page-status-systemlogs-routing']['descr'] = gettext("Allow access to the 'Status: System logs: System: Routing' page."); $priv_list['page-status-systemlogs-routing']['match'] = array(); -$priv_list['page-status-systemlogs-routing']['match'][] = "diag_logs.php?logfile=routing"; +$priv_list['page-status-systemlogs-routing']['match'][] = "status_logs.php?logfile=routing"; $priv_list['page-status-systemlogs-wireless'] = array(); $priv_list['page-status-systemlogs-wireless']['name'] = gettext("WebCfg - Status: System logs: Wireless"); $priv_list['page-status-systemlogs-wireless']['descr'] = gettext("Allow access to the 'Status: System logs: System: Wireless' page."); $priv_list['page-status-systemlogs-wireless']['match'] = array(); -$priv_list['page-status-systemlogs-wireless']['match'][] = "diag_logs.php?logfile=wireless"; +$priv_list['page-status-systemlogs-wireless']['match'][] = "status_logs.php?logfile=wireless"; ?> diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles index a680c75..8754ad5 100644 --- a/src/etc/pfSense.obsoletedfiles +++ b/src/etc/pfSense.obsoletedfiles @@ -739,6 +739,7 @@ /usr/local/share/strongswan/templates/config/plugins/smp.conf /usr/local/share/xml /usr/local/www/auto_complete_helper.js +/usr/local/www/carp_status.php /usr/local/www/classes/maintable.inc /usr/local/www/code-syntax-highlighter /usr/local/www/csrf/csrf-secret.php @@ -749,8 +750,16 @@ /usr/local/www/dfuife.css /usr/local/www/dfuife.js /usr/local/www/diag_dhcp_leases.php +/usr/local/www/diag_ipsec.php +/usr/local/www/diag_ipsec_leases.php +/usr/local/www/diag_ipsec_sad.php +/usr/local/www/diag_ipsec_spd.php +/usr/local/www/diag_logs.php /usr/local/www/diag_logs_auth.php /usr/local/www/diag_logs_dhcp.php +/usr/local/www/diag_logs_filter.php +/usr/local/www/diag_logs_filter_dynamic.php +/usr/local/www/diag_logs_filter_summary.php /usr/local/www/diag_logs_gateways.php /usr/local/www/diag_logs_ipsec.php /usr/local/www/diag_logs_ntpd.php @@ -759,10 +768,14 @@ /usr/local/www/diag_logs_relayd.php /usr/local/www/diag_logs_resolver.php /usr/local/www/diag_logs_routing.php +/usr/local/www/diag_logs_settings.php /usr/local/www/diag_logs_slbd.php +/usr/local/www/diag_logs_vpn.php /usr/local/www/diag_logs_wireless.php /usr/local/www/diag_patterns.php +/usr/local/www/diag_pkglogs.php /usr/local/www/diag_showbogons.php +/usr/local/diag_system_pftop.php /usr/local/www/dom-drag.js /usr/local/www/draglist.js /usr/local/www/dtree.js @@ -780,6 +793,7 @@ /usr/local/www/fred.png /usr/local/www/green_dot.jpg /usr/local/www/gui.css +/usr/local/www/halt.php /usr/local/www/headjs.php /usr/local/www/ifstats.cgi /usr/local/www/includes/javascript.inc.php @@ -815,6 +829,7 @@ /usr/local/www/protochart/ProtoChart.js /usr/local/www/protochart/excanvas-compressed.js /usr/local/www/protochart/excanvas.js +/usr/local/www/reboot.php /usr/local/www/row_helper.js /usr/local/www/row_helper_dynamic.js /usr/local/www/row_toggle.js @@ -857,6 +872,8 @@ /usr/local/www/vpn_openvpn_crl_edit.php /usr/local/www/vpn_openvpn_srv.php /usr/local/www/vpn_openvpn_srv_edit.php +/usr/local/www/vpn_pppoe.php +/usr/local/www/vpn_pppoe_edit.php /usr/local/www/vpn_pppoe_users.php /usr/local/www/vpn_pppoe_users_edit.php /usr/local/www/wizards/traffic_shaper_wizard.inc |