Bug 13030

@Adolf: Are you happy to pick this one up?

Just to add some context, it's almost not visible for the user, it's purely an aesthetic issue so not really urgent I think if I may say something about that.

I've tried to find out where this bug could be located in the "ovpnmain.cgi" file and I think I've found the right lines:

[root@[REDACTED] cgi-bin]# grep -B1 -n "<td class'base'><b>" --color=always ovpnmain.cgi 
2712-	<tr>
2713:		<td class'base'><b>$Lang::tr{'misc-options'}</b></td>
--
2767-    <tr>
2768:	<td class'base'><b>$Lang::tr{'log-options'}</b></td>
--
4650-	<tr>
4651:		<td class'base'><b>$Lang::tr{'MTU settings'}</b></td>
--
4674-	<tr>
4675:		<td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>
--
5224-	<tr>
5225:		<td class'base'><b>$Lang::tr{'net config'}:</b></td>
--
5241-	<tr>
5242:		<td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>

From what I can see, it's just a missing "=" between "class" and "base" so this:

<td class'base'><b>

Should just be replaced by:

<td class='base'><b>

And that's all :D

I did the fix locally and it solved the rendering issue. I then ran this command to make sure that no similar issues still exists:

[root@[REDACTED] cgi-bin]# grep -B1 -n "class'" --color=always ovpnmain.cgi

Got empty output so I've tried again with this command:

[root@[REDACTED] cgi-bin]# grep -B1 -n "class='" --color=always ovpnmain.cgi

And it confirms that there is no other similar issues in the file.

To finish, I've ran the same command over the whole "cgi-bin" folder and there is no other similar issues:

[root@[REDACTED] cgi-bin]# grep -B1 -n "class'" --color=always -R


Hope to have helped you a little bit to track this bug :)

++

Jiab77

(In reply to Michael Tremer from comment #1)
> @Adolf: Are you happy to pick this one up?

No problems

Patch submitted to dev mailing list and patchwork.

https://lists.ipfire.org/pipermail/development/2023-January/015252.html
https://patchwork.ipfire.org/project/ipfire/patch/20230117140358.3564163-1-adolf.belka@ipfire.org/

(In reply to Adolf Belka from comment #4)
> Patch submitted to dev mailing list and patchwork.
> 
> https://lists.ipfire.org/pipermail/development/2023-January/015252.html
> https://patchwork.ipfire.org/project/ipfire/patch/20230117140358.3564163-1-
> adolf.belka@ipfire.org/

Awesome! Thanks a lot for your work on that!

https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=f99ed824205d8a585c02df4b3f0b4d2b55c2cb33

Core Update 173 Testing has been released

https://blog.ipfire.org/post/ipfire-2-27-core-update-173-is-available-for-testing

The updated ovpnmain.cgi was not installed as part of the Core Update 173 Testing. 

The file in my vm IPFire system does not have the changes and running grep on /var/log/pakfire/update-core-upgrade-173.log looking for ovpnmain does not find anything.

Thank you for flagging this. It is odd, since the OpenVPN CGI file _should_ be included in the update:

$ ipfire-2.x/config/rootfiles/core/173/filelists> grep ovpnmain.cgi * 2> /dev/null
files:srv/web/ipfire/cgi-bin/ovpnmain.cgi

For some reason, however, it is not. I'll investigate and report back.

Having build Core Update 173 locally on my machine from scratch again, it indeed looks like the files in ~/ipfire-2.x/config/rootfiles/core/173/filelists/files are not shipped, which also includes a variety of other things that need to go into the update.

At the moment, I don't know why this is.

@Michael: Could you have a look at this while I'm away, and investigate why "files" is ignored while assembling the Core Update? That would be highly appreciated - otherwise, I'll take care of it after I return.

Checked this again with (Build: master/deb11b3f) but the change did not get included.

Checked with Development Build: master/a98b79f8 and the fix was implemented with the install. So can verify the fix.

https://blog.ipfire.org/post/ipfire-2-27-core-update-173-released

That's awesome guys!

I've tested my own work before and after the update to core 173 and it worked perfectly so next time I'm working on my IPFire related project I'll remove the extra code that was added to deal with the now fixed issue :)