From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] WIO: fix the bugs reported in the forum
Date: Tue, 29 Aug 2017 14:39:59 +0100
Message-ID: <1504013999.2479.29.camel@ipfire.org>
In-Reply-To: <1503837713-9760-1-git-send-email-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8892907291659421806=="
List-Id: <development.lists.ipfire.org>

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

Hello Stephan,

thanks for sending in these fixed.

I merged this patch because I do not want to delay the release, but it
would be better next time to split individual bug fixes into individual
patches.

Right now I am not even sure what you tried to fix here which makes
reviewing a patch difficult.

On Sun, 2017-08-27 at 14:41 +0200, Stephan Feddersen wrote:
> ---
>  lfs/wio                 |  4 ++--
>  src/paks/wio/install.sh |  1 +
>  src/wio/wio.cgi         | 25 ++++++++++++++++++++-----
>  src/wio/wiographs.cgi   |  2 +-
>  4 files changed, 24 insertions(+), 8 deletions(-)
>=20
> diff --git a/lfs/wio b/lfs/wio
> index 25726cd..d70b12b 100644
> --- a/lfs/wio
> +++ b/lfs/wio
> @@ -15,7 +15,7 @@ THISAPP    =3D wio-$(VER)
>  DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>  TARGET     =3D $(DIR_INFO)/$(THISAPP)
>  PROG       =3D wio
> -PAK_VER    =3D 2
> +PAK_VER    =3D 3
> =20
>  ##########################################################################=
#####
>  # Top-level Rules
> @@ -58,7 +58,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/
>  	install -v -m 655 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/
>  	install -v -m 655 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/
> -	install -v -m 655 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
> +	install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
>  	install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/b=
ackup/addons/includes/wio
> =20
>  	@rm -rf $(DIR_APP)
> diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh
> index f46ae35..5c7705b 100644
> --- a/src/paks/wio/install.sh
> +++ b/src/paks/wio/install.sh
> @@ -30,6 +30,7 @@ chown -R nobody.nobody /var/log/rrd/wio
>  chown -R nobody.nobody /var/log/wio
>  chown root.nobody /usr/local/bin/wioscan
>  chown root.nobody /usr/local/bin/wiohelper
> +chown nobody.nobody /var/ipfire/menu.d/EX-wio.menu
> =20
>  chmod 4750 /usr/local/bin/wioscan
>  chmod 4750 /usr/local/bin/wiohelper
> diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
> index aa471e6..4fbf34a 100644
> --- a/src/wio/wio.cgi
> +++ b/src/wio/wio.cgi
> @@ -21,7 +21,7 @@
>  #                                                                         =
    #
>  ##########################################################################=
#####
>  #
> -# id: wio.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
> +# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
>  #
>  # This wio.cgi is based on the Code from the IPCop WIO Addon
>  # and is extremly adapted to work with IPFire.

There is also no need to have any revisioning in the files since Git is
taking care of this.

> @@ -917,7 +917,10 @@ print"
>  	<td align=3D'left'><select size=3D'1' name=3D'CRON' size=3D'5'>
>  ";
> =20
> -for ($i=3D5; $i<=3D60; $i+=3D5) { printf("<option %s>%02s</option>\n",$sel=
ected{'CRON'}{$i},$i); }
> +for ($i=3D5; $i<=3D60; $i+=3D5) {
> +	$_ =3D sprintf("%02s",$i);
> +	print "<option $selected{'CRON'}{$_}>$_</option>\n";
> +}
> =20
>  print"
>  	</select>&nbsp;$Lang::tr{'wio min'}</td>
> @@ -929,7 +932,10 @@ print"
>  	<td align=3D'left'><select size=3D'1' name=3D'TIMEOUT' size=3D'5'>
>  ";
> =20
> -for ($i=3D1; $i<=3D15; $i++) { printf("<option %s>%02s</option>\n",$select=
ed{'TIMEOUT'}{$i},$i); }
> +for ($i=3D1; $i<=3D15; $i++) {
> +	$_ =3D sprintf("%02s",$i);
> +	print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n";
> +}
> =20
>  print"=09
>  	</select>&nbsp;$Lang::tr{'wio sec'}</td>
> @@ -980,7 +986,10 @@ print"
>  	<td align=3D'left'><select size=3D'1' name=3D'OVPNCRON' size=3D'5'>
>  ";
> =20
> -for ($i=3D1; $i<=3D15; $i++) { printf("<option %s>%02s</option>\n",$select=
ed{'OVPNCRON'}{$i},$i); }
> +for ($i=3D1; $i<=3D15; $i++) {
> +	$_ =3D sprintf("%02s",$i);
> +	print "<option $selected{'OVPNCRON'}{$_}>$_</option>\n";
> +}
> =20
>  print"
>  	</select>&nbsp;$Lang::tr{'wio min'}</td>
> @@ -1947,7 +1956,13 @@ print"
>  <table border=3D'0' width=3D'100%' bordercolor=3D'$Header::bordercolour' c=
ellspacing=3D'0' cellpadding=3D'0' style=3D'border-collapse: collapse'>
>  <tr bgcolor=3D'$color{'color22'}'>
>  	<td colspan=3D'2' align=3D'right'></td>
> -	<td width=3D'10%' align=3D'right'><form method=3D'post' action=3D'/cgi-bi=
n/logs.cgi/log.dat' enctype=3D'multipart/form-data'><input type=3D'hidden' na=
me=3D'SECTION' value=3D'wio' /><input type=3D'submit' name=3D'SUBMIT' value=
=3D'$Lang::tr{'system logs'}' /></form></td>
> +";
> +
> +if ( $wiosettings{'LOGGING'} eq 'on' ) {
> +	print"<td width=3D'10%' align=3D'right'><form method=3D'post' action=3D'/=
cgi-bin/logs.cgi/log.dat' enctype=3D'multipart/form-data'><input type=3D'hidd=
en' name=3D'SECTION' value=3D'wio' /><input type=3D'submit' name=3D'SUBMIT' v=
alue=3D'$Lang::tr{'system logs'}' /></form></td>";
> +}
> +
> +print"
>  	<td width=3D'10%' align=3D'right'><form method=3D'post' action=3D'$ENV{'S=
CRIPT_NAME'}' enctype=3D'multipart/form-data'><input type=3D'hidden' name=3D'=
ACTION' value=3D'$Lang::tr{'edit'}1' /><input type=3D'submit' name=3D'SUBMIT'=
 value=3D'$Lang::tr{'wio_edit_set'}' /></form></td>
>  </tr>
>  </table>
> diff --git a/src/wio/wiographs.cgi b/src/wio/wiographs.cgi
> index 7370237..06b6946 100644
> --- a/src/wio/wiographs.cgi
> +++ b/src/wio/wiographs.cgi
> @@ -21,7 +21,7 @@
>  #                                                                         =
    #
>  ##########################################################################=
#####
>  #
> -# id: wiographs.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
> +# id: wiographs.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
>  #
>  # This wiographs.cgi is based on the Code from the IPCop WIO Addon
>  # and is extremly adapted to work with IPFire.

Same as above. Nothing has actually changed here any ways.

Best,
-Michael

--===============8892907291659421806==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxtbGJxOEFDZ2tRZ0hudy8yK1EKQ1FkK2t3Ly9iOG5nRjI5TFdW
Y2lPYW5nTWJzOWE0UmxIOW9FZHBWN25KQW0wd3NRc0ZqeUd0Umx4RjQ4Ujk4NgpMRWg5alRmZ0Zt
S0NNRzBDa0Zrcmh0SXI0OW91VlBZdWljcHhYSTU4RlNRbE5ZYWdJTHBJZDVIWkVCSEkwS2M2CmFU
dEgwT0tQR2paOFdvOU0yUjNBV0V3c0ZwRm5pQi9yQ0pLa2NPR0FLd2dSNGpuNHU1ZlRZY3hwaFNS
UU13bEcKanVCU1dYNHZFaUd1Vm00WHVqTUEyNHNEbkxONmZZb1ZDSEtXdU5qZTFEbVZuR0dsY2xF
ZGl0UzFpbm5CaXZDdQo5Z2tlZk00NWN1Mm5vczNTL25ES2FEaEloTHVhWC9WMndnTHBNR1lSTm4w
RDZMc2Y5NmVrOUR4Y1F5WjNxUFRoCmxkSHhDTmhMZU44QVN6Nm9yd0UzNVJtbFNHa1hUWnhta0l5
T25vOVNVZXlDVmlsSEFBSTNEWkJteFpiN0Ixc3MKWmpBcGt3WGVFM2hpWE5ySnJZWXc1VGcrVUdQ
VXVmMDFjSnRBcnJOdWZyTW5OUVFTckNjMGtnN1IwYkhXdzdBdworOWQzdU5VeHpZYm10ZXprcnE5
YjROeTh4aFR5T0RBcGQ3QllyY0xmTHVWQ25zN2JmWmRSaVA0czhheGlmbmJICkcrcEJSQnpyMFJX
dE1YN0JUT2g1THAwUy9WTEpTQlBWZ3FJZStCSElQcW95d21USzE1eW4zNng4MVZPVEoyU1UKajBv
WUxPeWVqWXhHREZRMkRJak0zeXI0MHdNQWZBYnpTdjFtR29BT016TEZBNkdieEJHRlZPbnZzVlR5
Z0tmQQp5RUkzM01aUkxZUUVNa1FBU0p2MVprbk1pdlBQUEtsMXVlUEZ0ajBEQy9tcnNYUWtBR289
Cj1naUF4Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============8892907291659421806==--