* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4ce17172bbe95777498d663a202d056ee45af44
@ 2026-05-27 15:36 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-05-27 15:36 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
discards eebf365a5145e16a85b5a49337ab496fed3fbe78 (commit)
discards 5cc28b941e85637adba68bea9bc2caa866678241 (commit)
via b4ce17172bbe95777498d663a202d056ee45af44 (commit)
via 88a825787408112cd34f60612898b572c67be154 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (eebf365a5145e16a85b5a49337ab496fed3fbe78)
\
N -- N -- N (b4ce17172bbe95777498d663a202d056ee45af44)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b4ce17172bbe95777498d663a202d056ee45af44
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed May 27 16:32:25 2026 +0100
core203: Ship the entire web UI again
Since we have now been adding so many files, it is easier to ship the
whole thing again.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 88a825787408112cd34f60612898b572c67be154
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed May 27 16:30:44 2026 +0100
header.pl: Drop cleanhtml()
This function was pretty much doing what escape() is doing, but had some
weird functions that were unclear and not used anyways.
Using escape() only makes the code slightly shorter and cleaner.
Suggested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/logs.cgi/ids.dat | 4 ++--
html/cgi-bin/logs.cgi/log.dat | 2 +-
html/cgi-bin/logs.cgi/proxylog.dat | 4 ++--
html/cgi-bin/logs.cgi/summary.dat | 2 +-
html/cgi-bin/media.cgi | 2 +-
html/cgi-bin/netother.cgi | 4 ++--
html/cgi-bin/ovpnmain.cgi | 14 +++++++-------
html/cgi-bin/qos.cgi | 2 +-
html/cgi-bin/remote.cgi | 4 ++--
html/cgi-bin/routing.cgi | 2 +-
html/cgi-bin/samba.cgi | 4 ++--
html/cgi-bin/time.cgi | 2 +-
html/cgi-bin/vpnmain.cgi | 18 +++++++++---------
html/cgi-bin/wakeonlan.cgi | 2 +-
html/cgi-bin/wio.cgi | 2 +-
html/cgi-bin/wireless.cgi | 4 ++--
16 files changed, 36 insertions(+), 36 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 3d5f93fa1..473b1700b 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -467,10 +467,10 @@ sub processevent
($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport,$sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a");
@refs = ();
$_ =~ m/:([0-9]{1,10})\] (.*) \[\*\*\]/;
- $title = &Header:escape($2);
+ $title = &Header::escape($2);
}
if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) {
- $classification = &Header:escape($1);
+ $classification = &Header::escape($1);
$priority = $2;
}
if ($_ =~ m/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}) \-\> ([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/) {
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index aa28ebca3..8604eb39f 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -404,7 +404,7 @@ foreach $_ (@log)
$day =~ tr / /0/;
my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
my $sec = $3;
- my $data = &Header:escape($4);
+ my $data = &Header::escape($4);
print <<END;
<tr>
diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat
index 07fc03d92..4bad231f2 100644
--- a/html/cgi-bin/logs.cgi/proxylog.dat
+++ b/html/cgi-bin/logs.cgi/proxylog.dat
@@ -465,8 +465,8 @@ foreach $_ (@log)
$url =~ /(^.{0,60})/;
my $part = $1;
unless (length($part) < 60) { $part = "${part}..."; }
- $url = &Header:escape($url);
- $part = &Header:escape($part);
+ $url = &Header::escape($url);
+ $part = &Header::escape($part);
if ($cgiparams{'DAY'}==0) { # full month
$DAYdt = sprintf ("%.02d/",$DAYdt);
} else {
diff --git a/html/cgi-bin/logs.cgi/summary.dat b/html/cgi-bin/logs.cgi/summary.dat
index cceb35228..2012e7d61 100644
--- a/html/cgi-bin/logs.cgi/summary.dat
+++ b/html/cgi-bin/logs.cgi/summary.dat
@@ -190,7 +190,7 @@ if(!$skip)
# box
while ( $content[0] =~ /^\s*$/ ) { shift @content; }
while ( $content[$#content] =~ /^\s*$/ ) { pop @content; }
- foreach $_ (@content) { $_ =~ s/\s*$//; print &Header:escape($_)."\n"; }
+ foreach $_ (@content) { $_ =~ s/\s*$//; print &Header::escape($_)."\n"; }
print "\n</pre>";
&Header::closebox();
} elsif (/^\s*#+ LogWatch [^#]+[)] #+\s*$/) {
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index b2eb36118..11ed2dc4c 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -202,7 +202,7 @@ sub diskbox {
}
my $smart = `/usr/local/bin/smartctrl $disk`;
- $smart = &Header:escape($smart);
+ $smart = &Header::escape($smart);
print <<END
<br /><input type="button" onClick="swapVisibility('smart_$disk')" value="$Lang::tr{'smart information'}" />
<div id='smart_$disk' style='display: none'>
diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
index d1093a641..1c95cfa25 100644
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -72,14 +72,14 @@ print "<pre>$output</pre>\n";
$output = `/sbin/ip route list table 220`;
if ( $output ) {
&Header::openbox('100%', 'left', $Lang::tr{'ipsec routing table entries'});
- $output = &Header:escape($output);
+ $output = &Header::escape($output);
print "<pre>$output</pre>\n";
&Header::closebox()
}
&Header::openbox('100%', 'left', $Lang::tr{'arp table entries'});
$output = `/sbin/ip neigh show`;
-$output = &Header:escape($output);
+$output = &Header::escape($output);
print "<pre>$output</pre>\n";
&Header::closebox();
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 6dc10a704..35f6031e6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1679,7 +1679,7 @@ END
}
}
- $casubject = &Header:escape($casubject);
+ $casubject = &Header::escape($casubject);
my $key = &General::findhasharraykey (\%cahash);
$cahash{$key}[0] = $cgiparams{'CA_NAME'};
@@ -1700,7 +1700,7 @@ END
&Header::openbigbox('100%', 'LEFT', '', $errormessage);
&Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:");
my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem");
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -1812,7 +1812,7 @@ END
&Header::openbox('100%', 'LEFT', "$Lang::tr{'host certificate'}:");
@output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/servercert.pem");
}
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -2611,7 +2611,7 @@ END
&Header::openbigbox('100%', 'LEFT', '', '');
&Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:");
my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem");
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -2676,7 +2676,7 @@ END
my @output = <FILE>;
close(FILE);
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -2699,7 +2699,7 @@ END
&Header::openbigbox('100%', 'LEFT', '', '');
&Header::openbox('100%', 'LEFT', "$Lang::tr{'crl'}:");
my @output = &General::system_output("/usr/bin/openssl", "crl", "-text", "-noout", "-in", "${General::swroot}/ovpn/crls/cacrl.pem");
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -3727,7 +3727,7 @@ if ($confighash{$cgiparams{'KEY'}}) {
$cgiparams{'TLSAUTH'} = $confighash{$cgiparams{'KEY'}}[41];
$cgiparams{'OTP_STATE'} = $confighash{$cgiparams{'KEY'}}[43];
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
- $cgiparams{'REMARK'} = &Header:escape($cgiparams{'REMARK'});
+ $cgiparams{'REMARK'} = &Header::escape($cgiparams{'REMARK'});
# CCD check iroute field and convert it to decimal
if ($cgiparams{'TYPE'} eq 'host') {
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 765342b5a..a44fc5e35 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -556,7 +556,7 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'status'} )
if ($qossettings{'ENABLED'} eq 'on'){
my $output = "";
my @output = &General::system_output("/usr/local/bin/qosctrl", "status");
- $output = &Header:escape(join("", @output));
+ $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
} else { print "$Lang::tr{'QoS not enabled'}"; }
&Header::closebox();
diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 04b13edf4..27c5cf5cb 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -258,8 +258,8 @@ sub viewkey
my @ssh_keygen = &General::system_output("/usr/bin/ssh-keygen", "-l", "-f", "$key");
my @temp = split(/ /, $ssh_keygen[0]);
- my $keysize = &Header:escape($temp[0]);
- my $fingerprint = &Header:escape($temp[1]);
+ my $keysize = &Header::escape($temp[0]);
+ my $fingerprint = &Header::escape($temp[1]);
print "<tr><td><code>$key</code></td><td align='center'>$name</td><td><code>$fingerprint</code></td><td align='center'>$keysize</td></tr>\n";
}
}
diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index 31e750fa1..5fe5d65a4 100644
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -388,7 +388,7 @@ END
&Header::closebox();
my $output = `/sbin/ip route show table static`;
-$output = &Header:escape($output);
+$output = &Header::escape($output);
if ( $output != "" ) {
&Header::openbox('100%', 'left', $Lang::tr{'routing table entries'});
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 36c4a62ff..10d73742e 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -153,7 +153,7 @@ if ($errormessage)
}
if ($message) {
- $message = &Header:escape($message);
+ $message = &Header::escape($message);
$message =~ s/\n/<br>/g;
&Header::openbox('100%', 'left', $Lang::tr{'messages'});
@@ -653,7 +653,7 @@ END
&Header::openbox('100%', 'left', $Lang::tr{'status'});
my $status = qx(/usr/local/bin/sambactrl smbstatus);
-$status = &Header:escape($status);
+$status = &Header::escape($status);
print <<END;
<small>
diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 2f83b33cd..36cd8986c 100644
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -161,7 +161,7 @@ ERROR:
# To enter an ' into a pushbutton solution is to use ' in it's definition
# but returned value when pressed is ' not the code. Cleanhtml recode the ' to enable comparison.
-$timesettings{'ACTION'} = &Header:escape ($timesettings{'ACTION'});
+$timesettings{'ACTION'} = &Header::escape ($timesettings{'ACTION'});
if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
{
&General::system('/usr/bin/touch', "/var/lock/time/settimenow");
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index fc88c9886..944adb4b5 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -677,7 +677,7 @@ END
my $key = &General::findhasharraykey (\%cahash);
$cahash{$key}[0] = $cgiparams{'CA_NAME'};
- $cahash{$key}[1] = &Header:escape(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
+ $cahash{$key}[1] = &Header::escape(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
&General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
&General::system('/usr/local/bin/ipsecctrl', 'R');
@@ -697,7 +697,7 @@ END
&Header::openbigbox('100%', 'left', '', '');
&Header::openbox('100%', 'left', "$Lang::tr{'ca certificate'}:");
my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem");
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/vpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -824,7 +824,7 @@ END
&Header::openbox('100%', 'left', "$Lang::tr{'host certificate'}:");
@output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/certs/hostcert.pem");
}
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/vpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -1520,7 +1520,7 @@ END
&Header::openbigbox('100%', 'left', '', '');
&Header::openbox('100%', 'left', "$Lang::tr{'cert'}:");
my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem");
- my $output = &Header:escape(join("", @output));
+ my $output = &Header::escape(join("", @output));
print "<pre>$output</pre>\n";
&Header::closebox();
print "<div align='center'><a href='/cgi-bin/vpnmain.cgi'>$Lang::tr{'back'}</a></div>";
@@ -1724,7 +1724,7 @@ END
}
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
- $cgiparams{'REMARK'} = &Header:escape($cgiparams{'REMARK'});
+ $cgiparams{'REMARK'} = &Header::escape($cgiparams{'REMARK'});
if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
$errormessage = $Lang::tr{'connection type is invalid'};
goto VPNCONF_ERROR;
@@ -1973,7 +1973,7 @@ END
if (!$errormessage) {
&General::log("charon", "Moving cacert...");
#If CA have new subject, add it to our list of CA
- my $casubject = &Header:escape(getsubjectfromcert ('/tmp/newcacert'));
+ my $casubject = &Header::escape(getsubjectfromcert ('/tmp/newcacert'));
my @names;
foreach my $x (keys %cahash) {
$casubject='' if ($cahash{$x}[1] eq $casubject);
@@ -1988,7 +1988,7 @@ END
my $idx=0;
while (grep(/Imported-$idx/, @names) ) {$idx++};
$cgiparams{'CA_NAME'}="Imported-$idx";
- $cgiparams{'CERT_NAME'}=&Header:escape(getCNfromcert ('/tmp/newhostcert'));
+ $cgiparams{'CERT_NAME'}=&Header::escape(getCNfromcert ('/tmp/newhostcert'));
unless(move("/tmp/newcacert", "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem")) {
$errormessage = "$Lang::tr{'certificate file move failed'}: $!";
@@ -3584,7 +3584,7 @@ EOF
my $col1="bgcolor='$color{'color22'}'";
my $col2="bgcolor='$color{'color20'}'";
if (-f "${General::swroot}/ca/cacert.pem") {
- my $casubject = &Header:escape(getsubjectfromcert ("${General::swroot}/ca/cacert.pem"));
+ my $casubject = &Header::escape(getsubjectfromcert ("${General::swroot}/ca/cacert.pem"));
print <<END
<tr>
<td class='base' $col1>$Lang::tr{'root certificate'}</td>
@@ -3616,7 +3616,7 @@ END
}
if (-f "${General::swroot}/certs/hostcert.pem") {
- my $hostsubject = &Header:escape(getsubjectfromcert ("${General::swroot}/certs/hostcert.pem"));
+ my $hostsubject = &Header::escape(getsubjectfromcert ("${General::swroot}/certs/hostcert.pem"));
print <<END
<tr>
diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi
index d2dfbabf0..00720123b 100644
--- a/html/cgi-bin/wakeonlan.cgi
+++ b/html/cgi-bin/wakeonlan.cgi
@@ -307,7 +307,7 @@ for $i ( 0 .. $#wol_devices )
{
my $wol_mac = $wol_devices[$i]{'MAC'};
my $wol_iface = $wol_devices[$i]{'IFace'};
- my $wol_txt = &Header:escape($wol_devices[$i]{'Comment'});
+ my $wol_txt = &Header::escape($wol_devices[$i]{'Comment'});
if ( (($cgiparams{'ACTION'} eq 'edit') || ($cgiparams{'ACTION'} eq 'update')) && ($i == $cgiparams{'ID'}) )
{
diff --git a/html/cgi-bin/wio.cgi b/html/cgi-bin/wio.cgi
index cce9252c6..a3a7b071e 100644
--- a/html/cgi-bin/wio.cgi
+++ b/html/cgi-bin/wio.cgi
@@ -1852,7 +1852,7 @@ print"
";
$output = `/sbin/ip neigh list`;
-$output = &Header:escape($output);
+$output = &Header::escape($output);
my $arpcnt = 0;
diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi
index 5c15a161c..40d7f1434 100644
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -331,7 +331,7 @@ foreach my $line (@current)
if ($temp[3] eq 'on') { $gif = 'on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};}
else { $gif = 'off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'};}
- my $remark = &Header:escape($temp[4]);
+ my $remark = &Header::escape($temp[4]);
my $col="";
if ($cgiparams{'ACTION'} eq 'edit' && $cgiparams{'ID'} eq $id) {
@@ -462,7 +462,7 @@ END
my $id = 0;
foreach my $key (sort blueleasesort keys %entries) {
- my $hostname = &Header:escape($entries{$key}->{HOSTNAME});
+ my $hostname = &Header::escape($entries{$key}->{HOSTNAME});
my $col="";
if ($id % 2) {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-05-27 15:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-27 15:36 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4ce17172bbe95777498d663a202d056ee45af44 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox