From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] WIO: Update to Version 1.3.2 several changes in many files Date: Tue, 20 Feb 2018 21:51:03 +0000 Message-ID: <1519163463.5130.18.camel@ipfire.org> In-Reply-To: <1519159273-15518-1-git-send-email-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5366593398202927244==" List-Id: --===============5366593398202927244== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, thank you for working on this and improving WIO in IPFire. Could we in the future receive many small patches instead of one large one? This doesn't state what has been changed and it makes it hard to track bugs in the future. You can collect many patches and submit them all together in chunks of up to ten or what ever makes sense. On Tue, 2018-02-20 at 21:41 +0100, Stephan Feddersen via Development wrote: > --- > lfs/wio | 4 +- > src/misc-progs/wiohelper.c | 2 +- > src/wio/lang/wio.de.pl | 48 +++++++------- > src/wio/lang/wio.en.pl | 112 ++++++++++++++++---------------- > src/wio/main/wio.pl | 4 +- > src/wio/main/wiovpn.pl | 59 ++++++++--------- > src/wio/wio-graphs.pl | 4 +- > src/wio/wio-lib.pl | 4 +- > src/wio/wio.cgi | 157 +++++++++++++++++++++++++++++++----------= ---- > src/wio/wiographs.cgi | 4 +- > 10 files changed, 228 insertions(+), 170 deletions(-) >=20 > diff --git a/lfs/wio b/lfs/wio > index d70b12b..9ae11b8 100644 > --- a/lfs/wio > +++ b/lfs/wio > @@ -9,13 +9,13 @@ > =20 > include Config > =20 > -VER =3D 1.3.1 > +VER =3D 1.3.2 > =20 > THISAPP =3D wio-$(VER) > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > TARGET =3D $(DIR_INFO)/$(THISAPP) > PROG =3D wio > -PAK_VER =3D 3 > +PAK_VER =3D 1 PAK_VER is only going up, so here it would be 4 for the next release.=20 > =20 > ##########################################################################= ##### > # Top-level Rules > diff --git a/src/misc-progs/wiohelper.c b/src/misc-progs/wiohelper.c > index 0f7fd86..a1e0168 100644 > --- a/src/misc-progs/wiohelper.c > +++ b/src/misc-progs/wiohelper.c > @@ -8,7 +8,7 @@ > * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *= * > *=20 > * IPFire.org - A linux based firewall > - * Copyright (C) 2017 Stephan Feddersen > + * Copyright (C) 2017-2018 Stephan Feddersen > * > * All Rights Reserved. > * > diff --git a/src/wio/lang/wio.de.pl b/src/wio/lang/wio.de.pl > index fd82ff0..a71aefc 100644 > --- a/src/wio/lang/wio.de.pl > +++ b/src/wio/lang/wio.de.pl > @@ -1,7 +1,7 @@ > %tr =3D (%tr, > 'wio' =3D> 'Who Is Online?', > 'wio stat' =3D> 'Status:', > -'wio checked' =3D> 'zuletzt =C3=BCberpr=C3=BCft', > +'wio checked' =3D> 'Zuletzt =C3=BCberpr=C3=BCft', > 'wio name' =3D> 'Hostname / FQDN', > 'wio ipadress' =3D> 'IP-Adresse', > 'wio image' =3D> 'Zustand', > @@ -12,21 +12,21 @@ > 'wio_import_csv' =3D> 'CSV Datei', > 'wio_import_hosts' =3D> 'Hosts Datei (var/ipfire/main/hosts)', > 'wio_import_data' =3D> 'Einstellungen f=C3=BCr ', > -'wio_import_data1' =3D> ' bearbeiten:', > -'wio_import_data2' =3D> ' importieren:', > +'wio_import_data1' =3D> ' Bearbeiten:', > +'wio_import_data2' =3D> ' Importieren:', > 'wio_import' =3D> 'Importieren', > 'wio_import_info' =3D> 'Mitteilung:', > 'wio_import_file' =3D> 'Client(s) importieren aus:', > 'wio_import_info_csv' =3D> 'Es gibt keine neuen Einstellungen zu importier= en!', > 'wio settings' =3D> 'Konfiguration:', > -'wio enabled' =3D> 'aktivieren?', > +'wio enabled' =3D> 'Aktivieren?', > 'wio min' =3D> 'Minute(n)', > 'wio cron' =3D> 'Zeitintervall f=C3=BCr die =C3=9Cberpr=C3=BCfung:', > 'wio_ovpn_cron' =3D> 'Zeitintervall f=C3=BCr die =C3=9Cberpr=C3=BCfung des= OpenVPN RW und IPSec Status:', > -'wio_save' =3D> 'speichern', > +'wio_save' =3D> 'Speichern', > 'wio_error' =3D> 'Fehlermeldung:', > 'wio_info' =3D> 'Meldung:', > -'wio_back' =3D> 'zur=C3=BCck', > +'wio_back' =3D> 'Zur=C3=BCck', > 'wio_use' =3D> 'Diese Einstellungen importieren?', > 'wio_ip_error' =3D> 'Ung=C3=BCltige IP-Adresse!', > 'wio_host_error' =3D> 'Ung=C3=BCltiger Hostname!', > @@ -34,7 +34,7 @@ > 'wio_host_empty' =3D> 'Es wurde kein Hostname eingetragen!', > 'wio_ip_exists' =3D> 'IP-Adresse wird schon benutzt!', > 'wio_ip_empty' =3D> 'Es wurde keine IP-Adresse eingetragen!', > -'wio_import_fixleases' =3D> 'DHCP Datei (var/ipfire/dhcp/fixleases)', > +'wio_import_fixleases' =3D> 'DHCP-Datei (var/ipfire/dhcp/fixleases)', > 'wio_import_leases' =3D> 'Einstellungen importieren:', > 'wio network' =3D> 'Netzwerk', > 'wio_refresh' =3D> 'alle Clients aktualisieren', > @@ -60,7 +60,7 @@ > 'wio_edit_settings' =3D> 'Client hinzuf=C3=BCgen:', > 'wio_edit_client' =3D> 'Client bearbeiten:', > 'wio_graphs' =3D> 'Graphen anzeigen', > -'wio_no_graphs' =3D> 'keine Graphen vorhanden', > +'wio_no_graphs' =3D> 'Keine Graphen vorhanden', > 'wio_graphs_stat' =3D> 'Diagramme f=C3=BCr', > 'wio_vpn_con' =3D> 'VPN - Verbindung(en):', > 'wio_wan_con' =3D> 'WAN - Verbindung:', > @@ -74,13 +74,13 @@ > 'wio_net_scan_green' =3D> 'gr=C3=BCnes', > 'wio_net_scan_blue' =3D> 'blaues', > 'wio_net_scan_orange' =3D> 'oranges', > -'wio_net_scan_run' =3D> 'starten', > -'wio_sort_host' =3D> 'nach Hostnamen (FQDN) sortieren', > -'wio_sort_ip' =3D> 'nach IP Adressen sortieren', > +'wio_net_scan_run' =3D> 'Starten', > +'wio_sort_host' =3D> 'Nach Hostnamen (FQDN) sortieren', > +'wio_sort_ip' =3D> 'Nach IP Adressen sortieren', > 'wio_logging' =3D> 'Logging (/var/log/messages) aktivieren?', > 'wio_no_image' =3D> 'KEIN STATUS', > 'wio_ovpn_con' =3D> 'OpenVPN - Verbindung(en):', > -'wio_ovpn_connected' =3D> 'verbunden seit', > +'wio_ovpn_connected' =3D> 'Verbunden seit', > 'wio_wan_up' =3D> 'VERBUNDEN', > 'wio_wan_down' =3D> 'GETRENNT', > 'wio_n2n' =3D> 'Netz-zu-Netz Verbindung', > @@ -96,17 +96,17 @@ > 'wio_hwaddress' =3D> 'HW-Adresse', > 'wio_iface' =3D> 'Schnittstelle', > 'wio_client_enable' =3D> 'Client aktivieren?', > -'wio_ping_send' =3D> '=C3=BCberpr=C3=BCfen per', > +'wio_ping_send' =3D> '=C3=9Cberpr=C3=BCfen per', > 'wio_link_open' =3D> 'Link =C3=B6ffnen per', > 'enable disable client' =3D> 'Client aktivieren oder deaktivieren', > 'wio_client_on' =3D> '=C3=9Cberwachung aktiviert (klicken, um zu deaktivie= ren)', > 'wio_client_off' =3D> '=C3=9Cberwachung deaktiviert (klicken, um zu aktivi= eren)', > 'wio_webinterface' =3D> 'LINK', > 'wio_webinterface_link' =3D> 'Link =C3=B6ffnen', > -'wio_ip' =3D> '=C3=BCberpr=C3=BCfen per IP aktiviert', > -'wio_fqdn' =3D> '=C3=BCberpr=C3=BCfen per FQDN aktiviert', > -'wio_ip_on' =3D> '=C3=BCberpr=C3=BCfen per IP aktiviert (klicken, um per F= QDN zu aktivieren)', > -'wio_fqdn_on' =3D> '=C3=BCberpr=C3=BCfen per FQDN aktiviert (klicken, um p= er IP zu aktivieren)', > +'wio_ip' =3D> '=C3=9Cberpr=C3=BCfen per IP aktiviert', > +'wio_fqdn' =3D> '=C3=9Cberpr=C3=BCfen per FQDN aktiviert', > +'wio_ip_on' =3D> '=C3=9Cberpr=C3=BCfen per IP aktiviert (klicken, um per F= QDN zu aktivieren)', > +'wio_fqdn_on' =3D> '=C3=9Cberpr=C3=BCfen per FQDN aktiviert (klicken, um p= er IP zu aktivieren)', > 'wio_client_add' =3D> 'Eingaben anwenden', > 'wio_config' =3D> 'Client(s) konfigurieren:', > 'wio_settings_msg' =3D> 'Einstellungen bearbeiten:', > @@ -117,8 +117,8 @@ > 'wio_add' =3D> 'Client hinzuf=C3=BCgen:', > 'wio_no_add' =3D> 'Client ist vorhanden', > 'wio_id' =3D> '#', > -'wio_online' =3D> 'online', > -'wio_offline' =3D> 'offline', > +'wio_online' =3D> 'Online', > +'wio_offline' =3D> 'Offline', > 'wio_status' =3D> 'WIO Client-Status', > 'wio_mail_style' =3D> 'WIO Client Statusmails versenden als', > 'wio_mail_smail' =3D> 'Sammelmail', > @@ -127,13 +127,13 @@ > 'wio_edit_set' =3D> 'Konfiguration', > 'wio_service' =3D> 'Service:', > 'wio_dyndns_success' =3D> 'DynDNS IP ermittelt und eingetragen!', > -'wio_remove_all' =3D> 'alle Clients l=C3=B6schen', > +'wio_remove_all' =3D> 'Alle Clients l=C3=B6schen', > 'wio_remove_all_hint' =3D> 'M=C3=B6chten Sie wirklich alle Clients l=C3=B6= schen?', > 'wio_remove_client' =3D> 'Client l=C3=B6schen', > 'wio_remove_client_hint' =3D> 'M=C3=B6chten Sie den Client wirklich l=C3= =B6schen?', > 'wio_arp_table_entries' =3D> 'Client aus der ARP-Tabelle hinzuf=C3=BCgen:', > -'wio_activ' =3D> 'aktiv', > -'wio_check' =3D> 'pr=C3=BCfen', > +'wio_activ' =3D> 'Aktiv', > +'wio_check' =3D> 'Pr=C3=BCfen', > 'wio_common_name' =3D> 'Remote Host / IP', > 'wio_msg_left' =3D> 'Das', > 'wio_msg_green' =3D> 'gr=C3=BCne', > @@ -142,7 +142,7 @@ > 'wio_msg_center' =3D> 'Netzwerk an', > 'wio_msg_right' =3D> 'wird durchsucht.', > 'wio_msg_hint' =3D> 'Einen Moment bitte ...', > -'wio_last_update' =3D> 'zuletzt aktualisiert', > +'wio_last_update' =3D> 'Zuletzt aktualisiert', > 'wio_disable_hint' =3D> 'Achtung! Es werden alle Einstellungen incl. der z= u =C3=BCberpr=C3=BCfenden Clients zur=C3=BCckgesetzt!', > 'wio_clientremark' =3D> 'Anmerkung anzeigen?', > 'wio_already_running' =3D> 'Die Pr=C3=BCfung wird bereits durchgef=C3=BChr= t!', > @@ -154,4 +154,6 @@ > 'wio_answer' =3D> 'Antwort', > 'wio_answer_time' =3D> 'Antwortzeit', > 'wio_scriptruntime' =3D> 'Scriptlaufzeit', > +'wio_show_table_off' =3D> 'Tabelle ausblenden', > +'wio_show_table_on' =3D> 'Tabelle einblenden', > ); > diff --git a/src/wio/lang/wio.en.pl b/src/wio/lang/wio.en.pl > index 52793b9..f981eee 100644 > --- a/src/wio/lang/wio.en.pl > +++ b/src/wio/lang/wio.en.pl > @@ -10,8 +10,8 @@ > 'wio err' =3D> 'Error', > 'wio warn' =3D> 'Warning', > 'wio_import_csv' =3D> 'CSV file:', > -'wio_import_hosts' =3D> 'hosts configuration (var/ipfire/main/hosts) ?', > -'wio_import_data' =3D> 'import settings for ', > +'wio_import_hosts' =3D> 'Hosts configuration (var/ipfire/main/hosts)?', > +'wio_import_data' =3D> 'Import settings for ', > 'wio_import_data1' =3D> ' correct:', > 'wio_import_data2' =3D> ' import:', > 'wio_import' =3D> 'Importing', > @@ -19,7 +19,7 @@ > 'wio_import_file' =3D> 'Import settings from:', > 'wio_import_info_csv' =3D> 'There are no new settings to import!', > 'wio settings' =3D> 'configuration:', > -'wio enabled' =3D> 'enable ?', > +'wio enabled' =3D> 'Enable?', > 'wio min' =3D> 'Minute(s)', > 'wio cron' =3D> 'Time interval for checking:', > 'wio_ovpn_cron' =3D> 'Time interval for checking the OpenVPN RW and IPSec = Status:', > @@ -34,12 +34,12 @@ > 'wio_host_empty' =3D> 'No Hostname was registered!', > 'wio_ip_exists' =3D> 'IP Address is already used.', > 'wio_ip_empty' =3D> 'No IP Address was registered!', > -'wio_import_fixleases' =3D> 'DHCP configuration (var/ipfire/dhcp/fixleases= ) ?', > +'wio_import_fixleases' =3D> 'DHCP configuration (var/ipfire/dhcp/fixleases= )?', > 'wio_import_leases' =3D> 'Import settings:', > 'wio network' =3D> 'Network', > -'wio_refresh' =3D> 'update all clients now', > +'wio_refresh' =3D> 'Update all clients now', > 'wio_fqdn_error' =3D> 'Invalid Fully Qualified Domain Name (FQDN)! Please = do not use special characters or blanks in the FQDN.', > -'wio_edit' =3D> 'change settings:', > +'wio_edit' =3D> 'Change settings:', > 'wio_dyndns' =3D> 'DynDNS', > 'wio_dyndns_hosts' =3D> 'DynDNS Name(s)', > 'wio_dyndns_refresh' =3D> 'DynDNS Host IP update', > @@ -55,85 +55,85 @@ > 'wio_msg' =3D> 'Condition of the examining Client(s) are updated ...', > 'wio_lanname' =3D> 'LAN Hostname', > 'wio_wanname' =3D> 'WAN Hostname', > -'wio_wancheck' =3D> 'connected since', > -'wio_sc_refresh' =3D> 'update client now', > -'wio_edit_settings' =3D> 'add client:', > -'wio_edit_client' =3D> 'edit client:', > -'wio_graphs' =3D> 'show graphs', > -'wio_no_graphs' =3D> 'no graphs available', > -'wio_graphs_stat' =3D> 'Diagramm for', > +'wio_wancheck' =3D> 'Connected since', > +'wio_sc_refresh' =3D> 'Update client now', > +'wio_edit_settings' =3D> 'Add client:', > +'wio_edit_client' =3D> 'Edit client:', > +'wio_graphs' =3D> 'Show graphs', > +'wio_no_graphs' =3D> 'No graphs available', > +'wio_graphs_stat' =3D> 'Diagram for', > 'wio_vpn_con' =3D> 'VPN - Connection(s):', > 'wio_wan_con' =3D> 'WAN - Connection:', > 'wio_clients' =3D> 'clients:', > 'wio click to disable' =3D> 'Activated', > 'wio click to enable' =3D> 'Deactivated', > -'wio_net_scan' =3D> 'Scan Network(s):', > -'wio_net_scan_vl' =3D> 'scan', > -'wio_net_scan_l' =3D> 'Network on', > +'wio_net_scan' =3D> 'Scan network(s):', > +'wio_net_scan_vl' =3D> 'Scan', > +'wio_net_scan_l' =3D> 'network on', > 'wio_net_scan_r' =3D> '', > 'wio_net_scan_green' =3D> 'green', > 'wio_net_scan_blue' =3D> 'blue', > 'wio_net_scan_orange' =3D> 'orange', > -'wio_net_scan_run' =3D> 'start', > -'wio_sort_host' =3D> 'sort Hostnames (FQDN)', > -'wio_sort_ip' =3D> 'sort IP-Adresses', > -'wio_logging' =3D> 'activate Logging (/var/log/messages) ?', > +'wio_net_scan_run' =3D> 'Start', > +'wio_sort_host' =3D> 'Sort Hostnames (FQDN)', > +'wio_sort_ip' =3D> 'Sort IP-Adresses', > +'wio_logging' =3D> 'Activate logging (/var/log/messages)?', > 'wio_no_image' =3D> 'NO STATUS', > 'wio_ovpn_con' =3D> 'OpenVPN - Connection(s):', > -'wio_ovpn_connected' =3D> 'connected since', > +'wio_ovpn_connected' =3D> 'Connected since', > 'wio_wan_up' =3D> 'CONNECTED', > 'wio_wan_down' =3D> 'NOT CONNECTED', > 'wio_n2n' =3D> 'Net-to-Net Connection', > 'wio_rw' =3D> 'Host-to-Net Connection', > -'wio_mailremark_enabled' =3D> 'Add Remark from client to mailbody ?', > -'wio_mail_online_on' =3D> 'online email enabled (click to disable)', > -'wio_mail_online_off' =3D> 'online email disabled (click to enable)', > -'wio_mail_offline_on' =3D> 'offline email enabled (click to disable)', > -'wio_mail_offline_off' =3D> 'offline emaildisabled (click to enable)', > -'wio_mail_online' =3D> 'enable or disable online email', > -'wio_mail_offline' =3D> 'enable or disable offline email', > -'wio_sendemail' =3D> 'send email', > +'wio_mailremark_enabled' =3D> 'Add Remark from client to mailbody?', > +'wio_mail_online_on' =3D> 'Online email enabled (click to disable)', > +'wio_mail_online_off' =3D> 'Online email disabled (click to enable)', > +'wio_mail_offline_on' =3D> 'Offline email enabled (click to disable)', > +'wio_mail_offline_off' =3D> 'Offline emaildisabled (click to enable)', > +'wio_mail_online' =3D> 'Enable or disable online email', > +'wio_mail_offline' =3D> 'Enable or disable offline email', > +'wio_sendemail' =3D> 'Send email', > 'wio_hwaddress' =3D> 'HW-Adresse', > 'wio_iface' =3D> 'Interface', > -'wio_client_enable' =3D> 'enable Host ?', > -'wio_ping_send' =3D> 'send ping to', > -'wio_link_open' =3D> 'open link via', > -'enable disable client' =3D> 'enable or disable client', > +'wio_client_enable' =3D> 'Enable Host?', > +'wio_ping_send' =3D> 'Send ping to', > +'wio_link_open' =3D> 'Open link via', > +'enable disable client' =3D> 'Enable or disable client', > 'wio_client_on' =3D> 'Client enabled (click to disable)', > 'wio_client_off' =3D> 'Client disabled (click to enable)', > 'wio_webinterface' =3D> 'LINK', > -'wio_webinterface_link' =3D> 'follow link', > -'wio_ip' =3D> 'send ping to IP enabled', > -'wio_fqdn' =3D> 'send ping to FQDN enabled', > -'wio_ip_on' =3D> 'send ping to IP enabled (click to enable FQDN)', > -'wio_fqdn_on' =3D> 'send ping to FQDN enabled (click to enable IP)', > -'wio_client_add' =3D> 'use settings', > -'wio_config' =3D> 'configurate Client(s):', > -'wio_settings_msg' =3D> 'configurate settings:', > +'wio_webinterface_link' =3D> 'Follow link', > +'wio_ip' =3D> 'Send ping to IP enabled', > +'wio_fqdn' =3D> 'Send ping to FQDN enabled', > +'wio_ip_on' =3D> 'Send ping to IP enabled (click to enable FQDN)', > +'wio_fqdn_on' =3D> 'Send ping to FQDN enabled (click to enable IP)', > +'wio_client_add' =3D> 'Use settings', > +'wio_config' =3D> 'Configurate Client(s):', > +'wio_settings_msg' =3D> 'Configurate settings:', > 'wio_settings_msg_hint' =3D> 'Here you have to set some values to get the = addon started.', > 'wio_sub' =3D> 'WIO Client-Status-Mail', > 'wio timeout' =3D> 'Ping Timeout:', > 'wio sec' =3D> 'Second(s)', > -'wio_add' =3D> 'add Client:', > +'wio_add' =3D> 'Add Client:', > 'wio_no_add' =3D> 'Client is available', > 'wio_id' =3D> '#', > -'wio_online' =3D> 'online', > -'wio_offline' =3D> 'offline', > +'wio_online' =3D> 'Online', > +'wio_offline' =3D> 'Offline', > 'wio_status' =3D> 'WIO Client-Status', > -'wio_mail_style' =3D> 'send WIO Client Statusmails as', > -'wio_mail_smail' =3D> 'collected mail', > -'wio_mail_email' =3D> 'single mails', > -'wio_mail_ovpnrw' =3D> 'enable OpenVPN RW and IPSec Statusmails ?', > +'wio_mail_style' =3D> 'Send WIO client statusmails as', > +'wio_mail_smail' =3D> 'Collected mail', > +'wio_mail_email' =3D> 'Single mails', > +'wio_mail_ovpnrw' =3D> 'Enable OpenVPN RW and IPSec Statusmails?', > 'wio_edit_set' =3D> 'Configuration', > 'wio_service' =3D> 'Service:', > 'wio_dyndns_success' =3D> 'DynDNS IP identified and registered!', > -'wio_remove_all' =3D> 'remove all clients', > +'wio_remove_all' =3D> 'Remove all clients', > 'wio_remove_all_hint' =3D> 'Are you sure to delete all the clients?', > -'wio_remove_client' =3D> 'remove client', > +'wio_remove_client' =3D> 'Remove client', > 'wio_remove_client_hint' =3D> 'Are you sure to delete the client?', > -'wio_arp_table_entries' =3D> 'add client from ARP-Table:', > -'wio_activ' =3D> 'activ', > -'wio_check' =3D> 'check', > +'wio_arp_table_entries' =3D> 'Add client from ARP-Table:', > +'wio_activ' =3D> 'Activ', > +'wio_check' =3D> 'Check', > 'wio_common_name' =3D> 'Remote Host/IP', > 'wio_msg_left' =3D> 'Searching on the', > 'wio_msg_green' =3D> 'green', > @@ -142,9 +142,9 @@ > 'wio_msg_center' =3D> 'Interface on', > 'wio_msg_right' =3D> 'is being examined.', > 'wio_msg_hint' =3D> 'One moment please ...', > -'wio_last_update' =3D> 'last update', > +'wio_last_update' =3D> 'Last update', > 'wio_disable_hint' =3D> 'Attention! It will reset all settings including t= he client to be checked!', > -'wio_clientremark' =3D> 'show remark?', > +'wio_clientremark' =3D> 'Show remark?', > 'wio_already_running' =3D> 'This check is already running!', > 'wio_error_function' =3D> 'This function is temporarily unavailable, becau= se in the background client states are being updated (active/inactive).', > 'wio_shutdown' =3D> 'Shutdown when all clients are "offline"?', > @@ -154,4 +154,6 @@ > 'wio_answer' =3D> 'Answer', > 'wio_answer_time' =3D> 'Response Time', > 'wio_scriptruntime' =3D> 'Script Execution Time', > +'wio_show_table_off' =3D> 'Show table', > +'wio_show_table_on' =3D> 'Hide table', > ); > diff --git a/src/wio/main/wio.pl b/src/wio/main/wio.pl > index 985900d..b846fea 100644 > --- a/src/wio/main/wio.pl > +++ b/src/wio/main/wio.pl > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wio.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen > +# Version: 2017/08/04 18:55:23 > # > # This wio.pl is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. > diff --git a/src/wio/main/wiovpn.pl b/src/wio/main/wiovpn.pl > index f22bd7a..c4c6b57 100644 > --- a/src/wio/main/wiovpn.pl > +++ b/src/wio/main/wiovpn.pl > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wioovpn.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen > +# Version: 2018/01/05 12:32:23 > # > # This wioovpn.pl is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. > @@ -93,8 +93,7 @@ else { > close (FILE); > } > =20 > -foreach (@ovpncfg) > -{ > +foreach (@ovpncfg) { > chomp; > =20 > if ( $_ =3D~ "server" ) { next; } > @@ -106,8 +105,7 @@ foreach (@ovpncfg) > unless ( grep (/$name/, @ovpncache) ) { push (@ovpncache, "$name,$remark,= $status\n"); } > } > =20 > -foreach (@ovpncache) > -{ > +foreach (@ovpncache) { > chomp; > =20 > ( $name, $remark, $status ) =3D split (/\,/, $_); > @@ -115,18 +113,16 @@ foreach (@ovpncache) > if ( grep (/,$name,/, @ovpncfg) ) { push (@ovpnarray, "$name,$remark,$sta= tus\n"); } > } > =20 > -foreach (@ovpnarray) > -{ > +foreach (@ovpnarray) { > chomp; > + > ( $name, $remark, $status ) =3D split (/\,/, $_); > =20 > if ( $name =3D~ m/_/ ) { $nameul =3D $name; } > else { ($nameul =3D $name) =3D~ s/ /_/g; } > =20 > - if ( grep (/$name/, @ovpnstatus) || grep (/$nameul/, @ovpnstatus) ) > - { > - foreach (@ovpnstatus) > - { > + if ( grep (/$name/, @ovpnstatus) || grep (/$nameul/, @ovpnstatus) ) { > + foreach (@ovpnstatus) { > chomp; > =20 > if ( $_ =3D~ "ROUTING TABLE" ) { last; } > @@ -151,8 +147,7 @@ foreach (@ovpnarray) > =20 > if ( $nameul eq $ovpnclt || $name eq $ovpnclt ) { push (@ovpnwrite, "$n= ame,$remark,$status\n"); } > =20 > - if ( $togglestat =3D=3D 1 && ($name eq $ovpnclt || $nameul eq $ovpnclt)= ) > - { > + if ( $togglestat =3D=3D 1 && ($name eq $ovpnclt || $nameul eq $ovpnclt)= ) { > $ovpnmailsub =3D "WIO OVPN - $name - $ovpnrwstatus - $now"; > $logmsg =3D "Client: WIO OVPN $name - IP: $ovpncltip - Status: $ovpnrw= status"; > $ovpnmailmsg =3D "Client : $name\nLogin : $ovpnrwlogin\nIP : $ovp= ncltip\nStatus : $ovpnrwstatus\n"; > @@ -177,11 +172,10 @@ foreach (@ovpnarray) > $logmsg =3D "Client: WIO OVPN $name - Status: $ovpnrwstatus"; > $ovpnmailmsg =3D "Client : $name\nLogout : $now\nStatus : $ovpnrwstatus= \n"; > =20 > - if ( $mailremark eq 'on' ) { > - $ovpnmailmsg .=3D "Remark : $remark\n\n"; > - } > + if ( $mailremark eq 'on' ) { $ovpnmailmsg .=3D "Remark : $remark\n\n"; } > =20 > &WIO::mailsender($ovpnmailsub, $ovpnmailmsg); > + > if ( $logging eq 'on' ) { &General::log("wio","$logmsg"); } > undef ($ovpnmailsub); > undef ($ovpnmailmsg); > @@ -220,11 +214,10 @@ else { > close (FILE); > } > =20 > -foreach (@vpncfg) > -{ > +foreach (@vpncfg) { > chomp; > =20 > - ( $activ, $name, $remark ) =3D (split (/\,/, $_))[1, 2, 25]; > + ( $activ, $name, $remark ) =3D (split (/\,/, $_))[1, 2, 26]; > =20 > if ( $remark eq 'off' ) { $remark =3D '-'; } > =20 > @@ -235,8 +228,7 @@ foreach (@vpncfg) > unless ( grep (/$name/, @vpncache) ) { push (@vpncache, "$name,$remark,$s= tatus\n"); } > } > =20 > -foreach (@vpncache) > -{ > +foreach (@vpncache) { > chomp; > =20 > ( $name, $remark, $status ) =3D split (/\,/, $_); > @@ -244,14 +236,12 @@ foreach (@vpncache) > if ( grep (/,$name,/, @vpncfg) ) { push (@vpnarray, "$name,$remark,$statu= s\n"); } > } > =20 > -foreach (@vpnarray) > -{ > +foreach (@vpnarray) { > chomp; > =09 > ( $name, $remark, $status ) =3D split (/\,/, $_); > =20 > - if ( grep (/$name\{.*INSTALLED/ , @vpnstatus) ) > - { > + if ( grep (/$name\{.*INSTALLED/ , @vpnstatus) ) { > $vpnrwstatus =3D "$Lang::tr{'wio up'}"; > $togglestat =3D ( $status ne 'on' ) ? 1 : 0; > $status =3D 'on'; > @@ -264,21 +254,24 @@ foreach (@vpnarray) > =20 > push (@vpnwrite, "$name,$remark,$status\n"); > =20 > - if ( $togglestat =3D=3D 1 ) > - { > + if ( $togglestat =3D=3D 1 ) { > $vpnmailsub =3D "WIO VPN - $name - $vpnrwstatus - $now"; > $logmsg =3D "Client: WIO VPN $name - Status: $vpnrwstatus $now"; > + $vpnmailmsg =3D "Client : $name\n"; > =20 > - if ( $mailremark eq 'on' ) { > - if ( $status eq 'on' ) { $vpnmailmsg =3D "Client : $name\nLogin : $now= \nStatus : $vpnrwstatus\nRemark : $remark\n"; } > - else { $vpnmailmsg =3D "Client : $name\nLogout : $now\nStatus : $vpnrws= tatus\nRemark : $remark\n"; } > + if ( $status eq 'on' ) { > + $vpnmailmsg .=3D "Login : $now\n"; > } > else { > - if ( $status eq 'on' ) { $vpnmailmsg =3D "Client : $name\nLogin : $now= \nStatus : $vpnrwstatus\n"; } > - else { $vpnmailmsg =3D "Client : $name\nLogout : $now\nStatus : $vpnrws= tatus\n"; } > + $vpnmailmsg .=3D "Logout : $now\n"; > } > =20 > + $vpnmailmsg .=3D "Status : $vpnrwstatus\n"; > + > + if ( $mailremark eq 'on' ) { $vpnmailmsg .=3D "Remark : $remark\n\n"; } > + > &WIO::mailsender($vpnmailsub, $vpnmailmsg); > + > if ( $logging eq 'on' ) { &General::log("wio","$logmsg"); } > undef ($vpnmailsub); > undef ($vpnmailmsg); > diff --git a/src/wio/wio-graphs.pl b/src/wio/wio-graphs.pl > index a5a58b4..af5c520 100644 > --- a/src/wio/wio-graphs.pl > +++ b/src/wio/wio-graphs.pl > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wio-graphs.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen > +# Version: 2017/07/11 21:32:23 > # > # This wio-graphs.pl is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. > diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl > index 2f23c1d..bbaf0bf 100644 > --- a/src/wio/wio-lib.pl > +++ b/src/wio/wio-lib.pl > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wio-lib.pl, v1.3.1 2017/07/11 21:31:16 sfeddersen > +# Version: 2017/07/11 21:32:23 > # > # This wio-lib.pl is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. > diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi > index 4fbf34a..8c43b04 100644 > --- a/src/wio/wio.cgi > +++ b/src/wio/wio.cgi > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen > +# Version: 2018/01/05 14:34:23 > # > # This wio.cgi is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. > @@ -105,6 +105,10 @@ my $nr =3D 0; > my $count =3D 0; > my $showcount =3D 0; > =20 > +my $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > +my $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > +my $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > + > my ( $infomessage, $errormessage, $importmessage, $message ) =3D ''; > =20 > my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndn= sip, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface, > @@ -153,6 +157,9 @@ $wiosettings{'MAILREMARK'} =3D 'off'; > $wiosettings{'MAILSTYLE'} =3D 'email'; > $wiosettings{'OVPNRWMAIL'} =3D 'off'; > $wiosettings{'SHUTDOWN'} =3D 'off'; > +$wiosettings{'WIOGUISHOWARPTABLE'} =3D ''; > +$wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D ''; > +$wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D ''; > =20 > &Header::getcgihash(\%wiosettings); > &Header::getcgihash(\%mainsettings); > @@ -219,7 +226,6 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_save'}.'2= ' ) { > $wiosettings{'SENDEMAILOFF'} =3D $wiosettings{"SENDEMAILOFF$count"}; > $wiosettings{'PINGMETHODE'} =3D $wiosettings{"PINGMETHODE$count"}; > $wiosettings{'ONLINE'} =3D $wiosettings{"ONLINE$count"}; > - $wiosettings{'WEBINTERFACE'} =3D $wiosettings{"WEBINTERFACE$count"}; > =20 > &validSave(); > =20 > @@ -272,6 +278,45 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_client_a= dd'} ) { > } > } > =20 > +## show / hide arptable > + > +if ($wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable') { > + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { > + $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'off'; > + $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > + } > + else { > + $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'on'; > + $arpbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; > + } > +} > + > +## show / hide clientimporttable > + > +if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'clientimport' ) { > + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { > + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'off'; > + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > + } > + else { > + $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} =3D 'on'; > + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; > + } > +} > + > +## show / hide networksearchtable > + > +if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) { > + if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { > + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'off'; > + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; > + } > + else { > + $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'on'; > + $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; > + } > +} > + > ## add arp client > =20 > if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) { > @@ -376,6 +421,7 @@ exit 0; > } > else { > $infomessage =3D "$Lang::tr{'wio_already_running'}"; > + unlink($onoffip); > } > =20 > } > @@ -842,7 +888,7 @@ if ( $debug ) { > print"infomessage: $infomessage
\n"; > =20 > &hrline(); > - =09 > + > my $wiodebug =3D 0; > foreach (sort keys %wiosettings) { > print"$_ =3D $wiosettings{$_}
\n"; > @@ -881,9 +927,9 @@ print" >
> > > - > + > > - > + > > > > @@ -953,7 +999,6 @@ print" > > > > - > "; > =20 > if ( $wiosettings{'SENDEMAIL'} eq 'on' ) { > @@ -1062,9 +1107,9 @@ if ( $wiosettings{'ENABLE'} eq 'on') { > =20 > print" >
 $Lang::tr{'wio_settings_msg'} $Lang::tr{'wio_settings_msg'}   
 
 
> - > - > - > + > + > + > > >
 $= Lang::tr{'wio_wan_con'} 
 $= Lang::tr{'wio_wan_con'} 
 
> @@ -1137,9 +1182,9 @@ if ( -e "$vpnpid" ) { > =20 > print" > > - > - > - > + > + > + > > >
 $= Lang::tr{'wio_vpn_con'} 
 $= Lang::tr{'wio_vpn_con'} 
 
> @@ -1219,9 +1264,9 @@ if ( -e "$ovpnpid" ) { > =20 > print" > > - > - > - > + > + > + > > >
 $= Lang::tr{'wio_ovpn_con'} 
 $= Lang::tr{'wio_ovpn_con'} 
 
> @@ -1346,9 +1391,9 @@ print" > =20 > print" > > - > - > - > + > + > + > > >
 $= Lang::tr{'wio_clients'} 
 $= Lang::tr{'wio_clients'} 
 
> @@ -1471,29 +1516,12 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ip= addresses[$a],'.'); > } > } > =20 > - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'P= PPOE') { > - my $redipadr =3D qx'ip addr | grep red0 | grep inet | awk "{print \$2}"= '; > - my @rednet =3D split ("/", $redipadr); > - chomp ($rednet[1]); > - my $red_netmask =3D General::iporsubtodec($rednet[1]); > - my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask= "); > - =09 > - if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netma= sk) ) { > - print"3D'$Lang::tr{'wio_red_lan'}'"; > - last SWITCH; > - } > - else { > - print"3D'$Lang::tr{'wio_unknown_lan'}'"; > - last SWITCH; > - } > - } > - > if ( -e "$vpnpid" ) { > foreach $key (keys(%vpnconfighash)) { > next unless ($vpnconfighash{$key}[3] eq 'net'); > =09 > my $convertip =3D &General::ipcidr2msk($vpnconfighash{$key}[11]); > - =09 > + > my @net =3D split ("/", $convertip); > =20 > $vpnn2nip =3D $net[0]; > @@ -1532,6 +1560,23 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipa= ddresses[$a],'.'); > =09 > } > } > + > + if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'P= PPOE') { > + my $redipadr =3D qx'ip addr | grep red0 | grep inet | awk "{print \$2}"= '; > + my @rednet =3D split ("/", $redipadr); > + chomp ($rednet[1]); > + my $red_netmask =3D General::iporsubtodec($rednet[1]); > + my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask= "); > + =09 > + if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netma= sk) ) { > + print"3D'$Lang::tr{'wio_red_lan'}'"; > + last SWITCH; > + } > + else { > + print"3D'$Lang::tr{'wio_unknown_lan'}'"; > + last SWITCH; > + } > + } > } > =20 > if ( $webinterface[$a] eq 'HTTP' ) { > @@ -1662,8 +1707,8 @@ if (! defined($errormessage) && $wiosettings{'ACTION'= } ne $Lang::tr{'edit'} ) { > print" > > > - > - > + > + > > > > @@ -1755,13 +1800,17 @@ if ( $wiosettings{'ENABLE'} eq 'on' && !$errormessa= ge && $wiosettings{'ACTION'} > print" >
 $Lang::tr{'wio_add'}  $Lang::tr{'wio_add'} 
 
> > - > - > + > + > > - >
 $Lang::tr{'wio_arp_table_entries'}  $Lang::tr{'wio_arp_table_entries'}
 
> +"; > + > +if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'on' ) { > =20 > +print" > > + > > > > @@ -1865,18 +1914,24 @@ $idarp++ > print" >
 
$Lang::tr{'wio_id'}$Lang::tr{'wio_hwaddr= ess'}
> "; > +} > =20 > &hrline(); > =20 > print" > > > - > - > + > + > > - >
 $Lang::tr{'wio_import_file'}  $Lang::tr{'wio_import_file'}
 
> +"; > + > +if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'on' ) { > + > +print" > > + > > > > @@ -1902,16 +1957,22 @@ print" > >
 
$Lang::tr{'wio_import_csv'} 
> "; > +} > =20 > &hrline; > =20 > print" > > > - > - > + > + > >
 $Lang::tr{'wio_net_scan'}  $Lang::tr{'wio_net_scan'}
> +"; > + > +if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'on' ) { > + > +print" > > > > @@ -1944,7 +2005,7 @@ print" >
 
> > "; > - > +} > &Header::closebox(); > } > =20 > diff --git a/src/wio/wiographs.cgi b/src/wio/wiographs.cgi > index 06b6946..e1a7475 100644 > --- a/src/wio/wiographs.cgi > +++ b/src/wio/wiographs.cgi > @@ -3,7 +3,7 @@ > ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2017 Stephan Feddersen = # > +# Copyright (C) 2017-2018 Stephan Feddersen = # > # All Rights Reserved. = # > # = # > # This program is free software: you can redistribute it and/or modify = # > @@ -21,7 +21,7 @@ > # = # > ##########################################################################= ##### > # > -# id: wiographs.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen > +# Version: 2017/08/27 14:07:23 There is no need to have any version numbers in the files. Git takes care of this for us. > # > # This wiographs.cgi is based on the Code from the IPCop WIO Addon > # and is extremly adapted to work with IPFire. Best, .Michael --===============5366593398202927244==--