From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gQYcp30JKz30Sf for ; Wed, 27 May 2026 15:36:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gQYcp2ZR3z2xPV for ; Wed, 27 May 2026 15:36:26 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gQYcn1NChz23K for ; Wed, 27 May 2026 15:36:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1779896185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=XBAwonz3mcIUmIFoVfvftTTaVk50YIROAywXLdOzl5o=; b=Z6dtZb6S6HuBBqIXhxdrp6ZGmRxyXgtHynLMtBP5WjD5wsB5GGxSPgWQN+XuHqtm6QNiMP XxBoA6XeABsFk5Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1779896185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=XBAwonz3mcIUmIFoVfvftTTaVk50YIROAywXLdOzl5o=; b=SyngdMAE/6tcRe9/9riONdsV9Kh8pT/q6pEYh3ZicWEXEsSxduBJR4d7892ovLTSiTZNot 55TAplcVlH+3EiouMwKR0eUDfSO2xpOJzKPDuYx1gfDhay1GXRL3ghGNkpRXHe2V4IZ6jW MRbfLRgjE0QkozNmi1tQ0BvlXN7Z/HHGYEW/iLGR/tUGZ2S5BNNsnbCnh310C55Ur26hRU Fi5zUEkaojKx38ndrWZo74g94aJkx7aq/01JnWWgfdNFNvLgGDgWxA43s35Uk/AfVbPkrK s22qRrojAfo5JjcEbPvmPu1Ki+pjiFOIB/OS5L4U3aSVFiR3FpH1Bxg3mVlrHw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gQYcm64Whz2xKs; Wed, 27 May 2026 15:36:24 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b4ce17172bbe95777498d663a202d056ee45af44 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: eebf365a5145e16a85b5a49337ab496fed3fbe78 X-Git-Newrev: b4ce17172bbe95777498d663a202d056ee45af44 Message-Id: <4gQYcm64Whz2xKs@people01.haj.ipfire.org> Date: Wed, 27 May 2026 15:36:24 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 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 commit 88a825787408112cd34f60612898b572c67be154 Author: Michael Tremer 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 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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 < 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"; &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 <