From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephan Feddersen <sfeddersen@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] WIO - shutdown function removed, adjustments to IPsec status display
Date: Sun, 28 Jun 2020 12:47:54 +0200
Message-ID: <20200628104754.28809-1-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8522852405484024120=="
List-Id: <development.lists.ipfire.org>

--===============8522852405484024120==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

---
 src/wio/wio-lib.pl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl
index 1ff7cfacc..eb7b33e7d 100644
--- a/src/wio/wio-lib.pl
+++ b/src/wio/wio-lib.pl
@@ -21,14 +21,14 @@
 #                                                                           =
  #
 ############################################################################=
###
 #
-# Version: 2020/26/04 19:35:23
+# Version: 2020/05/25 19:39:23
 #
-# This wio-lib.pl is based on the Code from the IPCop WIO Addon
+# This wio-lib.pl is based on the code from the IPCop WIO Addon
 # and is extremly adapted to work with IPFire.
 #
 # Autor: Stephan Feddersen
 # Co-Autor: Alexander Marx
-# Co-Autor: Frank Mainz
+# Co-Autor: Frank Mainz (for some code for the IPCop WIO Addon)
 #
=20
 package WIO;
@@ -45,10 +45,9 @@ require '/var/ipfire/general-functions.pl';
 require '/var/ipfire/header.pl';
 require '/var/ipfire/lang.pl';
=20
-my $mailfile =3D "${General::swroot}/dma/mail.conf";
-my %mail =3D ();
+my %mailsettings =3D ();
=20
-&General::readhash($mailfile, \%mail);
+&General::readhash('/var/ipfire/dma/mail.conf', \%mailsettings);
=20
 ############################################################################=
################################################
=20
@@ -91,6 +90,14 @@ sub contime {
 		if ( $temp[1] eq 'minutes' ) {
 			$totalsecs =3D $temp[0] * 60;
 		}
+
+		if ( $temp[1] eq 'hours' ) {
+			$totalsecs =3D $temp[0] * 3600;
+		}
+
+		if ( $temp[1] eq 'days' ) {
+			$totalsecs =3D $temp[0] * 86400;
+		}
 	}
=20
 	if ( $vpn eq 'ovpn' ) {
@@ -147,8 +154,8 @@ sub mailsender {
 	my $msg =3D '';
=20
 	$msg =3D MIME::Lite->new(
-		From	=3D> $mail{'SENDER'},
-		To		=3D> $mail{'RECIPIENT'},
+		From	=3D> $mailsettings{'SENDER'},
+		To		=3D> $mailsettings{'RECIPIENT'},
 		Subject	=3D> $_[0],
 		Type	=3D> 'multipart/mixed'
 	);
--=20
2.17.1


--===============8522852405484024120==--