static-copy: suppress extra output when saving pages

paste-image: new action includes javascript
Markdown: fixed number of tests
2017-07-24 10:35:18 +02:00 · 2017-07-14 13:42:12 +02:00 · 2017-07-07 23:19:31 +02:00 · 2017-07-07 20:52:35 +02:00 · 2017-07-07 17:11:04 +02:00 · 2017-06-16 20:01:11 +02:00
206 changed files with 2373 additions and 2485 deletions
--- a/8
+++ b/8
@@ -22,10 +22,10 @@ clean:
 	prove t/setup.pl

 release:
-	perl stuff/release ~/oddmuse.org
+	perl stuff/release ~/oddmuse.org/releases 2.3.3

 build/wiki.pl: wiki.pl
-	perl -lne "s/(\\\$$q->a\(\{-href=>'http:\/\/www.oddmuse.org\/'\}, 'Oddmuse'\))/\\\$$q->a({-href=>'http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@
+	perl -lne "s/(\\\$$q->a\(\{-href=>'https:\/\/www.oddmuse.org\/'\}, 'Oddmuse'\))/\\\$$q->a({-href=>'https:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@

 build/%-utf8.pl: modules/translations/%-utf8.pl
 	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
@@ -36,8 +36,8 @@ build/national-%.pl: modules/translations/national-%.pl
 build/month-names-%.pl: modules/translations/month-names-%.pl
 	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@

-# from: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
-#   to: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27
+# from: https://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
+#   to: https://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27

 build/%.pl: modules/%.pl
 	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, undef, '$(VERSION_NO)')/; print" < $< > $@
--- a/README.creole
+++ b/README.creole
@@ -23,12 +23,21 @@ usermod -a -G sudo alex
 Now you can login as {{{alex}}} and do everything else using {{{sudo}}}.

 You need to copy wiki.pl into your cgi-bin directory, and you need to
-make the script executable.
+make the script executable. You might also have to change its owner to
+an appropriate user on your system.

 {{{
 sudo wget -O /usr/lib/cgi-bin/wiki.pl \
  http://git.savannah.gnu.org/cgit/oddmuse.git/plain/wiki.pl
 sudo chmod +x /usr/lib/cgi-bin/wiki.pl
+sudo chown www-data.www-data /usr/lib/cgi-bin/wiki.pl
+}}}
+
+If you're on SUSE, the user might not be {{{www-data}}} but
+{{{wwwrun}}} without appropriate group:
+
+{{{
+sudo chown wwwrun.root /usr/lib/cgi-bin/wiki.pl
 }}}

 You should be able to test it right now! Visit
@@ -85,7 +94,7 @@ Enjoy your wiki experience.
 Visit https://www.oddmuse.org/ to learn more about the translation
 files and modules that are part of this package.

-== Apache
+== Checking the Apache Setup

 If you think this information doesn't work for you, here are some things
 to check.
@@ -119,7 +128,7 @@ The default site is configured in
 sudo a2ensite default
 }}}

-This file also lists the directories we've used in out instructions
+This file also lists the directories we've used in our instructions
 above.

 {{{
@@ -136,6 +145,32 @@ simply restart it all:
 sudo service apache2 graceful
 }}}

+== Using just Perl
+
+You can use Mojolicious as your web server. There is a simple
+##server.pl## which you can use. Here's how you might start it:
+
+{{{
+mkdir ~/oddmuse
+WikiDataDir=$HOME/oddmuse perl server.pl daemon
+}}}
+
+This makes the server available on {{{http://localhost:3000/wiki}}}.
+
+If it works for you, feel free to upgrade to Hypnotoad.
+
+{{{
+WikiDataDir=$HOME/oddmuse hypnotoad server.pl
+}}}
+
+Note: Hypnotoad uses a different default port. The above makes the
+server available on {{{http://localhost:8080/wiki}}}. Hypnotoad will
+keep forking new processes. To stop it, use the {{{-s}}} flag.
+
+{{{
+hypnotoad -s server.pl
+}}}
+
 == License

 Permission is granted to copy, distribute and/or modify this document
--- a/contrib/campaignwiki/delete.sh
+++ b/contrib/campaignwiki/delete.sh
@@ -7,7 +7,7 @@ fi
 username=$1
 wiki=$2

-for p in $(curl "https://campaignwiki.org/wiki/$wiki?action=index;raw=1"); do
+for p in $(curl --silent "https://campaignwiki.org/wiki/$wiki?action=index;raw=1"); do
    echo "Deleting: $p"
    curl -F frodo=1 -F "title=$p" -F text=DeletedPage -F summary=Deleted -F username="$username" "https://campaignwiki.org/wiki/$wiki"
    sleep 5
--- a/contrib/localnames-server.pl
+++ b/contrib/localnames-server.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
--- a/contrib/oddmuse-curl.el
+++ b/contrib/oddmuse-curl.el
--- a/contrib/vc-oddmuse.el
+++ b/contrib/vc-oddmuse.el
@@ -1,165 +0,0 @@
-;;; vc-oddmuse.el -- add VC support to oddmuse-curl
-;; 
-;; Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
-;; 
-;; Latest version:
-;;   http://git.savannah.gnu.org/cgit/oddmuse.git/plain/contrib/vc-oddmuse.el
-;; Discussion, feedback:
-;;   http://www.emacswiki.org/cgi-bin/wiki/OddmuseCurl
-;; 
-;; This program is free software: you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by the Free
-;; Software Foundation, either version 3 of the License, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-;; more details.
-;; 
-;; You should have received a copy of the GNU General Public License along
-;; with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Add the following to your init file:
-;;
-;; (add-to-list 'vc-handled-backends 'oddmuse)
-
-(add-to-list 'vc-handled-backends 'oddmuse)
-
-(require 'oddmuse-curl)
-(require 'diff)
-
-(defun vc-oddmuse-revision-granularity () 'file)
-
-(defun vc-oddmuse-registered (file)
-  "Handle files in `oddmuse-directory'."
-  (string-match (concat "^" (expand-file-name oddmuse-directory))
-		(file-name-directory file)))
-
-(defun vc-oddmuse-state (file)
-  "Return the current version control state of FILE.
-For a list of possible values, see `vc-state'."
-  ;; Avoid downloading the current version from the wiki and comparing
-  ;; the text: Too much traffic!
-  'edited)
-
-(defun vc-oddmuse-working-revision (file)
-  "The current revision based on `oddmuse-revisions'."
-  (with-oddmuse-file
-      (oddmuse-get-latest-revision wiki pagename)))
-
-(defun vc-oddmuse-checkout-model (files)
-  "No locking."
-  'implicit)
-
-(defun vc-oddmuse-create-repo (file)
-  (error "You cannot create Oddmuse wikis using Emacs."))
-
-(defun vc-oddmuse-register (files &optional rev comment)
-  "This always works.")
-
-(defvar vc-oddmuse-log-command
-  (concat "curl --silent %w"
-	  " --form action=rc"
-	  " --form showedit=1"
-	  " --form all=1"
-	  " --form from=1"
-	  " --form raw=1"
-	  " --form match='%r'")
-  "Command to use for publishing index pages.
-It must print the page to stdout.
-
-See `oddmuse-format-command' for the formatting options.")
-
-(defun vc-oddmuse-print-log (files buffer &optional shortlog start-revision limit)
-  "Load complete recent changes for the files."
-  ;; Derive `oddmuse-wiki' from the first file
-  (with-oddmuse-file (car files)
-    ;; The wiki expects a Perl regular expression!
-    (let ((regexp (concat "^(" (mapconcat 'file-name-nondirectory files "|") ")$")))
-      (oddmuse-run "Getting recent changes" vc-oddmuse-log-command nil nil buffer)))
-  (with-current-buffer buffer
-    (oddmuse-render-rss3))
-  'limit-unsupported)
-
-(defun vc-oddmuse-log-outgoing ()
-  (error "This is not supported."))
-
-(defun vc-oddmuse-log-incoming ()
-  (error "This is not supported."))
-
-(defvar vc-oddmuse-get-revision-command
-  (concat "curl --silent"
-	  " --form action=browse"
-	  " --form id=%t"
-	  " --form revision=%v"
-	  " --form raw=1"
-	  " '%w'")
-  "Command to use to get older revisions of a page.
-It must print the page to stdout.
-
-%?  '?' character
-%w  URL of the wiki as provided by `oddmuse-wikis'
-%t  Page title as provided by `oddmuse-page-name'
-%v  Revision to retrieve as provided by `oddmuse-revision'")
-
-(defun oddmuse-revision-filename (rev)
-  "Return filename for revision REV.
-This uses `oddmuse-directory', `wiki' and `pagename' as bound by
-`with-oddmuse-file'."
-  (concat oddmuse-directory
-	  "/" wiki
-	  "/" pagename
-	  ".~" rev "~"))
-
-(defun vc-oddmuse-diff (files &optional rev1 rev2 buffer)
-  "Report the differences for FILES."
-  (setq buffer (or buffer (get-buffer-create "*vc-diff*")))
-  (dolist (file files)
-    (with-oddmuse-file file
-      (setq rev1 (or rev1 (oddmuse-get-latest-revision wiki pagename)))
-      (dolist (rev (list rev1 rev2))
-	(when (and rev (not (file-readable-p (oddmuse-revision-filename rev))))
-	  (let* ((oddmuse-revision rev)
-		 (command vc-oddmuse-get-revision-command)
-		 (filename (oddmuse-revision-filename rev)))
-	    (with-temp-buffer
-	      (oddmuse-run
-	       (concat "Downloading revision " rev)
-	       command wiki pagename)
-	      (write-file filename)))))
-      (diff-no-select
-       (if rev1 (oddmuse-revision-filename rev1) file)
-       (if rev2 (oddmuse-revision-filename rev2) file)
-       nil
-       (vc-switches 'oddmuse 'diff)
-       buffer))))
-
-(defun vc-oddmuse-revert (file &optional contents-done)
-  "Revert FILE back to the wiki revision.
-If optional arg CONTENTS-DONE is non-nil, then nothing needs to
-be done, as the contents of FILE have already been reverted from
-a version backup."
-  (unless contents-done
-    (with-oddmuse-file file
-      (let ((command (oddmuse-format-command vc-oddmuse-get-revision-command)))
-	(with-temp-buffer
-	  (oddmuse-run "Loading" command wiki pagename)
-	  (write-file file))))))
-
-(defun vc-oddmuse-checkin (files rev comment)
-  "Commit changes in FILES to this backend.
-REV is a historical artifact and should be ignored.  COMMENT is
-used as a check-in comment."
-  (dolist (file files)
-    (with-oddmuse-file file
-      (let* ((summary comment)
-	     (command (oddmuse-format-command oddmuse-post-command))
-	     (buf (get-buffer-create " *oddmuse-response*")))
-	(with-temp-buffer
-	  (insert-file-contents file)
-	  (oddmuse-run "Posting" command wiki pagename buf t 302))))))
-
-(provide 'vc-oddmuse)
--- a/css/light.css
+++ b/css/light.css
@@ -27,6 +27,10 @@ textarea, pre, code, tt {
 		font-family: Times, serif;
 		font-size:10pt;
 	}
+	/* Printing from Firefox */
+	svg {
+	    transform: translate(-1.5cm, -1cm);
+	}
 }

 /* iPhone */
@@ -49,7 +53,8 @@ textarea, pre, code, tt {
 /* hide the buttons but don't use display:none because of
   http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form
 .header input[type="submit"] { position: absolute; visibility: hidden; } */
-.header input { width: 5em; font-size: 80%; }
+.header input { width: 6em; font-size: 80%; }
+.header input[type="checkbox"] { width: 1em; }
 .footer { clear:both; font-size: 90%; }
 .content input { font-size: 80%; line-height: 125%; }

--- a/modules/404handler.pl
+++ b/modules/404handler.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 package OddMuse;

--- a/modules/admin.pl
+++ b/modules/admin.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/age.pl
+++ b/modules/age.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/aggregate.pl
+++ b/modules/aggregate.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/agree-disagree.pl
+++ b/modules/agree-disagree.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/all.pl
+++ b/modules/all.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/antispam.pl
+++ b/modules/antispam.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/archive.pl
+++ b/modules/archive.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/autolock.pl
+++ b/modules/autolock.pl
@@ -206,18 +206,17 @@ except where noted.

 Copyleft 2008 by B.w.Curry <http://www.raiazome.com>.

-This file is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.

-This file is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this file; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 =cut
--- a/modules/backlinkage.pl
+++ b/modules/backlinkage.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Grab MLDBM at http://search.cpan.org/dist/MLDBM/lib/MLDBM.pm
 # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
--- a/modules/ban-contributors.pl
+++ b/modules/ban-contributors.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2013-2016  Alex Schroeder <alex@gnu.org>

 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -21,11 +21,12 @@ compared to the list of regular expressions on the C<BannedHosts> page
 (see C<$BannedHosts>). If the contributor is already banned, this is
 mentioned. If the contributor is not banned, you'll see a button
 allowing you to ban him or her immediately. If you click the button,
-the IP or hostname will be added to the C<BannedHosts> page for you.
+the IP will be added to the C<BannedHosts> page for you.

 =cut
 use strict;
 use v5.10;
+
 our ($q, $Now, %Page, $OpenPageName, %Action, $UrlPattern, $BannedContent, $BannedHosts, @MyAdminCode);

 AddModuleDescription('ban-contributors.pl', 'Ban Contributors Extension');
@@ -56,17 +57,18 @@ sub IsItBanned {
 sub DoBanHosts {
  my $id = shift;
  my $content = GetParam('content', '');
-  my $host = GetParam('host', '');
+  my $range = GetParam('range', '');
+  my $regexp = GetParam('regexp', '');
  if ($content) {
    SetParam('text', GetPageContent($BannedContent)
 	     . $content . " # " . CalcDay($Now) . " "
 	     . NormalToFree($id) . "\n");
    SetParam('summary', NormalToFree($id));
    DoPost($BannedContent);
-  } elsif ($host) {
-    $host =~ s/\./\\./g;
+  } elsif ($regexp) {
    SetParam('text', GetPageContent($BannedHosts)
-	     . "^" . $host . " # " . CalcDay($Now) . " "
+	     . $regexp . " # " . CalcDay($Now)
+	     . " $range "
 	     . NormalToFree($id) . "\n");
    SetParam('summary', NormalToFree($id));
    DoPost($BannedHosts);
@@ -94,10 +96,14 @@ sub DoBanHosts {
      if (IsItBanned($_, \@regexps)) {
 	print $q->p(Ts("%s is banned", $name));
      } else {
+	my ($start, $end) = BanContributors::get_range($_);
+	$range = "[$start - $end]";
+	$name .= " " . $range;
 	print GetFormStart(undef, 'get', 'ban'),
 	  GetHiddenValue('action', 'ban'),
 	  GetHiddenValue('id', $id),
-	  GetHiddenValue('host', $_),
+	  GetHiddenValue('range', $range),
+	  GetHiddenValue('regexp', BanContributors::get_regexp_ip($start, $end)),
 	  GetHiddenValue('recent_edit', 'on'),
 	  $q->p($name, $q->submit(T('Ban!'))), $q->end_form();
      }
@@ -158,3 +164,95 @@ sub NewBanContributorsWriteRcLog {
  };
  return OldBanContributorsWriteRcLog(@_);
 }
+
+package BanContributors;
+use Net::Whois::Parser qw/parse_whois/;
+
+sub get_range {
+  my $ip = shift;
+  my $response = parse_whois(domain => $ip);
+  my ($start, $end);
+  my $re = '(?:[0-9]{1,3}\.){3}[0-9]{1,3}';
+  my ($start, $end) = $response->{inetnum} =~ /($re) *- *($re)/;
+  return $start, $end;
+}
+
+sub get_groups {
+  my ($from, $to) = @_;
+  my @groups;
+  if ($from < 10) {
+    my $to = $to >= 10 ? 9 : $to;
+    push(@groups, [$from, $to]);
+    $from = $to + 1;
+  }
+  while ($from < $to) {
+    my $to = int($from/100) < int($to/100) ? $from + 99 - $from % 100 : $to;
+    if ($from % 10) {
+      push(@groups, [$from, $from + 9 - $from % 10]);
+      $from += 10 - $from % 10;
+    }
+    if (int($from/10) < int($to/10)) {
+      if ($to % 10 == 9) {
+	push(@groups, [$from, $to]);
+	$from = 1 + $to;
+      } else {
+	push(@groups, [$from, $to - 1 - $to % 10]);
+	$from = $to - $to % 10;
+      }
+    } else {
+      push(@groups, [$from - $from % 10, $to]);
+      last;
+    }
+    if ($to % 10 != 9) {
+      push(@groups, [$from, $to]);
+      $from = 1 + $to; # jump from 99 to 100
+    }
+  }
+  return \@groups;
+}
+
+sub get_regexp_range {
+  my @chars;
+  for my $group (@{get_groups(@_)}) {
+    my ($from, $to) = @$group;
+    my $char;
+    for (my $i = length($from); $i >= 1; $i--) {
+      if (substr($from, - $i, 1) eq substr($to, - $i, 1)) {
+	$char .= substr($from, - $i, 1);
+      } else {
+	$char .= '[' . substr($from, - $i, 1) . '-' . substr($to, - $i, 1). ']';
+      }
+    }
+    push(@chars, $char);
+  }
+  return join('|', @chars);
+}
+
+sub get_regexp_ip {
+  my ($from, $to) = @_;
+  my @start = split(/\./, $from);
+  my @end = split(/\./, $to);
+  my $regexp = "^";
+  for my $i (0 .. 3) {
+    if ($start[$i] eq $end[$i]) {
+      $regexp .= $start[$i];
+    } elsif ($start[$i] eq '0' and $end[$i] eq '255') {
+      last;
+    } elsif ($start[$i + 1] > 0) {
+      $regexp .= '(' . $start[$i] . '\.('
+	  . get_regexp_range($start[$i + 1], '255') . ')|'
+	  . get_regexp_range($start[$i] + 1, $end[$i + 1]) . ')';
+      $regexp .= '\.';
+      last;
+    } else {
+      $regexp .= '(' . get_regexp_range($start[$i], $end[$i]) . ')$';
+      last;
+    }
+    $regexp .= '\.' if $i < 3;
+  }
+  return $regexp;
+}
+
+# this is required in case we concatenate other modules to this one
+package OddMuse;
+
--- a/modules/banned-regexps.pl
+++ b/modules/banned-regexps.pl
@@ -45,7 +45,8 @@ This extension works with logbannedcontent.pl.

 =cut

-our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile);
+our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile,
+    $FullUrlPattern);
 our ($BannedRegexps);

 $BannedRegexps = 'BannedRegexps';
@@ -61,6 +62,8 @@ push(@MyInitVariables, sub {

 sub RegexpNewBannedContent {
  my $str = shift;
+  # remove URLs as they are controlled by $BannedContent
+  $str =~ s/$FullUrlPattern//g;
  my $rule = RegexpOldBannedContent($str, @_);
  if (not $rule) {
    foreach (split(/\n/, GetPageContent($BannedRegexps))) {
--- a/modules/blockquote.pl
+++ b/modules/blockquote.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/calendar.pl
+++ b/modules/calendar.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
@@ -26,6 +23,7 @@ our ($q, %Page, %Action, $Now, $OpenPageName, $CollectingJournal, $FreeLinkPatte
 our ($CalendarOnEveryPage, $CalAsTable, $CalStartMonday);

 $CalendarOnEveryPage = 0;   # 1=on every page is a month-div situated in the header, use css to control
+                            # 2=this month and the previous month; 3=this, previous and next month
 $CalAsTable = 0;            # 0=every month-div is "free", 1=every month-div is caught in a table, use css to control
 $CalStartMonday = 0;        # 0=week starts with Su, 1=week starts with Mo

@@ -37,8 +35,22 @@ sub NewCalendarGetHeader {
  return $header unless $CalendarOnEveryPage;
  my $action = GetParam('action', 'browse');
  return $header if grep(/^$action$/, ('calendar', 'edit'));
-  my $cal = Cal();
-  $header =~ s/<div class="header">/$cal<div class="header">/;
+  my $cal;
+  my ($sec, $min, $hour, $mday, $mon, $year) = localtime($Now);
+  $year += 1900;
+  # $mon is 0 based and thus good for previous month
+  if ($mon < 1) { $year -= 1; $mon += 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage > 1;
+  # the current month
+  $mon += 1;
+  if ($mon > 12) { $year += 1; $mon -= 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage;
+  # the next month
+  $mon += 1;
+  if ($mon > 12) { $year += 1; $mon -= 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage > 2;
+  # insert calendars before header div
+  $header =~ s!<div class="header">!<div class="cal">$cal</div><div class="header">!;
  return $header;
 }

@@ -88,7 +100,7 @@ sub Cal {
 			    $year_text,  'local collection year'));
    }
  }}e;
-  return "<div class=\"cal month\"><pre>$cal</pre></div>";
+  return "<div class=\"month\"><pre>$cal</pre></div>";
 }

 $Action{collect} = \&DoCollect;
@@ -129,7 +141,7 @@ sub CalendarRule {
    my $oldpos = pos;
    Clean(CloseHtmlEnvironments());
    Dirty($1);
-    print Cal($2, $3);
+    print $q->div({-class => 'cal'}, Cal($2, $3));
    pos = $oldpos;
    return AddHtmlEnvironment('p');
  } elsif (/\G(month:([+-]\d\d?))/cg
@@ -144,7 +156,7 @@ sub CalendarRule {
    $mon += 1 + $delta;
    while ($mon < 1) { $year -= 1; $mon += 12; };
    while ($mon > 12) { $year += 1; $mon -= 12; };
-    print Cal($year, $mon, undef, $id);
+    print $q->div({-class => 'cal'}, Cal($year, $mon, undef, $id));
    pos = $oldpos;
    return AddHtmlEnvironment('p');
  }
--- a/modules/canonical.pl
+++ b/modules/canonical.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/cart.pl
+++ b/modules/cart.pl
@@ -2,7 +2,7 @@

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 use strict;
 use v5.10;
 use utf8;
--- a/modules/checkbox.pl
+++ b/modules/checkbox.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/clustermap.pl
+++ b/modules/clustermap.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/commentcount.pl
+++ b/modules/commentcount.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/compilation.pl
+++ b/modules/compilation.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/context.pl
+++ b/modules/context.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
--- a/modules/creationdate.pl
+++ b/modules/creationdate.pl
@@ -1,34 +1,35 @@
 # Copyright (C) 2005  Fletcher T. Penney <fletcher@freeshell.org>
+# Copyright (C) 2016  Alex Schroeder <alex@gnu.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-#
-# This module stores additional information about a page when it is
-# first created:
-#		created = the date the page is FIRST saved
-#		originalAuthor = the username that first created a page
-#
-# Of course, you can customize this to store more information
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+=head1 Creation Date Extension
+
+This module stores additional information about a page when it is first created:
+
+=over
+=item C<created> is the date the page is first saved
+=item C<originalAuthor> is the username that first created a page
+=back
+=cut

 use strict;
 use v5.10;

 AddModuleDescription('creationdate.pl', 'CreationDate Module');

-our (%Page, $Now);
+our (%Page, $Now, @MyAdminCode, %Action, $q, $FS, $RcOldFile, $RcFile);

 *CreationDateOldOpenPage = \&OpenPage;
 *OpenPage = \&CreationDateOpenPage;
@@ -39,3 +40,45 @@ sub CreationDateOpenPage{
 	$Page{originalAuthor} = GetParam('username','') unless $Page{originalAuthor}
 		or $Page{revision};
 }
+
+# Allow administrators to add the 'created' item to page files, based on rc log
+# files.
+
+push(@MyAdminCode, \&CreationDateMenu);
+
+sub CreationDateMenu {
+  my ($id, $menuref, $restref) = @_;
+  push(@$menuref,
+       ScriptLink('action=add-creation-date',
+		  T('Add creation date to page files'),
+		  'creationdate')) if UserIsAdmin();
+}
+
+$Action{'add-creation-date'} = \&AddCreationDate;
+
+sub AddCreationDate {
+  print GetHeader('', T('Add creation date to page files'));
+  print $q->start_div({-class=>'creationdate'});
+  print '<ul>';
+  RequestLockOrError();
+  for my $file ($RcOldFile, $RcFile) {
+    open(my $F, '<:encoding(UTF-8)', encode_utf8($file)) or next;
+    while (my $line = <$F>) {
+      chomp($line);
+      my ($ts, $id, $minor, $summary, $host, $username, $revision)
+	  = split(/$FS/, $line);
+      next unless $revision == 1;
+      print $q->li(NormalToFree($id));
+      OpenPage($id);
+      next unless $Page{revision}; # skip if page no longer exists
+      next if $Page{created} and $Page{originalAuthor};
+      $Page{created} = $ts unless $Page{created};
+      $Page{originalAuthor} = $username unless $Page{originalAuthor};
+      SavePage();
+    }
+  }
+  ReleaseLock();
+  print '</ul>';
+  print $q->end_div();
+  PrintFooter();
+}
--- a/modules/crumbs.pl
+++ b/modules/crumbs.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/csv.pl
+++ b/modules/csv.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/despam.pl
+++ b/modules/despam.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/doubleclick.pl
+++ b/modules/doubleclick.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This module offers the user the additional possibility to
 # edit a page by double-clicking on it. The user must have
--- a/modules/download.pl
+++ b/modules/download.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/dynlogo.pl
+++ b/modules/dynlogo.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Makes the wiki logo depend on the current date.
 #
--- a/modules/edit-assist.pl
+++ b/modules/edit-assist.pl
@@ -1,6 +1,6 @@
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -9,10 +9,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/faq.pl
+++ b/modules/faq.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This module creates a list of all questions on the page, e.g.
 # for a faq. It does so by recognizing all lines that begin with
--- a/modules/fckeditor.pl
+++ b/modules/fckeditor.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA,
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/flickrgallery.pl
+++ b/modules/flickrgallery.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/git.pl
+++ b/modules/git.pl
@@ -196,7 +196,7 @@ sub GitCleanup {
      my $name = decode_utf8($file);
      next if $file eq '.git' or $file eq '.' or $file eq '..' or $IndexHash{$name};
      print $q->p("Deleting left over file $name");
-      Unlink("$GitRepo/$file") or ReportError("cannot delete $GitRepo/$name: $!");
+      Unlink("$GitRepo/$file") or print $q->p("Cannot delete $GitRepo/$name: $!");
    }
    closedir DIR;
    # write all the files again, just to be sure
--- a/modules/google-search.pl
+++ b/modules/google-search.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/gotobar.pl
+++ b/modules/gotobar.pl
@@ -1,4 +1,5 @@
 # Copyright (C) 2006-2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2016  Ingo Belka
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -25,6 +26,9 @@ our ($GotobarName);

 $GotobarName = 'GotoBar';

+our ($GotobarSetHome, $GotobarSetRC);
+# 0 does set home-link and/or rc-link automatically, 1 doesn't
+
 # do this later so that the user can customize $GotobarName
 push(@MyInitVariables, \&GotobarInit);

@@ -53,10 +57,10 @@ sub GotobarInit {
 	# is the list of recent changes.
 	$count++;
 	if ($count == 1) {
-	  $HomePage = FreeToNormal($page);
-	} elsif ($count == 2) {
-	  $RCName = FreeToNormal($page);
-	}
+        unless ($GotobarSetHome) {$HomePage = FreeToNormal($page)};
+    } elsif ($count == 2) {
+        unless ($GotobarSetRC) {$RCName = FreeToNormal($page);}
+    }
      }
    }
  }
--- a/modules/grep.pl
+++ b/modules/grep.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/header-and-footer-templates.pl
+++ b/modules/header-and-footer-templates.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/headers.pl
+++ b/modules/headers.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/headlines.pl
+++ b/modules/headlines.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/hiddenpages.pl
+++ b/modules/hiddenpages.pl
@@ -5,7 +5,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -14,10 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This module offers the possibility to restrict viewing of "hidden"
 # pages to only editors or admins. The restriction may be based
--- a/modules/html-template.pl
+++ b/modules/html-template.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/html-uploads.pl
+++ b/modules/html-uploads.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/htmllinks.pl
+++ b/modules/htmllinks.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/image.pl
+++ b/modules/image.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/index.pl
+++ b/modules/index.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/irc.pl
+++ b/modules/irc.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/lang.pl
+++ b/modules/lang.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # In your CSS file, use something like this, for example:

--- a/modules/linebreaks.pl
+++ b/modules/linebreaks.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/links.pl
+++ b/modules/links.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/linktagmap.pl
+++ b/modules/linktagmap.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,13 +11,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-#
-# Based on code of tagmap.pl module by Fletcher T. Penney
-# and searchtags.pl module by Brock Wilcox
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 use strict;
 use v5.10;

--- a/modules/listtags.pl
+++ b/modules/listtags.pl
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 Weakish Jiang <weakish@gmail.com>
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/live-templates.pl
+++ b/modules/live-templates.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/login.pl
+++ b/modules/login.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/logout.pl
+++ b/modules/logout.pl
@@ -266,18 +266,17 @@ except where noted.

 Copyleft 2008 by B.w.Curry <http://www.raiazome.com>.

-This file is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.

-This file is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this file; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 =cut
--- a/modules/markdown-rule.pl
+++ b/modules/markdown-rule.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2014–2017  Alex Schroeder <alex@gnu.org>

 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,7 +18,7 @@ use v5.10;

 AddModuleDescription('markdown-rule.pl', 'Markdown Rule Extension');

-our ($q, $bol, %RuleOrder, @MyRules, $UrlProtocols, $FullUrlPattern);
+our ($q, $bol, %RuleOrder, @MyRules, $UrlProtocols, $FullUrlPattern, @HtmlStack);

 push(@MyRules, \&MarkdownRule);
 # Since we want this package to be a simple add-on, we try and avoid
@@ -31,16 +31,20 @@ $RuleOrder{\&MarkdownRule} = 200;
 # https://help.github.com/articles/github-flavored-markdown

 sub MarkdownRule {
+  # \escape
+  if (m/\G\\([-#>*`=])/cg) {
+    return $1;
+  }
  # atx headers
-  if ($bol and m~\G(\s*\n)*(#{1,6})[ \t]*~cg) {
+  elsif ($bol and m~\G(\s*\n)*(#{1,6})[ \t]*~cg) {
    my $header_depth = length($2);
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment("h" . $header_depth);
  }
  # end atx header at a newline
  elsif ((InElement('h1') or InElement('h2') or InElement('h3') or
-	  InElement('h4') or InElement('h5') or InElement('h6'))
-	 and m/\G\n/cg) {
+  	  InElement('h4') or InElement('h5') or InElement('h6'))
+  	 and m/\G\n/cg) {
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment("p");
  }
@@ -56,33 +60,71 @@ sub MarkdownRule {
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment('blockquote');
  }
+  # ``` = code
+  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/cgs) {
+    return CloseHtmlEnvironments() . $q->pre($1)
+      . AddHtmlEnvironment("p");
+  }
+  # ` = code
+  elsif (m/\G`([^`].*?)`/cg) {
+    return $q->code($1);
+  }
  # ***bold and italic***
  elsif (not InElement('strong') and not InElement('em') and m/\G\*\*\*/cg) {
    return AddHtmlEnvironment('em') . AddHtmlEnvironment('strong');
  }
+  elsif (InElement('strong') and InElement('em') and m/\G\*\*\*/cg) {
+    return CloseHtmlEnvironment('strong') . CloseHtmlEnvironment('em');
+  }
  # **bold**
  elsif (m/\G\*\*/cg) {
    return AddOrCloseHtmlEnvironment('strong');
  }
  # *italic*
-  elsif (m/\G\*/cg) {
-    return AddOrCloseHtmlEnvironment('em');
+  elsif ($bol and m/\G\*/cg or m/\G(?<=\P{Word})\*/cg) {
+    return AddHtmlEnvironment('em');
+  }
+  elsif (InElement('em') and m/\G\*/cg) {
+    return CloseHtmlEnvironment('em');
  }
  # ~~strikethrough~~ (deleted)
  elsif (m/\G~~/cg) {
    return AddOrCloseHtmlEnvironment('del');
  }
-  # - bullet list
-  elsif ($bol and m/\G(\s*\n)*-[ \t]*/cg
-	   or InElement('li') and m/\G(\s*\n)+-[ \t]*/cg) {
-    return CloseHtmlEnvironment('li')
-      . OpenHtmlEnvironment('ul',1) . AddHtmlEnvironment('li');
-  }
-  # 1. numbered list
-  elsif ($bol and m/\G(\s*\n)*\d+\.[ \t]*/cg
-	   or InElement('li') and m/\G(\s*\n)+\d+\.[ \t]*/cg) {
-    return CloseHtmlEnvironment('li')
-      . OpenHtmlEnvironment('ol',1) . AddHtmlEnvironment('li');
+  # indented lists = nested lists
+  elsif ($bol and m/\G(\s*\n)*()([*-]|\d+\.)[ \t]*/cg
+      or InElement('li') && m/\G(\s*\n)+( *)([*-]|\d+\.)[ \t]*/cg) {
+    my $nesting_goal = int(length($2)/4) + 1;
+    my $tag = ($3 eq '*' or $3 eq '-') ? 'ul' : 'ol';
+    my $nesting_current = 0;
+    my @nesting = grep(/^[uo]l$/, @HtmlStack);
+    my $html = CloseHtmlEnvironmentUntil('li'); # but don't close li element
+    # warn "\@nesting is (@nesting)\n";
+    # warn "    goal is $nesting_goal\n";
+    # warn "     tag is $3 > $tag\n";
+    while (@nesting > $nesting_goal) {
+      $html .= CloseHtmlEnvironment(pop(@nesting));
+      # warn "      pop\n";
+    }
+    # if have the correct nesting level, but the wrong type, close it
+    if (@nesting == $nesting_goal
+	and $nesting[$#nesting] ne $tag) {
+      $html .= CloseHtmlEnvironment(pop(@nesting));
+      # warn "   switch\n";
+    }
+    # now add a list of the appropriate type
+    if (@nesting < $nesting_goal) {
+      $html .= AddHtmlEnvironment($tag);
+      # warn "       add $tag\n";
+    }
+    # and a new list item
+    if (InElement('li')) {
+      $html .= CloseHtmlEnvironmentUntil($nesting[$#nesting]);
+      # warn "     close li\n";
+    }
+    $html .= AddHtmlEnvironment('li');
+      # warn "       add li\n";
+    return $html;
  }
  # beginning of a table
  elsif ($bol and !InElement('table') and m/\G\|/cg) {
@@ -124,11 +166,6 @@ sub MarkdownRule {
    }
    return OpenHtmlEnvironment('pre',1) . $str; # always level 1
  }
-  # ``` = code
-  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/cgs) {
-    return CloseHtmlEnvironments() . $q->pre($1)
-      . AddHtmlEnvironment("p");
-  }
  # [an example](http://example.com/ "Title")
  elsif (m/\G\[(.+?)\]\($FullUrlPattern(\s+"(.+?)")?\)/cg) {
    my ($text, $url, $title) = ($1, $2, $4);
@@ -141,3 +178,31 @@ sub MarkdownRule {
  }
  return;
 }
+
+push(@MyRules, \&MarkdownExtraRule);
+
+sub MarkdownExtraRule {
+  # __italic underline__
+  if (m/\G__/cg) {
+    return AddOrCloseHtmlEnvironment('em', 'style="font-style: normal; text-decoration: underline"');
+  }
+  # _underline_
+  elsif ($bol and m/\G_/cg or m/\G(?<=\P{Word})_/cg) {
+    return AddHtmlEnvironment('em', 'style="font-style: normal; text-decoration: underline"');
+  }
+  elsif (InElement('em', 'style="font-style: normal; text-decoration: underline"') and m/\G_/cg) {
+    return CloseHtmlEnvironment('em');
+  }
+  # //italic//
+  elsif (m/\G\/\//cg) {
+    return AddOrCloseHtmlEnvironment('em');
+  }
+  # /italic/
+  elsif ($bol and m/\G\//cg or m/\G(?<=\P{Word})\//cg) {
+    return AddHtmlEnvironment('em');
+  }
+  elsif (InElement('em') and m/\G\//cg) {
+    return CloseHtmlEnvironment('em');
+  }
+  return;
+}
--- a/modules/moin.pl
+++ b/modules/moin.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/namespaces.pl
+++ b/modules/namespaces.pl
@@ -80,6 +80,21 @@ $NamespaceSlashing = 0;   # affects : decoding NamespaceRcLines
 # variables (eg. localnames.pl)
 unshift(@MyInitVariables, \&NamespacesInitVariables);

+sub GetNamespace {
+  my $ns = GetParam('ns', '');
+  if (not $ns and $UsePathInfo) {
+    my $path_info = decode_utf8($q->path_info());
+    # make sure ordinary page names are not matched!
+    if ($path_info =~ m|^/($InterSitePattern)(/.*)?|
+	and ($2 or $q->keywords or NamespaceRequiredByParameter())) {
+      $ns = $1;
+    }
+  }
+  ReportError(Ts('%s is not a legal name for a namespace', $ns))
+    if $ns and $ns !~ m/^($InterSitePattern)$/;
+  return $ns;
+}
+
 sub NamespacesInitVariables {
  %Namespaces = ();
  # Do this before changing the $DataDir and $ScriptName
@@ -96,17 +111,7 @@ sub NamespacesInitVariables {
  }
  $NamespaceRoot = $ScriptName; # $ScriptName may be changed below
  $NamespaceCurrent = '';
-  my $ns = GetParam('ns', '');
-  if (not $ns and $UsePathInfo) {
-    my $path_info = decode_utf8($q->path_info());
-    # make sure ordinary page names are not matched!
-    if ($path_info =~ m|^/($InterSitePattern)(/.*)?|
-	and ($2 or $q->keywords or NamespaceRequiredByParameter())) {
-      $ns = $1;
-    }
-  }
-  ReportError(Ts('%s is not a legal name for a namespace', $ns))
-    if $ns and $ns !~ m/^($InterSitePattern)$/;
+  my $ns = GetNamespace();
  if ($ns
      and $ns ne $NamespacesMain
      and $ns ne $NamespacesSelf) {
--- a/modules/near-links/moin-search.pl
+++ b/modules/near-links/moin-search.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use CGI qw/:standard/;
 use CGI::Carp qw(fatalsToBrowser);
--- a/modules/near-links/phpwiki-search.pl
+++ b/modules/near-links/phpwiki-search.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use CGI qw/:standard/;
 use CGI::Carp qw(fatalsToBrowser);
--- a/modules/near-links/usemod-search.pl
+++ b/modules/near-links/usemod-search.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use CGI qw/:standard/;
 use CGI::Carp qw(fatalsToBrowser);
--- a/modules/nearlink-create.pl
+++ b/modules/nearlink-create.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/no-question-mark.pl
+++ b/modules/no-question-mark.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/not-found-handler.pl
+++ b/modules/not-found-handler.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/numbered-list.pl
+++ b/modules/numbered-list.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
--- a/modules/olocalmap.pl
+++ b/modules/olocalmap.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This module adds an action and a link in the UserGotoBar to build
 # a Local Site Map starting from the current page. The map is a sort
--- a/modules/open-proxy.pl
+++ b/modules/open-proxy.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/orphans.pl
+++ b/modules/orphans.pl
@@ -4,20 +4,18 @@

 # Author: Jorgen Schaefer <forcer@forcix.cx>

-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # This module will show ALL orphaned pages, even whole orphaned
 # subgraphs on this wiki.
--- a/modules/page-trail.pl
+++ b/modules/page-trail.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/page-type.pl
+++ b/modules/page-type.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/paragraph-link.pl
+++ b/modules/paragraph-link.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/partial-journal.pl
+++ b/modules/partial-journal.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/paste-image.pl
+++ b/modules/paste-image.pl
@@ -0,0 +1,230 @@
+#! /usr/bin/perl
+# Copyright (C) 2017  Alex Schroeder <alex@gnu.org>
+
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('paste-image.pl', 'Paste Files to Upload');
+
+our (@MyInitVariables, $ScriptName, $HtmlHeaders, $MaxPost, $CommentsPattern,
+     $QuestionaskerSecretKey);
+
+our ($PasteImageOnBrowse);
+
+$PasteImageOnBrowse = 0;
+
+push(@MyInitVariables, \&PasteImageScript);
+
+# Resampling based on the following:
+# https://stackoverflow.com/a/19223362/534893
+# https://github.com/viliusle/Hermite-resize
+
+sub PasteImageScript {
+  my $id = GetId();
+  return unless $id;
+  OpenPage($id);
+  my $username = GetParam('username', '');
+  my $templatePage = "Image_{n}_for_$id";
+  my $templateText = "Image {n}";
+  my $question = $QuestionaskerSecretKey || 'question';
+  if ((GetParam('action', 'browse') eq 'edit'
+       or GetParam('action', 'browse') eq 'new'
+       or $CommentsPattern and $id =~ /$CommentsPattern/
+       or $PasteImageOnBrowse and GetParam('action', 'browse') eq 'browse')
+      and $HtmlHeaders !~ /PasteImage/) {
+    $HtmlHeaders .= << "EOT";
+<script type="text/javascript">
+if (!HTMLTextAreaElement.prototype.insertAtCaret) {
+  HTMLTextAreaElement.prototype.insertAtPoint = function (text) {
+    text = text || '';
+    if (this.selectionStart || this.selectionStart === 0) {
+      // Others
+      var startPos = this.selectionStart;
+      var endPos = this.selectionEnd;
+      this.value = this.value.substring(0, startPos) +
+	text +
+	this.value.substring(endPos, this.value.length);
+      this.selectionStart = startPos + text.length;
+      this.selectionEnd = startPos + text.length;
+    } else {
+      this.value += text;
+    }
+  };
+};
+
+var PasteImage = {
+
+  init: function() {
+    let e = document.getElementById('text') || document.getElementById('aftertext');
+    if (e)
+      e.addEventListener('paste', PasteImage.handler);
+  },
+
+  handler: function(e) {
+    // Chrome
+    if (e.clipboardData) {
+      let items = e.clipboardData.items;
+      for (var i = 0; i < items.length; i++) {
+	if (items[i].type.indexOf("image") !== -1) {
+          let blob = items[i].getAsFile();
+          let reader = new window.FileReader();
+          reader.onloadend = function() {
+            let dataUrl = reader.result;
+            let n = 1;
+            while (n++ < 4 && $MaxPost > 0 && dataUrl.length > $MaxPost)
+              dataUrl = PasteImage.shrink(dataUrl);
+            PasteImage.process(dataUrl, "$templatePage", "$templateText", 1);
+          }
+          reader.readAsDataURL(blob);
+        }
+      }
+    }
+  },
+
+  shrink: function(dataUrl) {
+    let image = new Image;
+    image.src = dataUrl;
+
+    let canvas = document.createElement("canvas");
+    canvas.width = image.width;
+    canvas.height = image.height;
+
+    let ctx = canvas.getContext("2d");
+    ctx.drawImage(image, 0, 0);
+
+    let width_source = canvas.width;
+    let height_source = canvas.height;
+    let width = Math.round(width_source * 0.5);
+    let height = Math.round(height_source * 0.5);
+
+    let ratio_w = width_source / width;
+    let ratio_h = height_source / height;
+    let ratio_w_half = Math.ceil(ratio_w / 2);
+    let ratio_h_half = Math.ceil(ratio_h / 2);
+
+    let img = ctx.getImageData(0, 0, width_source, height_source);
+    let img2 = ctx.createImageData(width, height);
+    let data = img.data;
+    let data2 = img2.data;
+
+    for (let j = 0; j < height; j++) {
+      for (let i = 0; i < width; i++) {
+        let x2 = (i + j * width) * 4;
+        let weight = 0;
+        let weights = 0;
+        let weights_alpha = 0;
+        let gx_r = 0;
+        let gx_g = 0;
+        let gx_b = 0;
+        let gx_a = 0;
+        let center_y = (j + 0.5) * ratio_h;
+        let yy_start = Math.floor(j * ratio_h);
+        let yy_stop = Math.ceil((j + 1) * ratio_h);
+        for (let yy = yy_start; yy < yy_stop; yy++) {
+          let dy = Math.abs(center_y - (yy + 0.5)) / ratio_h_half;
+          let center_x = (i + 0.5) * ratio_w;
+          let w0 = dy * dy; //pre-calc part of w
+          let xx_start = Math.floor(i * ratio_w);
+          let xx_stop = Math.ceil((i + 1) * ratio_w);
+          for (let xx = xx_start; xx < xx_stop; xx++) {
+            let dx = Math.abs(center_x - (xx + 0.5)) / ratio_w_half;
+            let w = Math.sqrt(w0 + dx * dx);
+            if (w >= 1) {
+              //pixel too far
+              continue;
+            }
+            //hermite filter
+            weight = 2 * w * w * w - 3 * w * w + 1;
+            let pos_x = 4 * (xx + yy * width_source);
+            //alpha
+            gx_a += weight * data[pos_x + 3];
+            weights_alpha += weight;
+            //colors
+            if (data[pos_x + 3] < 255)
+              weight = weight * data[pos_x + 3] / 250;
+            gx_r += weight * data[pos_x];
+            gx_g += weight * data[pos_x + 1];
+            gx_b += weight * data[pos_x + 2];
+            weights += weight;
+          }
+        }
+        data2[x2] = gx_r / weights;
+        data2[x2 + 1] = gx_g / weights;
+        data2[x2 + 2] = gx_b / weights;
+        data2[x2 + 3] = gx_a / weights_alpha;
+      }
+    }
+    canvas.width = width;
+    canvas.height = height;
+    ctx.putImageData(img2, 0, 0);
+    let png = canvas.toDataURL();
+    let jpg = canvas.toDataURL('image/jpeg');
+    return png <= jpg ? png : jpg;
+  },
+
+  process: function(dataUrl, templatePage, templateText, n) {
+    let name = templatePage.replace('{n}', n);
+    let text = templateText.replace('{n}', n);
+    let xhr = new XMLHttpRequest();
+    xhr.open("HEAD", "$ScriptName/" + name, true);
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200) {
+          PasteImage.process(dataUrl, templatePage, templateText, n+1);
+        } else if (xhr.status == 404) {
+          PasteImage.post(dataUrl, name, text);
+        } else {
+          let re = /<h1>(.*)<\\/h1>/g;
+          let match = re.exec(xhr.responseText);
+          alert(match[1]);
+        }
+      }
+    };
+    xhr.send(null);
+  },
+
+  post: function(dataUrl, name, text) {
+    let xhr = new XMLHttpRequest();
+    xhr.open("POST", "$ScriptName", true);
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200) {
+          let e = document.getElementById('text') || document.getElementById('aftertext');
+          e.insertAtPoint("[[image:" + name + "|" + text + "]]");
+        } else {
+          let re = /<h1>(.*)<\\/h1>/g;
+          let match = re.exec(xhr.responseText);
+          alert(match[1]);
+        }
+      }
+    }
+
+    let mimeType = dataUrl.split(',')[0].split(':')[1].split(';')[0];
+    let content = encodeURIComponent(dataUrl.split(',')[1]);
+    let params = "title=" + encodeURIComponent(name);
+    params += "&summary=" + encodeURIComponent(name);
+    params += "&username=" + encodeURIComponent("$username");
+    params += "&recent_edit=on";
+    params += "&$question=1";
+    params += "&text=#FILE " + mimeType + "%0A" + content;
+    xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    xhr.send(params);
+  },
+};
+window.addEventListener('load', PasteImage.init);
+</script>
+EOT
+  }
+}
--- a/modules/pingback-server.pl
+++ b/modules/pingback-server.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,17 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
-#
-# History / Notes
-#   2004.03.19
-#     - Created
-#     - Works!
-#     - Tried to get rid of LWP but failed :(
-#     - We have to capture the script before CGI.pm starts to get STDIN
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/plainsite.pl
+++ b/modules/plainsite.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/publish.pl
+++ b/modules/publish.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/referrer-rss.pl
+++ b/modules/referrer-rss.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # TODO referers and refeRrers

--- a/modules/relation.pl
+++ b/modules/relation.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/sabifoo.pl
+++ b/modules/sabifoo.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/search-list.pl
+++ b/modules/search-list.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
@@ -26,20 +23,29 @@ our ($q, $bol, %Action, %Page, $OpenPageName, @MyRules);
 push(@MyRules, \&SearchListRule);

 sub SearchListRule {
-  if ($bol && /\G(&lt;list (.*?)&gt;)/cgis) {
-    # <list regexp>
+  if ($bol && /\G(&lt;(list|titlelist) (.*?)&gt;)/cgis) {
+    # <list regexp> (search page titles and page bodies)
+    # <titlelist regexp> (search page titles only)
    Clean(CloseHtmlEnvironments());
    Dirty($1);
    my ($oldpos, $old_) = (pos, $_);
    my $original = $OpenPageName;
-    my $term = $2;
+    my $variation = $2;
+    my $term = $3;
    if ($term eq "") {
-        $term = GetId();
+      $term = GetId();
    }
    local ($OpenPageName, %Page);
    my %hash = ();
-    foreach my $id (SearchTitleAndBody($term)) {
-      $hash{$id} = 1 unless $id eq $original; # skip the page with the query
+    if ($variation eq 'list') {
+      foreach my $id (SearchTitleAndBody($term)) {
+        $hash{$id} = 1 unless $id eq $original; # skip the page with the query
+      }
+    }
+    if ($variation eq 'titlelist') {
+      foreach my $id (grep(/$term/, AllPagesList())) {
+        $hash{$id} = 1 unless $id eq $original; # skip the page with the query
+      }
    }
    my @found = keys %hash;
    if (defined &PageSort) {
@@ -48,7 +54,7 @@ sub SearchListRule {
      @found = sort(@found);
    }
    @found = map { $q->li(GetPageLink($_)) } @found;
-    print $q->start_div({-class=>'search list'}),
+    print $q->start_div({-class=>"search $variation"}),
      $q->ul(@found), $q->end_div;
    Clean(AddHtmlEnvironment('p')); # if dirty block is looked at later, this will disappear
    ($_, pos) = ($old_, $oldpos); # restore \G (assignment order matters!)
--- a/modules/search-shortcut.pl
+++ b/modules/search-shortcut.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/searchtags.pl
+++ b/modules/searchtags.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/setext.pl
+++ b/modules/setext.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/show-comments.pl
+++ b/modules/show-comments.pl
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,10 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Includes comment pages in journal collections.

--- a/modules/signature.pl
+++ b/modules/signature.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/simple-rules.pl
+++ b/modules/simple-rules.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/sitemap-index.pl
+++ b/modules/sitemap-index.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Create a plain text listing of all pages in your wiki

--- a/modules/small.pl
+++ b/modules/small.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/smarttitles.pl
+++ b/modules/smarttitles.pl
@@ -179,18 +179,17 @@ Copyright 2014-2015 Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
 Copyleft  2008 by B.w.Curry <http://www.raiazome.com>.
 Copyright 2006 by Charles Mauch <mailto://cmauch@gmail.com>.

-This file is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.

-This file is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this file; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 =cut
--- a/modules/smiley-dir.pl
+++ b/modules/smiley-dir.pl
@@ -2,7 +2,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,10 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/sort.pl
+++ b/modules/sort.pl
@@ -0,0 +1,89 @@
+# Copyright (C) 2016  Alex Schroeder <alex@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use v5.10;
+
+=head1 Sort Extension
+
+This extension allows you to sort search results based on last update date and
+based on creation date (if you have installed creationdate.pl).
+
+=cut
+
+AddModuleDescription('sort.pl', 'Sort Extension');
+
+our ($q, @InitVariables, %Action, %Page, $OpenPageName);
+
+my %SortUpdate;
+my %SortCreation;
+
+*OldSortSearchMenu = \&SearchMenu;
+*SearchMenu = \&NewSortSearchMenu;
+
+sub NewSortSearchMenu {
+  my $sort = GetParam('sort');
+  my $html = OldSortSearchMenu(@_);
+  my $sort = GetParam('sort');
+  my $string = UrlEncode(shift);
+  $html .= ' ' . ($sort
+		  ? ScriptLink("search=$string", T('Sort alphabetically'))
+		  : $q->b(T('Sorted alphabetically')));
+  $html .= ' ' . ($sort eq 'update'
+		  ? $q->b(T('Sorted by last update first'))
+		  : ScriptLink("search=$string;sort=update",
+			       T('Sort by last update')));
+  if (defined(&CreationDateOpenPage)) {
+    $html .= ' ' . ($sort eq 'creation'
+		    ? $q->b(T('Sorted by creation date'))
+		    : ScriptLink("search=$string;sort=creation",
+				 T('Sort by creation date')));
+  }
+  return $html;
+}
+
+*OldSortSearchTitleAndBody = \&SearchTitleAndBody;
+*SearchTitleAndBody = \&NewSortSearchTitleAndBody;
+
+sub NewSortSearchTitleAndBody {
+  my ($regex, $func, @args) = @_;
+  %SortUpdate = ();
+  %SortCreation = ();
+  my @found = OldSortSearchTitleAndBody($regex);
+  my $sort = GetParam('sort');
+  if ($sort eq 'update') {
+    # last updated means first
+    @found = sort { $SortUpdate{$b} cmp $SortUpdate{$a} } @found;
+  } elsif ($sort eq 'creation') {
+    # first created means first
+    @found = sort { $SortCreation{$a} cmp $SortCreation{$b} } @found;
+  }
+  for my $id (@found) {
+    $func->($id, @args) if $func;
+  }
+  return @found;
+}
+
+# Taking advantage of the fact that OpenPage is called for every page, we use it
+# to build our hashes.
+
+*OldSortOpenPage = \&OpenPage;
+*OpenPage = \&NewSortOpenPage;
+
+sub NewSortOpenPage {
+  my $value = OldSortOpenPage(@_);
+  $SortUpdate{$OpenPageName} = $Page{ts};
+  $SortCreation{$OpenPageName} = $Page{created};
+  return $value; # I don't think anybody uses this?
+}
--- a/modules/static-copy.pl
+++ b/modules/static-copy.pl
@@ -40,7 +40,7 @@ sub DoStatic {
  CreateDir($StaticDir);
  %StaticFiles = ();
  print '<p>' unless $raw;
-  StaticWriteFiles();
+  StaticWriteFiles(1);
  print '</p>' unless $raw;
  PrintFooter() unless $raw;
 }
@@ -60,6 +60,7 @@ sub StaticMimeTypes {
 }

 sub StaticWriteFiles {
+  my $verbose = shift;
  my $raw = GetParam('raw', 0);
  my $html = GetParam('html', 0);
  local *ScriptLink = \&StaticScriptLink;
@@ -68,7 +69,7 @@ sub StaticWriteFiles {
    if ($StaticAlways > 1
 	or $html
 	or PageIsUploadedFile($id)) {
-      StaticWriteFile($id, $html);
+      StaticWriteFile($id, $html, $verbose);
    }
  }
  if ($StaticAlways > 1 or $html) {
@@ -129,7 +130,7 @@ sub StaticFileName {
 }

 sub StaticWriteFile {
-  my ($id, $html) = @_;
+  my ($id, $html, $verbose) = @_;
  my $raw = GetParam('raw', 0);
  OpenPage($id);
  my ($mimetype, $encoding, $data) =
@@ -147,10 +148,10 @@ sub StaticWriteFile {
    StaticHtml($id, $fh);
    close($fh);
  } else {
-    print "no data for ";
+    print "no data for " if $verbose;
  }
  ChangeMod(0644,"$StaticDir/$filename");
-  print $filename, $raw ? "\n" : $q->br();
+  print $filename, $raw ? "\n" : $q->br() if $verbose;
 }

 sub StaticFile {
--- a/modules/static-hybrid.pl
+++ b/modules/static-hybrid.pl
@@ -3,19 +3,16 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#	 Free Software Foundation, Inc.
-#	 59 Temple Place, Suite 330
-#	 Boston, MA 02111-1307 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use strict;
 use v5.10;
--- a/modules/styled-pages.pl
+++ b/modules/styled-pages.pl
@@ -0,0 +1,41 @@
+# Copyright (C) 2014-2017
+#     Aleks-Daniel Jakimenko-Aleksejev <alex.jakimenko@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('styled-pages.pl', 'Styled Pages Extension');
+
+our (@MyRules);
+our ($StyledPagesPrefix);
+
+$StyledPagesPrefix = 'style_';
+
+push(@MyRules, \&StyledPagesRule);
+
+my $StyledPage = '';
+
+sub StyledPagesRule {
+  if (!$StyledPage and m/\G (^|\n)? \#STYLE [ \t]+ ([a-z_-][a-z0-9 _-]+[a-z0-9_-]) \s*(\n+|$) /cgx) {
+    $StyledPage = 1;
+    return CloseHtmlEnvironments()
+        . '<div class="' . join(' ', map {"$StyledPagesPrefix$_"} split /\s+/, $2) . '">'
+        . AddHtmlEnvironment('p');
+  }
+  if ($StyledPage and m/\G $/cgx) {
+      return CloseHtmlEnvironments() . '</div>';
+  }
+  return;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Schroeder	88b384c2b4	static-copy: suppress extra output when saving pages	2017-07-24 10:35:18 +02:00
Alex Schroeder	92e231b10c	paste-image: new action includes javascript	2017-07-14 13:42:12 +02:00
Alex Schroeder	e9ce006444	Markdown: fixed number of tests	2017-07-07 23:19:31 +02:00
Alex Schroeder	bc5ee74ffd	Markdown: one more test	2017-07-07 20:52:35 +02:00
Alex Schroeder	688cf9eea5	markdown-rule: support nested lists by indenting	2017-07-07 17:11:04 +02:00
Alex Schroeder	ad9a19d551	paste-image: step from 0.8 to 0.5 As it turns out, when I tried to paste an 1.5MB image, the old settings didn't work. We need to shrink more agressively.	2017-06-16 20:01:11 +02:00
Alex Schroeder	7595e6db36	paste-image: fix name of option	2017-06-13 22:43:36 +02:00
Alex Schroeder	74fd5c569c	paste-image: delete trailing whitespace	2017-06-13 22:32:30 +02:00
Alex Schroeder	e4376c178b	paste-image: handle $QuestionaskerSecretKey	2017-06-13 22:18:11 +02:00
Alex Schroeder	9e46438534	Merge branch 'master' of github.com:kensanata/oddmuse	2017-06-13 22:11:46 +02:00
Alex Schroeder	4dd29bd4a7	paste-image: automatic resizing via Javascript	2017-06-13 22:06:39 +02:00
Alex Schroeder	90af54b7ba	Add separate alt text for uploaded images	2017-06-13 12:55:52 +02:00
Alex Schroeder	cadcdde5f8	Fix how image names are determined	2017-06-12 23:22:31 +02:00
Alex Schroeder	4c77bc11de	markdown-rule: merge with latest from server	2017-06-11 23:42:51 +02:00
Alex Schroeder	05988eb899	paste-image.pl is new	2017-06-11 23:27:16 +02:00
Alex Schroeder	040bd05333	Markdown rule fix for markup in table cells	2017-05-22 18:20:53 +02:00
Alex Schroeder	5f03238f60	Markdown rule: added tests for // and /	2017-05-22 18:00:59 +02:00
Alex Schroeder	4c6d91a101	Markdown rule: fix rules for __ and _	2017-05-22 17:59:34 +02:00
Alex Schroeder	71b93887dc	webdav: new tests using cadaver, when installed	2017-05-22 12:23:15 +02:00
Alex Schroeder	391049ef77	Qualify OddMuse::Modified in a different package	2017-05-22 12:23:15 +02:00
Alex Schroeder	3d5aec5651	For PUT and POST, CGI will read STDIN You can get the content via the parameters POSTDATA and PUTDATA. For other methods, however, this doesn't work and you still need to read STDIN. One such method is PROPFIND.	2017-05-22 12:23:15 +02:00
Alex Schroeder	d976184e24	README: how to use server.pl	2017-05-22 12:23:15 +02:00
Alex Schroeder	5a45c1191a	git.pl: failing to delete a file is not an error	2017-05-22 12:23:15 +02:00
Alex Schroeder	07f315ca12	markdown-rule.pl: improving the regexps	2017-05-22 12:23:15 +02:00
Aleks-Daniel Jakimenko-Aleksejev	be1cf0e876	Tiny indentation changes	2017-04-21 02:03:15 +03:00
greenfive	d4d0ed728f	refactored into single outer if-branch (#7 ) * refactored into one outer if branch, simplified output of div classes (squashed to avoid the weird GPL version change)	2017-04-21 01:57:49 +03:00
Alex Schroeder	0f0f20b21c	Merge pull request #6 from greenfive/titlelist added support for <titlelist regexp> to search page titles only	2017-04-20 17:47:05 +02:00
Ralph Graulich	abdb9c973b	added support for <titlelist regexp> to search page titles only	2017-04-20 13:19:59 +02:00
Aleks-Daniel Jakimenko-Aleksejev	4e0b287890	Variable %RuleOrder is not needed of course Oops.	2017-04-15 03:56:48 +03:00
Aleks-Daniel Jakimenko-Aleksejev	00308f9ed6	New module: styled-pages.pl A user on #oddmuse asked what would be the easiest way to have different css styles on different pages. Turns out the easiest way is to write a module. Not sure if it will break html in some yet unknown edge cases, but for most things this should work just fine. greenfive++	2017-04-15 03:54:06 +03:00
Alex Schroeder	2488ccdb8c	Makefile now looks for https instead of http	2017-04-11 12:50:09 +02:00
Alex Schroeder	cec2f3cc1b	banned-regexps.t: new	2017-03-17 09:32:42 +01:00
Alex Schroeder	5a19773dfa	meta.t: ban-contributors.pl may have package	2017-03-01 08:26:47 +01:00
Alex Schroeder	7c3bb0a0af	ban-contributors: end with package OddMuse	2017-02-28 12:47:50 +01:00
Alex Schroeder	90d44bf863	Merge branch 'master' of github.com:kensanata/oddmuse	2017-02-13 20:48:34 +01:00
Alex Schroeder	9d0ff86a44	gotobar.pl: remove trailing whitespace	2017-01-09 22:37:08 +01:00
Alex Schroeder	d03bc9f40b	Moved the elisp files to a different repo You can find them here: https://github.com/kensanata/emacs-setup/tree/master/lib	2017-01-09 22:36:23 +01:00
Alex Schroeder	863bda76dc	Various elisp changes	2017-01-09 22:36:23 +01:00
Alex Schroeder	fcbe01bbfd	campaignwiki/delete.sh: use --silent for curl	2016-12-30 14:00:08 +01:00
IngoBelka	6178c46aec	gotobar.pl: Parameters for automatically set of HOME link and RC link or not	2016-12-02 14:34:44 +01:00
Alex Schroeder	87110eef08	Trying to improve SVG printing from Firefox	2016-11-11 19:34:44 +01:00
Aleks-Daniel Jakimenko-Aleksejev	1bfeac5035	Fix tests in history.t after commit `152188503e` Long story short: it was testing for string “rollback” which is now part of the warning message. Just making it a bit more specific resolves the problem.	2016-09-22 00:45:10 +03:00
Aleks-Daniel Jakimenko-Aleksejev	ef257b566f	Fix git.t for newer git versions More recent git versions say “working tree clean” instead of saying “working directory clean”. Let's just accept both.	2016-09-21 23:54:45 +03:00
Alex Schroeder	0fce2edcf8	meta.t: test for GPL URL This also catches the URL for Weakish Jiang's GPL v2 and a GPL with no URL (implying the version with a snail mail address). This is tes should close issue #4 on GitHub.	2016-09-21 17:06:54 +02:00
Alex Schroeder	152188503e	Translations: updated Two new strings which need to be translated.	2016-09-11 21:46:49 +02:00
Alex Schroeder	d804c16a1c	Explain Rollback button on History pages	2016-09-10 23:51:07 +02:00
Alex Schroeder	cb7f2e4634	Explain Rollback button on Recent Changes	2016-09-10 23:15:35 +02:00
Alex Schroeder	b90695c7c8	ban-contributors.t: skip the last few tests Alexine keeps failing those.	2016-08-31 14:20:50 +02:00
Alex Schroeder	e67c8bfda6	wiki.pl Switch oddmuse.org links to HTTPS	2016-08-31 14:14:47 +02:00
Alex Schroeder	90eb428787	calendar.pl: allow previous and next month Stefan Kamphausen provided a reason for liking the deprecated cal3 extension: he likes cal3 because it also displays the next and previous month as opposed to calendar.pl which only displays the current month. This commit allows users to get the same behaviour by setting $CalendarOnEveryPage to values greater than 1: 1 shows the current month on every page, but 2 shows the previous and the current month on every page, and 3 shows the previous, the current and the next month on every page.	2016-08-31 13:44:07 +02:00
Alex Schroeder	e3cacaa89f	Merge branch 'master' of github.com:kensanata/oddmuse	2016-08-26 13:50:13 +02:00
Alex Schroeder	6167428ecf	ban-contributors.t: commented last test The last test has been failing for Alexine and we have contacted the maintainer of the Net::Whois::Parser package. Until we hear back, I'm going to skip this test.	2016-08-19 14:33:55 +02:00
Alex Schroeder	367f76b6f4	Removed old $Id$ line	2016-08-19 13:09:44 +02:00
Alex Schroeder	733b6dabb1	Fixed another one that had slipped through the cracks Emacs keyboard macros, oops!	2016-08-16 18:08:34 +02:00
Alex Schroeder	72cd669bf0	Changed nearly remaining code from GPLv2 to GPLv3 There were some files that did not offer "or (at your option) any later version" in their license and these had to be left alone. This should solve the incorrect FSF address issue #4 on GitHub.	2016-08-16 18:01:26 +02:00
Alex Schroeder	84f630af4a	README.creole: indicate ownership Typo fixed and a chown command added as suggested by @mx4 in GitHub issue #5.	2016-08-16 17:44:40 +02:00
Alex Schroeder	05df700140	Fixed erroneous edits from previous commit The keyboard macro did not deal kindly with two files... This should address comments by @m4z for the incorrect FSF address issue #4 on GitHub.	2016-08-16 16:43:21 +02:00
Alex Schroeder	f230a64e7d	Changed nearly all modules from GPLv2 to GPLv3 There were some modules that did not offer "or (at your option) any later version" in their license and these had to be left alone. This should solve the incorrect FSF address issue #4 on GitHub.	2016-08-16 15:04:47 +02:00
Alex Schroeder	1855c84cec	namespaces.pl: more changes to get it working Encoding of namespace and page name under Mojolicious is not OK and I don't know why. I added some tests that try to at least prove that the workaround in the config file is OK.	2016-08-11 17:14:14 +02:00
Alex Schroeder	3c982a6cd4	namespaces.t: added another test	2016-08-11 15:29:41 +02:00
Alex Schroeder	7053561f89	Revert "NamespacesInitVariables not decoding path_info" This reverts commit `5fce7f4b63`. Same as the previous revert for wiki.pl.	2016-08-11 14:20:45 +02:00
Alex Schroeder	02fcabfdbc	Revert "GetId no longer decodes path_info" This reverts commit `1ee235c949`. Sadly, I discovered that my websites no longer correctly displayed pages containing characters such as the EN DASH. Reverting this commit seems to solve the problem.	2016-08-10 14:56:00 +02:00
Alex Schroeder	0c0efdd2c8	banned-regexps.pl: exclude urls	2016-08-08 11:31:06 +02:00
Alex Schroeder	9a93601a03	upload.pl: fix meta.t complaint	2016-08-08 11:30:27 +02:00
Alex Schroeder	b68f2b6cd6	ban-contributors.pl: rely on inetnum	2016-08-05 12:24:36 +02:00
Alex Schroeder	80d95e9225	tarballs.pl: handle missing files	2016-08-03 12:52:29 +02:00
Alex Schroeder	04288eda8c	light.css: checkboxes are not 5em wide	2016-08-02 12:04:26 +02:00
Alex Schroeder	3a7f75cf30	translations: updated with new strings	2016-08-02 11:55:39 +02:00
Alex Schroeder	0ca64b2db0	german-utf8.pl: updated	2016-08-02 11:54:15 +02:00
Alex Schroeder	81aaf49463	sort.pl: delete trailing whitespace	2016-08-02 11:49:41 +02:00
Alex Schroeder	5c93616690	sort.pl: be more explicit about the sorting Clearly print how the result is sorted right now.	2016-08-02 11:48:17 +02:00
Alex Schroeder	c1823bc59c	sort.pl: Offer link to sort alphabetically Don't show the link to the current sort order.	2016-08-02 11:43:08 +02:00
Alex Schroeder	1634859659	Skip pages that no longer exist	2016-08-02 11:38:44 +02:00
Alex Schroeder	684781423d	creationdate.pl: fix typo	2016-08-02 11:26:02 +02:00
Alex Schroeder	1f2507fc00	creationdate.pl: now with admin menu to add dates This is done by parsing rc.log files and adding the information to the page database.	2016-08-02 11:21:38 +02:00
Alex Schroeder	0644b63b67	sort.pl: new module to sort search results	2016-08-02 10:58:37 +02:00
Alex Schroeder	64f6b267d9	Encode arguments to diff command	2016-07-27 17:35:10 +02:00
Alex Schroeder	528e9d8868	meta.t: remove -T from the syntax check When testing it on my system, perl -c claims ban-contributors.pl is good and perl -cT claims ban-contributors.pl bad because it can no longer find Net/Whois/Parser.pm in @INC even though it's right there as /home/alex/perl5/lib/perl5/Net/Whois/Parser.pm -- apparently taint checking changes @INC. <http://perldoc.perl.org/perlsec.html#Taint-mode-and-%40INC>.	2016-07-27 14:01:51 +02:00
Alex Schroeder	f618822f34	meta.t: suggest the use of perl -cT	2016-07-27 13:56:11 +02:00
Alex Schroeder	e9a5fcdc7c	ban-contributors: switch to Net::Whois::Parser This one is available in a Debian package.	2016-07-27 12:51:47 +02:00
Alex Schroeder	2a33e91167	ban-contributors: fixed failing meta.t tests	2016-07-26 09:37:20 +02:00
Alex Schroeder	77327ec06f	ban-contributors: better regexp Now able to handle the range 77.56.180.0 - 77.57.70.255.	2016-07-26 09:25:58 +02:00
Alex Schroeder	f530b25d74	Document the number range being banned	2016-07-26 09:10:22 +02:00
Alex Schroeder	8db81914b1	ban-contributors.pl now with Net::Whois::IP We use a whois query to suggest a regular expression that bans the entire network, not just a single IP.	2016-07-25 15:37:34 +02:00
Alex Schroeder	5fce7f4b63	NamespacesInitVariables not decoding path_info On a new server with Debian Jessie (8), Apache 2.4, Perl 5.25.1 and CGI 4.28 I'm getting double-decoded namespaces. An Umlaut will thus turn into an undisplayable character (a questionmark in a black diamond). Decoding of path_info was necessary on my old server with Debian Wheezy (7), Apache 2.2, Perl 5.14.2 and CGI 3.52. If you're still in the unfortunate situation, you can copy the old implementation of NamespacesInitVariables into your config file.	2016-07-25 09:03:33 +02:00
Alex Schroeder	1ee235c949	GetId no longer decodes path_info On a new server with Debian Jessie (8), Apache 2.4, Perl 5.25.1 and CGI 4.28 I'm getting double-decoded page names. An Umlaut will thus turn into an undisplayable character (a questionmark in a black diamond). Decoding of path_info was necessary on my old server with Debian Wheezy (7), Apache 2.2, Perl 5.14.2 and CGI 3.52. If you're still in the unfortunate situation, you can copy the old implementation of GetId into your config file: sub GetId { my $id = UnquoteHtml(GetParam('id', GetParam('title', ''))); # id=x or title=x -> x if (not $id and $q->keywords) { $id = decode_utf8(join('_', $q->keywords)); # script?p+q -> p_q } if ($UsePathInfo and $q->path_info) { my @path = map { decode_utf8($_) } split(/\//, $q->path_info); $id \|\|= pop(@path); # script/p/q -> q foreach my $p (@path) { SetParam($p, 1); # script/p/q -> p=1 } } return $id; }	2016-07-21 12:49:01 +02:00
Alex Schroeder	be7d8d4460	translation-links.pl: test with locked wiki, too	2016-07-09 00:07:32 +02:00
Alex Schroeder	f134283bae	translation-links.pl: prevent spam from saving When using banned-regexps.pl, we want to ban certain pages from getting created. This only works if we test source and target page for spam.	2016-07-09 00:03:18 +02:00
Alex Schroeder	38d5d01ea1	DoPost will also test $id for banned content If using banned-regexps.pl, testing the page title can be important.	2016-07-06 18:18:28 +02:00
Alex Schroeder	8e3e186fab	Fix make release target	2016-07-06 18:14:47 +02:00