public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c91f74b988bf3395e5ddd36ed4b9a1d561d52a7a
Date: Wed, 10 Jan 2018 16:57:01 +0000	[thread overview]
Message-ID: <20180110165701.7B7871081BD8@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2876 bytes --]

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
       via  c91f74b988bf3395e5ddd36ed4b9a1d561d52a7a (commit)
       via  1b18943b15beaf228c0fa078c5ad2f9eca2bd958 (commit)
      from  7902d679eb78223c61525c4918912a141d134c0a (commit)

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 c91f74b988bf3395e5ddd36ed4b9a1d561d52a7a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 10 16:55:46 2018 +0000

    core118: Ship updated urlfilter.dat
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 1b18943b15beaf228c0fa078c5ad2f9eca2bd958
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Tue Dec 26 13:36:20 2017 +0100

    urlfilter.dat: Added Older/Newer links at top of page
    
    Hi,
    
    Triggered by:
    https://forum.ipfire.org/viewtopic.php?f=4&t=19998#p112930
    
    Added 'Older'/'Newer'-links for better page browsing.
    
    Best,
    Matthias
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/118/filelists/files | 1 +
 html/cgi-bin/logs.cgi/urlfilter.dat       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index bb02da3aa..4d1873530 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/captive.cgi
 srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat
 usr/sbin/updxlrator
 var/ipfire/langs
 var/ipfire/updatexlrator/bin/download
diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat
index ce642e1cb..221ed74ac 100644
--- a/html/cgi-bin/logs.cgi/urlfilter.dat
+++ b/html/cgi-bin/logs.cgi/urlfilter.dat
@@ -304,6 +304,10 @@ if ($cgiparams{'LOGTYPE'} eq 'urlfilter')
 
 if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @slice = reverse @slice; }
 
+if ($lines != 0) {
+
+&oldernewer();
+
 if ($lines)
 {
 
@@ -369,7 +373,7 @@ if ($lines)
 	print "</table><br>\n";
 
 }
-
+}
 &oldernewer();
 
 &Header::closebox();


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2018-01-10 16:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180110165701.7B7871081BD8@git01.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox