Added missing “use sigtrap”

Stop leaving locks behind
If you want to leave the thing locked when it is suddenly stopped (that is, interrupting the process will lead to bad consequences, and the admin should get in and make sure that everything is ok), then use **0**. **0** (or other falsie) means do nothing if it is suddenly interrupted and leave the lock in place. **1** means that your lock will be removed automatically if the whole thing is interrupted in the middle of the process. ##CleanLock('yourlock')## function will be called, which means that you can add your own cleanup logic by wrapping this subroutine (which I did in Modlue:private-wiki.pl).
2015-08-19 10:28:32 +03:00 · 2015-08-19 06:56:21 +03:00
179 changed files with 8859 additions and 10853 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 *~
 /build/
 \#*\#
-/test-data*
+/test-data
 /Mac/pkg/
 *.dmg
 *.pkg
 .DS_Store
-wiki.log
-.prove
--- a/16
+++ b/16
@@ -3,7 +3,7 @@
 # subdirectory.

 VERSION_NO=$(shell git describe --tags)
-TRANSLATIONS=$(wildcard modules/translations/[a-z]*-utf8.pl$)
+TRANSLATIONS=$(wildcard modules/translations/[a-z]*.pl$)
 MODULES=$(wildcard modules/*.pl)
 BUILD=build/wiki.pl $(foreach file, $(notdir $(MODULES)) $(notdir $(TRANSLATIONS)), build/$(file))

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

-modules/translations/new-utf8.pl: wiki.pl $(MODULES)
-	cp $@ $@-old
-	perl stuff/oddtrans -l $@-old wiki.pl $(MODULES) > $@
-	rm -f $@-old
-
 translations: $(TRANSLATIONS)
 	for f in $^; do \
 	  echo updating $$f...; \
-	  perl stuff/oddtrans -l $$f wiki.pl $(MODULES) > $$f-new && mv $$f-new $$f; \
+	  perl oddtrans -l $$f wiki.pl $(MODULES) > $$f-new && mv $$f-new $$f; \
 	done

-# Running four jobs in parallel, but clean up data directories without
-# race conditions!
-
-jobs ?= 4
 test:
-	prove t/setup.pl
-	prove --jobs=$(jobs) --state=slow,save t
+	prove t
--- a/README.creole
+++ b/README.creole
@@ -1,5 +1,5 @@
 This is the README file distributed together with the
-[[https://oddmuse.org/|Oddmuse]] script.
+[[http://oddmuse.org/|Oddmuse]] script.

 == Installing Oddmuse on a Debian System running Apache

@@ -82,7 +82,7 @@ putting their names in {{{[[double square brackets]]}}}.

 Enjoy your wiki experience.

-Visit https://www.oddmuse.org/ to learn more about the translation
+Visit http://www.oddmuse.org/ to learn more about the translation
 files and modules that are part of this package.

 == Apache
@@ -136,7 +136,7 @@ simply restart it all:
 sudo service apache2 graceful
 }}}

-== License
+----------------------------------------------------------------------

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -153,7 +153,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.

 Both the GNU Free Documentation License, and the GNU General Public
-License are distributed together with this script. See the files
-[[https://github.com/kensanata/oddmuse/blob/master/FDL|FDL]] and
-[[https://github.com/kensanata/oddmuse/blob/master/GPL|GPL]],
-respectively.
+License are distributed together with this script.  See the files FDL
+and GPL, respectively.
--- a/contrib/campaignwiki/README
+++ b/contrib/campaignwiki/README
@@ -1,4 +1,4 @@
-The files in this directory are used to run https://campaignwiki.org/
+The files in this directory are used to run http://campaignwiki.org/

 add-link.pl
 ===========
@@ -8,7 +8,7 @@ bookmark site: A few pages make up a big unordered list of links in
 wiki format. add-link is a tool to help users contribute new links to
 the list.

-https://campaignwiki.org/wiki/LinksToWisdom/HomePage
+http://campaignwiki.org/wiki/LinksToWisdom/HomePage

 copy.pl
 =======
@@ -17,7 +17,7 @@ This is used to copy the text from a web page to a wiki page. The idea
 was to keep archive copies of cool pages somewhere. The Blog Archive
 never got used, though.

-https://campaignwiki.org/wiki/BlogArchive/HomePage
+http://campaignwiki.org/wiki/BlogArchive/HomePage

 monster-tag.pl
 ==============
@@ -25,7 +25,7 @@ monster-tag.pl
 This is used to quickly tag many pages in the Monsters wiki. The
 Monsters wiki hasn't been used in a long time, though.

-https://campaignwiki.org/wiki/Monsters/HomePage
+http://campaignwiki.org/wiki/Monsters/HomePage

 submit.pl
 =========
@@ -34,4 +34,4 @@ This used to be used to add sites to the Old School RPG Planet. The
 aggregator was configured via a wiki page on the Planet wiki. It's now
 abandoned.

-https://campaignwiki.org/wiki/Planet/HomePage
+http://campaignwiki.org/wiki/Planet/HomePage
--- a/contrib/campaignwiki/add-link.pl
+++ b/contrib/campaignwiki/add-link.pl
@@ -292,7 +292,6 @@ sub main {
  Init();                          # read config file (no modules!)
  $ScriptName = $site;             # undo setting in the config file
  $FullUrl = $site;                #
-  InitPageVariables();             # call again: $ScriptName was wrong
  binmode(STDOUT,':utf8');
  $q->charset('utf8');
  if ($q->path_info eq '/source') {
--- a/css/alex-2015.css
+++ b/css/alex-2015.css
@@ -1,7 +1,110 @@
 /* This file is in the public domain. */

+/* @import url(https://fonts.googleapis.com/css?family=Noticia+Text:400,400italic,700italic,700&subset=latin,latin-ext); */
+
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff'), url('/fonts/Symbola.ttf') format('truetype');
+}
+
 body, rss {
-    font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+    font-family: "Noticia Text", Symbola, serif;
    font-style: normal;
    font-size: 14pt;
    margin: 1em 3em;
--- a/css/light.css
+++ b/css/light.css
@@ -8,8 +8,110 @@

   @import url(https://fonts.googleapis.com/css?family=Noticia+Text:400,400italic,700italic,700&subset=latin,latin-ext); */

+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff');
+}
+
 body {
-	font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+	font-family: "Noticia Text", Symbola, serif;
 	font-size: 14pt;
 	color: #000;
 	background-color: #eed;
@@ -17,13 +119,13 @@ body {
 }

 textarea, pre, code, tt {
-	font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, Symbola;
-	font-size: 80%;
+    font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, Symbola;
+    font-size: 80%;
 }

@media print {
 	body {
-		background-color: white;
+        	background-color: white;
 		font-family: Times, serif;
 		font-size:10pt;
 	}
@@ -73,9 +175,9 @@ input#mail, input#homepage, input#username {

 /* titles */
 h1 {
-	font-weight: bold;
-	font-size: 150%;
-	padding: 1em 0;
+    font-weight: bold;
+    font-size: 150%;
+    padding: 1em 0;
 }
 h1 a:link, h1 a:visited {
 	color: inherit;
@@ -115,7 +217,7 @@ a:active {
 	border: 1px solid #9d8;
 	border-radius: 5px;
 	box-shadow: 0px 1px 3px white inset,
-			0px 1px 3px black;
+	            0px 1px 3px black;
 }
 .button a {
 	text-decoration: none;
@@ -129,6 +231,10 @@ a:active {
 		font-weight: normal;
 	}
 	a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
+	a[class="url number"]:after, a[class="inter number"]:after {
+		content:"[" attr(href) "]";
+	}
+	a[class="local number"]:after { content:"[" attr(title) "]"; }
 	img[smiley] { line-height: inherit; }
 }

@@ -137,15 +243,15 @@ a.pencil { display: none; }

 /* table of contents */
 .toc {
-	font-size: smaller;
-	border-left: 1em solid #886;
+    font-size: smaller;
+    border-left: 1em solid #886;
 }
 .toc ol {
-	list-style-type: none;
-	padding-left: 1em;
+    list-style-type: none;
+    padding-left: 1em;
 }
 .toc a {
-	font-weight: normal;
+    font-weight: normal;
 }

 /* images with links, captions, etc */
@@ -208,19 +314,19 @@ div.rc li { padding-bottom: 0.5em; }

 /* Tables */
 table.user {
-	margin: 1em 0;
-	padding: 0 1em;
-	border-top: 1px solid black;
-	border-bottom: 1px solid black;
+    margin: 1em 0;
+    padding: 0 1em;
+    border-top: 1px solid black;
+    border-bottom: 1px solid black;
 }
 div.aside table.user {
-	margin: 1em 0;
-	padding: 0;
+	    margin: 1em 0;
+	    padding: 0;
 }
 table.user td, table.user th {
-	border-style: none;
-	padding:5px 10px;
-	vertical-align: top; 
+    border-style: none;
+    padding:5px 10px;
+    vertical-align: top; 
 }
 table.user th { font-weight:bold; }
 table.user td.r { text-align:right; }
@@ -231,7 +337,7 @@ table.user td.mark { background-color:yellow; }
 tr:empty { display: block; height: 0.5em; }
@media print {
 	table {
-		font-size: 9pt;
+        	font-size: 9pt;
 		margin: 0;
 	}
 	table.user td, table.user th {
--- a/modules/aawrapperdiv.pl
+++ b/modules/aawrapperdiv.pl
@@ -0,0 +1,43 @@
+# Copyright (C) 2004, 2005  Fletcher T. Penney <fletcher@freeshell.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 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
+
+use strict;
+use v5.10;
+
+AddModuleDescription('aawrapperdiv.pl', 'WrapperDiv Module');
+
+our ($q);
+
+*OldGetHeader = \&GetHeader;
+*GetHeader = \&WrapperGetHeader;
+
+sub WrapperGetHeader {
+  my ($id, $title, $oldId, $nocache, $status) = @_;
+  my $result = OldGetHeader ($id, $title, $oldId, $nocache, $status);
+  $result .= $q->start_div({-class=>'wrapper'});
+}
+
+*OldPrintFooter = \&PrintFooter;
+*PrintFooter = \&WrapperPrintFooter;
+
+sub WrapperPrintFooter {
+  my ($id, $rev, $comment) = @_;
+  print $q->start_div({-class=>'wrapper close'});
+  print $q->end_div(), $q->end_div();
+  OldPrintFooter($id, $rev, $comment);
+}
--- a/modules/accesskeys.pl
+++ b/modules/accesskeys.pl
@@ -22,7 +22,7 @@ our (@MyRules, $FreeLinkPattern);

 push(@MyRules, \&LinksWithAccessKeys);
 sub LinksWithAccessKeys {
-  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cg) {
+  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cog) {
    my ($id, $key) = ($2, $3);
    Dirty($1);
    $id = FreeToNormal($id);
--- a/modules/admin.pl
+++ b/modules/admin.pl
@@ -36,7 +36,7 @@ sub AdminPowerDelete {
  OpenPage($id);
  my $status = DeletePage($id);
  if ($status) {
-    print $q->p(GetPageLink($id) . ' ' . T('not deleted:') . ' ' . $status);
+    print $q->p(GetPageLink($id) . ' ' . T('not deleted: ')) . $status;
  } else {
    print $q->p(GetPageLink($id) . ' ' . T('deleted'));
    WriteRcLog($id, Ts('Deleted %s', $id), 0, $Page{revision},
--- a/modules/aggregate.pl
+++ b/modules/aggregate.pl
@@ -26,7 +26,7 @@ our ($q, $bol, %Action, %Page, $OpenPageName, $UseDiff, $UsePathInfo, $RssStyleS
 push(@MyRules, \&AggregateRule);

 sub AggregateRule {
-  if ($bol && m/\G(&lt;aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))&gt;)/cg) {
+  if ($bol && m/\G(&lt;aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))&gt;)/gc) {
    Clean(CloseHtmlEnvironments());
    Dirty($1);
    my ($oldpos, $old_, $str, $sort, $search) = ((pos), $_, $3, $5, $6);
@@ -126,8 +126,8 @@ sub DoAggregate {
      }
    }
    foreach my $id (@pages) {
-      my $data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
-      my $page = $data->{text};
+      my %data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
+      my $page = $data{text};
      my $size = length($page);
      my $i = index($page, "\n=");
      my $j = index($page, "\n----");
@@ -136,13 +136,13 @@ sub DoAggregate {
      $page =~ s/^=.*\n//; # if it starts with a header
      my $name = $id;
      $name =~ s/_/ /g;
-      my $date = TimeToRFC822($data->{ts});
-      my $host = $data->{host};
-      my $username = $data->{username};
+      my $date = TimeToRFC822($data{ts});
+      my $host = $data{host};
+      my $username = $data{username};
      $username = QuoteHtml($username);
      $username = $host unless $username;
-      my $minor = $data->{minor};
-      my $revision = $data->{revision};
+      my $minor = $data{minor};
+      my $revision = $data{revision};
      my $cluster = GetCluster($page);
      my $description = ToString(sub { ApplyRules(QuoteHtml($page), 1, 0, undef, 'p') });
      $description .= $q->p(GetPageLink($id, T('Learn more...')))
--- a/modules/agree-disagree.pl
+++ b/modules/agree-disagree.pl
@@ -26,11 +26,11 @@ AddModuleDescription('agree-disagree.pl', 'AgreeDisagreePlugin');
 push(@MyRules, \&AgreeDisagreeSupportRule);

 push(@MyMacros, sub{ s/\[\+\]/"[+:" . GetParam('username', T('Anonymous'))
-                       . ':' . TimeToText($Now) . "]"/eg });
-push(@MyMacros, sub{ s/\[\+(:[^]:]+)\]/"[+$1:" . TimeToText($Now) . "]"/eg });
+                       . ':' . TimeToText($Now) . "]"/ge });
+push(@MyMacros, sub{ s/\[\+(:[^]:]+)\]/"[+$1:" . TimeToText($Now) . "]"/ge });
 push(@MyMacros, sub{ s/\[\-\]/"[-:" . GetParam('username', T('Anonymous'))
-                       . ':' . TimeToText($Now) . "]"/eg });
-push(@MyMacros, sub{ s/\[\-(:[^]:]+)\]/"[-$1:" . TimeToText($Now) . "]"/eg });
+                       . ':' . TimeToText($Now) . "]"/ge });
+push(@MyMacros, sub{ s/\[\-(:[^]:]+)\]/"[-$1:" . TimeToText($Now) . "]"/ge });


 $DefaultStyleSheet .= <<'EOT' unless $DefaultStyleSheet =~ /div\.agree/; # mod_perl?
@@ -78,17 +78,17 @@ EOT

 sub AgreeDisagreeSupportRule {
  if ($bol) {
-    if ($bol && m/(\G(\s*\[\+(.*?)\]|\s*\[-(.*?)\])+)/cgs) {
+    if ($bol && m/(\G(\s*\[\+(.*?)\]|\s*\[-(.*?)\])+)/gcs) {

      my $votes = $1;
      my @ayes = ();
      my @nayes = ();
-      while ($votes =~ m/\G.*?\[\+(.*?)\]/cgs) {
+      while ($votes =~ m/\G.*?\[\+(.*?)\]/gcs) {
        my ($ignore, $name, $time) = split(/:/, $1, 3);
        push(@ayes, $name);
      }
      my $votes2 = $votes;
-      while ($votes2 =~ m/\G.*?\[-(.*?)\]/cgs) {
+      while ($votes2 =~ m/\G.*?\[-(.*?)\]/gcs) {
        my ($ignore, $name, $time) = split(/:/, $1, 3);
        push(@nayes, $name);
      }
--- a/modules/anchors.pl
+++ b/modules/anchors.pl
@@ -21,13 +21,13 @@ our ($q, %Page, $FootnoteNumber, $FreeLinkPattern, @MyRules, $BracketWiki);
 push(@MyRules, \&AnchorsRule);

 sub AnchorsRule {
-  if (m/\G\[\[\#$FreeLinkPattern\]\]/cg) {
+  if (m/\G\[\[\#$FreeLinkPattern\]\]/gc) {
    return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $1);
-  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/cg) {
+  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/gc) {
    return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $2);
-  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cg
-	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cg
-	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cg) {
+  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cog
+	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cog
+	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cog) {
    # This one is not a dirty rule because the output is always a page
    # link, never an edit link (unlike normal free links).
    my $bracket = (substr($1, 0, 3) eq '[[[');
@@ -47,7 +47,7 @@ sub AnchorsRule {
    $text = $id unless $text;
    $text =~ s/_/ /g;
    return ScriptLink(UrlEncode($id), $text, $class, undef, $title);
-  } elsif (m/\G\[\:$FreeLinkPattern\]/cg) {
+  } elsif (m/\G\[\:$FreeLinkPattern\]/gc) {
    return $q->a({-name=>FreeToNormal($1), -class=>'anchor'}, '');
  }
  return;
--- a/modules/antispam.pl
+++ b/modules/antispam.pl
@@ -34,7 +34,7 @@ push(@MyRules, \&MaskEmailRule);

 sub MaskEmailRule {
 	# Allow [email@foo.bar Email Me] links
-	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/cgi) {
+	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/igc) {
 		my $chunk = $1;
 		$chunk =~ s/($EmailRegExp)//i;
 		my $email = $1;
@@ -51,7 +51,7 @@ sub MaskEmailRule {
 		return "<a href=\"mailto:$email\">$chunk</a>";
 	}

-	if (m/\G($EmailRegExp)/cgi) {
+	if (m/\G($EmailRegExp)/igc) {
 		my $email = $1;
 		if ($DoMaskEmail) {
 			my $masked="";
--- a/modules/askpage.pl
+++ b/modules/askpage.pl
@@ -20,7 +20,7 @@ AddModuleDescription('askpage.pl', 'Ask Page Extension');

 use Fcntl qw(:DEFAULT :flock);

-our ($DataDir, %Translate, @MyFooters);
+our ($DataDir);
 our ($AskPage, $QuestionPage, $NewQuestion);
 # Don't forget to set your $CommentsPattern to include both $AskPage and $QuestionPage
 $AskPage = 'Ask';
@@ -39,8 +39,8 @@ sub IncrementInFile {
  return $num;
 }

-*OldAskPageDoPost = \&DoPost;
-*DoPost = \&NewAskPageDoPost;
+*OldAskPageDoPost=\&DoPost;
+*DoPost=\&NewAskPageDoPost;
 sub NewAskPageDoPost {
  my $id = FreeToNormal(shift);
  if ($id eq $AskPage and not GetParam('text', undef)) { # comment, not a regular edit
@@ -51,18 +51,18 @@ sub NewAskPageDoPost {
  OldAskPageDoPost($id, @_); # keep original functionality for regular edits
 }

-*OldAskPageGetCommentForm = \&GetCommentForm;
-*GetCommentForm = \&NewAskPageGetCommentForm;
-@MyFooters = map { $_ == \&OldAskPageGetCommentForm ? \&NewAskPageGetCommentForm : $_ } @MyFooters;
-
-sub NewAskPageGetCommentForm {
-  my ($id) = @_;
-  $Translate{'Add your comment here:'} = $NewQuestion if $id eq $AskPage;
-  OldAskPageGetCommentForm(@_);
+*OldAskPageGetTextArea=\&GetTextArea;
+*GetTextArea=\&NewAskPageGetTextArea;
+sub NewAskPageGetTextArea {
+  my ($name, $text, @rest) = @_;
+  if ($name eq 'aftertext' and not $text and GetId() eq $AskPage) {
+    $text = $NewQuestion;
+  }
+  OldAskPageGetTextArea($name, $text, @rest);
 }

-*OldAskPageJournalSort = \&JournalSort;
-*JournalSort = \&NewAskPageJournalSort;
+*OldAskPageJournalSort=\&JournalSort;
+*JournalSort=\&NewAskPageJournalSort;
 sub NewAskPageJournalSort {
  return OldAskPageJournalSort() unless $a =~ m/^$QuestionPage\d+$/ and $b =~ m/^$QuestionPage\d+$/;
  ($b =~ m/$QuestionPage(\d+)/)[0] <=> ($a =~ m/$QuestionPage(\d+)/)[0];
--- a/modules/atom.pl
+++ b/modules/atom.pl
@@ -16,7 +16,6 @@
 use strict;
 use v5.10;

-use XML::Atom;
 use XML::Atom::Entry;
 use XML::Atom::Link;
 use XML::Atom::Person;
@@ -150,7 +149,7 @@ sub GetRcAtom {
 # Based on DoPost
 sub DoAtomSave {
  my ($type, $oldid) = @_;
-  my $entry = AtomEntry($type);
+  my $entry = AtomEntry();
  my $title = $entry->title();
  my $author = $entry->author();
  SetParam('username', $author->name) if $author; # Used in Save()
@@ -231,8 +230,15 @@ sub DoAtomGet {
 }

 sub AtomEntry {
-  my $type = shift || 'POST';
-  my $data = $q->param($type . 'DATA'); # PUTDATA or POSTDATA
+  my $data = $q->param('POSTDATA');
+  if (not $data) {
+    # CGI provides POSTDATA for POST requests, not for PUT requests.
+    # The following code is based on the CGI->init code.
+    my $content_length = defined($ENV{'CONTENT_LENGTH'}) ? $ENV{'CONTENT_LENGTH'} : 0;
+    if ($content_length > 0 and $content_length < $MaxPost) {
+      $q->read_from_client(\$data, $content_length, 0);
+    }
+  }
  my $entry = XML::Atom::Entry->new(\$data);
  return $entry;
 }
--- a/modules/autolock.pl
+++ b/modules/autolock.pl
@@ -175,7 +175,7 @@ sub UserCanEditAutoLockFix {
  return 0 if $LockOnCreation{$id} and not -f GetPageFile($id); # new page
  return 0 if !$EditAllowed or -f $NoEditFile;
  return 0 if $editing and UserIsBanned(); # this call is more expensive
-  return 0 if $EditAllowed >= 2 and (not $CommentsPrefix or $id !~ /^$CommentsPrefix/);
+  return 0 if $EditAllowed >= 2 and (not $CommentsPrefix or $id !~ /^$CommentsPrefix/o);
  return 1 if $EditAllowed >= 3 and ($comment or (GetParam('aftertext', '') and not GetParam('text', '')));
  return 0 if $EditAllowed >= 3;
  return 1;
--- a/modules/backlinkage.pl
+++ b/modules/backlinkage.pl
@@ -117,7 +117,7 @@ sub GetBackLink {
    foreach my $backlink (@backlinks) {
            my ($class, $resolved, $title, $exists) = ResolveId($backlink);
            if (($resolved ne $id) && ($resolved !~ /^($BacklinkBanned)$/)) {
-                push(@unpopped, ScriptLink(UrlEncode($resolved), $resolved, $class . ' backlink', undef, Ts('Internal Page: %s', $resolved)));
+                push(@unpopped, ScriptLink(UrlEncode($resolved), $resolved, $class . ' backlink', undef, T('Internal Page: ' . $resolved)));
            }
    }

--- a/modules/ban-contributors.pl
+++ b/modules/ban-contributors.pl
@@ -124,10 +124,10 @@ sub NewBanContributorsWriteRcLog {
      and $OpenPageName eq $id and UserIsAdmin()) {
    # we currently have the clean page loaded, so we need to reload
    # the spammed revision (there is a possible race condition here)
-    my $old = GetTextRevision($Page{revision} - 1, 1)->{text};
-    my %urls = map {$_ => 1 } $old =~ /$UrlPattern/g;
+    my ($old) = GetTextRevision($Page{revision}-1, 1);
+    my %urls = map {$_ => 1 } $old =~ /$UrlPattern/og;
    # we open the file again to force a load of the despammed page
-    foreach my $url ($Page{text} =~ /$UrlPattern/g) {
+    foreach my $url ($Page{text} =~ /$UrlPattern/og) {
      delete($urls{$url});
    }
    # we also remove any candidates that are already banned
@@ -153,7 +153,7 @@ sub NewBanContributorsWriteRcLog {
 		  $q->submit(T('Ban!'))),
 	    $q->end_form();
    };
-    print $q->p(T("Consider banning the IP number as well:"), ' ',
+    print $q->p(T("Consider banning the IP number as well: "),
 		ScriptLink('action=ban;id=' . UrlEncode($id), T('Ban contributors')));
  };
  return OldBanContributorsWriteRcLog(@_);
--- a/modules/bbcode.pl
+++ b/modules/bbcode.pl
@@ -61,12 +61,12 @@ sub bbCodeRule {
      return AddHtmlEnvironment('strong', qq{class="highlight"}); }
    elsif ($tag eq 'url') {
      if ($option) {
-	$option =~ /^($UrlProtocols)/;
+	$option =~ /^($UrlProtocols)/o;
 	my $class = "url $1";
 	return AddHtmlEnvironment('a', qq{href="$option" class="$class"}); }
-      elsif (/\G$FullUrlPattern\s*\[\/url\]/cgi) {
+      elsif (/\G$FullUrlPattern\s*\[\/url\]/cogi) {
 	return GetUrl($1); }}
-    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cgi) {
+    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cogi) {
      return GetUrl($1, undef, undef, 1); } # force image
    elsif ($tag eq 'quote') {
      my $html = CloseHtmlEnvironments();
--- a/modules/big-brother.pl
+++ b/modules/big-brother.pl
@@ -60,6 +60,7 @@ sub AddRecentVisitor {
  my $url = ScriptUrl(join(';', "action=$action;id=" . UrlEncode($id),
 			   map { $_ . '=' . UrlEncode(GetParam($_)) }
 			   keys %params));
+  my $url = $q->url(-path_info=>1,-query=>1);
  my $download = GetParam('action', 'browse') eq 'download'
    || GetParam('download', 0)
    || $q->path_info() =~ m/\/download\//;
--- a/modules/blockquote.pl
+++ b/modules/blockquote.pl
@@ -28,10 +28,10 @@ push(@MyRules, \&BlockQuoteRule);
 sub BlockQuoteRule {
  # indented text using : with the option of spanning multiple text
  # paragraphs (but not lists etc).
-  if (InElement('blockquote') && m/\G(\s*\n)+:[ \t]*/cg) {
+  if (InElement('blockquote') && m/\G(\s*\n)+:[ \t]*/cog) {
    return CloseHtmlEnvironmentUntil('blockquote')
      . AddHtmlEnvironment('p');
-  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cg) {
+  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cog) {
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment('blockquote')
      . AddHtmlEnvironment('p');
--- a/modules/calendar.pl
+++ b/modules/calendar.pl
@@ -74,7 +74,7 @@ sub Cal {
      $link .= ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
    }
    $link;
-  }}eg;
+  }}ge;
  $cal =~ s{(\S+) (\d\d\d\d)}{{
    my ($month_text, $year_text) = ($1, $2);
    my $date = sprintf("%d-%02d", $year, $mon);
@@ -118,22 +118,22 @@ sub DoCollect {
 push(@MyRules, \&CalendarRule);

 sub CalendarRule {
-  if (/\G(calendar:(\d\d\d\d))/cg) {
+  if (/\G(calendar:(\d\d\d\d))/gc) {
    my $oldpos = pos;
    Clean(CloseHtmlEnvironments());
    Dirty($1);
    PrintYearCalendar($2);
    pos = $oldpos;
    return AddHtmlEnvironment('p');
-  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/cg) {
+  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/gc) {
    my $oldpos = pos;
    Clean(CloseHtmlEnvironments());
    Dirty($1);
    print Cal($2, $3);
    pos = $oldpos;
    return AddHtmlEnvironment('p');
-  } elsif (/\G(month:([+-]\d\d?))/cg
-	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/cg) {
+  } elsif (/\G(month:([+-]\d\d?))/gc
+	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/gc) {
    my $oldpos = pos;
    Clean(CloseHtmlEnvironments());
    Dirty($1);
--- a/modules/checkbox.pl
+++ b/modules/checkbox.pl
@@ -77,7 +77,7 @@ sub DoCheckBox{
      $summary{$3} = 0 if $2 eq 'x' or $2 eq 'X';
      "${1}[[ :${3}]]";
    }
-  }egi;
+  }eig;
  SetParam('text', $text);
  SetParam('summary', join(', ', map {
    if ($summary{$_}) {
--- a/modules/clustermap.pl
+++ b/modules/clustermap.pl
@@ -62,7 +62,7 @@ foreach (@ClusterMapAdminPages){
 }

 sub ClusterMapRule {
-	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/cgm) {
+	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/mgc) {
 		Dirty($1);
 		my $oldpos = pos;
 		my $oldstr = $_;
--- a/modules/comment-div-wrapper.pl
+++ b/modules/comment-div-wrapper.pl
@@ -30,7 +30,7 @@ sub CommentDivWrapper {
      return $q->start_div({-class=>'userComment'});
    }
  }
-  if ($OpenPageName =~ /$CommentsPattern/) {
+  if ($OpenPageName =~ /$CommentsPattern/o) {
    if ($bol and m/\G(\s*\n)*----+[ \t]*\n?/cg) {
      my $html = CloseHtmlEnvironments()
 	  . ($CommentDiv++ > 0 ? $q->end_div() : $q->h2({-class=>'commentsHeading'}, T('Comments:'))) . $q->start_div({-class=>'userComment'})
--- a/modules/commentcount.pl
+++ b/modules/commentcount.pl
@@ -52,15 +52,15 @@ sub NewCommentcountScriptLink {
  if ($CommentsPrefix && $action =~ /^$CommentsPrefix(.*)/) { # TODO use $CommentsPattern ?
    # Add the number of comments here
    my $id = $action;
-    $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/eg; # undo urlencode
+    $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/ge; # undo urlencode
    my $comments = GetPageContent($id);
    my $num = 0;
    if($comments =~ /=== (\d+) Comments?\. ===/) {
      $num = $1;
    }
    # Fix plurals
-    my $plural = T('Comments on');
-    my $singular = T('Comment on');
+    my $plural = T('Comments on ');
+    my $singular = T('Comment on ');
    $text =~ s/$plural/$singular/ if($num == 1);
    $text = $num . ' ' . $text;
  }
--- a/modules/creole.pl
+++ b/modules/creole.pl
@@ -218,7 +218,7 @@ sub CreoleRule {
  }
  # escape next char (and prevent // in URLs from enabling italics)
  # ~
-  elsif (m/\G(~($FullUrlPattern|\S))/cg) {
+  elsif (m/\G(~($FullUrlPattern|\S))/cgo) {
    return
      ($CreoleTildeAlternative and
       index( 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -234,12 +234,12 @@ sub CreoleRule {
  # {{{preformatted code}}}
  elsif (m/\G\{\{\{(.*?}*)\}\}\}/cg) { return $q->code($1); }
  # download: {{pic}} and {{pic|text}}
-  elsif (m/\G(\{\{$FreeLinkPattern$CreoleLinkTextPattern\}\})/cgs) {
+  elsif (m/\G(\{\{$FreeLinkPattern$CreoleLinkTextPattern\}\})/cgos) {
    my $text = $4 || $2;
    return GetCreoleLinkHtml($1, GetDownloadLink(FreeToNormal($2), 1, undef, $text), $text);
  }
  # image link: {{url}} and {{url|text}}
-  elsif (m/\G\{\{$FullUrlPattern$CreoleLinkTextPattern\}\}/cgs) {
+  elsif (m/\G\{\{$FullUrlPattern$CreoleLinkTextPattern\}\}/cgos) {
    return GetCreoleImageHtml(
      $q->a({-href=> UnquoteHtml($1),
             -class=> 'image outside'},
@@ -250,7 +250,7 @@ sub CreoleRule {
  }
  # image link: [[link|{{pic}}]] and [[link|{{pic|text}}]]
  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkPipePattern
-              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
+              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
    my $text = $5 || $2;
    return GetCreoleLinkHtml($1, GetCreoleImageHtml(
      ScriptLink(UrlEncode(FreeToNormal($2)),
@@ -261,7 +261,7 @@ sub CreoleRule {
  }
  # image link: [[link|{{url}}]] and [[link|{{url|text}}]]
  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkPipePattern
-              \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
+              \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
    my $text = $5 || $2;
    return GetCreoleLinkHtml($1, GetCreoleImageHtml(
      ScriptLink(UrlEncode(FreeToNormal($2)),
@@ -272,7 +272,7 @@ sub CreoleRule {
  }
  # image link: [[url|{{pic}}]] and [[url|{{pic|text}}]]
  elsif (m/\G(\[\[$FullUrlPattern$CreoleLinkPipePattern
-              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
+              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
    my $text = $5 || $2;
    return GetCreoleLinkHtml($1, GetCreoleImageHtml(
      $q->a({-href=> UnquoteHtml($2), -class=> 'image outside'},
@@ -283,7 +283,7 @@ sub CreoleRule {
  }
  # image link: [[url|{{url}}]] and [[url|{{url|text}}]]
  elsif (m/\G\[\[$FullUrlPattern$CreoleLinkPipePattern
-             \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\]/cgsx) {
+             \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\]/cgosx) {
    return GetCreoleImageHtml(
      $q->a({-href=> UnquoteHtml($1), -class=> 'image outside'},
            $q->img({-src=> UnquoteHtml($2),
@@ -292,7 +292,7 @@ sub CreoleRule {
                     -class=> 'url outside'})));
  }
  # link: [[url]] and [[url|text]]
-  elsif (m/\G\[\[$FullUrlPattern$CreoleLinkTextPattern\]\]/cgs) {
+  elsif (m/\G\[\[$FullUrlPattern$CreoleLinkTextPattern\]\]/cgos) {
    # Permit embedding of Creole syntax within link text. (Rather complicated,
    # but it does the job remarkably.)
    my $link_url  = $1;
@@ -305,7 +305,7 @@ sub CreoleRule {
    return GetUrl($link_url, $link_text, 1);
  }
  # link: [[page]] and [[page|text]]
-  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkTextPattern\]\])/cgs) {
+  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkTextPattern\]\])/cgos) {
    my $markup =    $1;
    my $page_name = $2;
    my $link_text = $4 ? CreoleRuleRecursive($4, @_) : $page_name;
@@ -315,7 +315,7 @@ sub CreoleRule {
  }
  # interlink: [[Wiki:page]] and [[Wiki:page|text]]
  elsif ($is_interlinking and
-         m/\G(\[\[$FreeInterLinkPattern$CreoleLinkTextPattern\]\])/cgs) {
+         m/\G(\[\[$FreeInterLinkPattern$CreoleLinkTextPattern\]\])/cgos) {
    my $markup =    $1;
    my $interlink = $2;
    my $interlink_text = $4;
--- a/modules/crumbs.pl
+++ b/modules/crumbs.pl
@@ -28,8 +28,8 @@ $RuleOrder{\&CrumbsRule} = -10; # run before default rules!

 sub CrumbsRule {
  if (not (pos) # first!
-      and (($WikiLinks && /\G($LinkPattern\n)/cg)
-	   or ($FreeLinks && /\G(\[\[$FreeLinkPattern\]\]\n)/cg))) {
+      and (($WikiLinks && /\G($LinkPattern\n)/cgo)
+	   or ($FreeLinks && /\G(\[\[$FreeLinkPattern\]\]\n)/cgo))) {
    my $oldpos = pos; # will be trashed below
    my $cluster = FreeToNormal($2);
    my %seen = ($cluster => 1);
--- a/modules/despam.pl
+++ b/modules/despam.pl
@@ -133,14 +133,14 @@ sub DespamPage {
  # from DoHistory()
  my @revisions = sort {$b <=> $a} map { m|/([0-9]+).kp$|; $1; } GetKeepFiles($OpenPageName);
  foreach my $revision (@revisions) {
-    my ($revisionPage, $rev) = GetTextRevision($revision, 1); # quiet
+    my ($text, $rev) = GetTextRevision($revision, 1); # quiet
    if (not $rev) {
      print ': ' . Ts('Cannot find revision %s.', $revision);
      return;
-    } elsif (not DespamBannedContent($revisionPage->{text})) {
+    } elsif (not DespamBannedContent($text)) {
      my $summary = Tss('Revert to revision %1: %2', $revision, $rule);
      print ': ' . $summary;
-      Save($OpenPageName, $revisionPage->{text}, $summary) unless GetParam('debug', 0);
+      Save($OpenPageName, $text, $summary) unless GetParam('debug', 0);
      return;
    }
  }
--- a/modules/dojo.pl
+++ b/modules/dojo.pl
@@ -30,7 +30,7 @@ $DojoTheme = 'tundra';
 push (@MyRules, \&WysiwygRule);

 sub WysiwygRule {
-  if (m/\G(&lt;.*?&gt;)/cg) {
+  if (m/\G(&lt;.*?&gt;)/gc) {
    return $1 if substr($1,5,6) eq 'script'
      or substr($1,4,6) eq 'script';
    return UnquoteHtml($1);
--- a/modules/download.pl
+++ b/modules/download.pl
@@ -28,8 +28,8 @@ push( @MyRules, \&DownloadSupportRule );
 # [[download:page name|alternate title]]

 sub DownloadSupportRule {
-  if (m/\G(\[\[download:$FreeLinkPattern\|([^\]]+)\]\])/cg
-      or m!\G(\[\[download:$FreeLinkPattern\]\])!cg) {
+  if (m/\G(\[\[download:$FreeLinkPattern\|([^\]]+)\]\])/cog
+      or m!\G(\[\[download:$FreeLinkPattern\]\])!cog) {
    Dirty($1);
    print GetDownloadLink($2, undef, undef, $3);
    return '';
--- a/modules/drafts.pl
+++ b/modules/drafts.pl
@@ -48,10 +48,10 @@ sub DoDraft {
    SetParam('msg', T('Draft saved')); # invalidate cache
    print GetHttpHeader('', T('Draft saved'), '204 NO CONTENT');
  } elsif (-f $draft) {
-    my $data = ParseData(ReadFileOrDie($draft));
+    my %data = ParseData(ReadFileOrDie($draft));
    unlink ($draft);
    $Message .= $q->p(T('Draft recovered'));
-    DoEdit($data->{id}, $data->{text}, 1);
+    DoEdit($data{id}, $data{text}, 1);
  } else {
    ReportError(T('No draft available to recover'), '404 NOT FOUND');
  }
--- a/modules/edit-cluster.pl
+++ b/modules/edit-cluster.pl
@@ -18,7 +18,7 @@ use v5.10;

 AddModuleDescription('edit-cluster.pl', 'Edit Cluster Extension');

-our ($q, $FS, $RcDefault, @RcDays, $RecentTop, $LastUpdate, $ShowAll);
+our ($q, $FS, $RcDefault, @RcDays, $RecentTop, $LastUpdate);

 our $EditCluster = 'EditCluster';

@@ -34,7 +34,7 @@ sub GetRc {
    $changetime{$pagename} = $ts;
  }
  my $date = '';
-  my $all = GetParam('all', $ShowAll);
+  my $all = GetParam('all', 0);
  my ($idOnly, $userOnly, $hostOnly, $clusterOnly, $filterOnly, $match, $lang) =
    map { GetParam($_, ''); }
      ('rcidonly', 'rcuseronly', 'rchostonly', 'rcclusteronly',
@@ -128,7 +128,7 @@ sub EditClusterNewRcHeader {
    $action = "action=rc$action";
  }
  my $days = GetParam('days', $RcDefault);
-  my $all = GetParam('all', $ShowAll);
+  my $all = GetParam('all', 0);
  my @menu;
  if ($all) {
    push(@menu, ScriptLink("$action;days=$days;all=0",
--- a/modules/emailquote.pl
+++ b/modules/emailquote.pl
@@ -21,14 +21,14 @@ push(@MyRules, \&EmailQuoteRule);

 sub EmailQuoteRule {
    #  > on a line of its own should work
-    if ($bol && m/\G(\s*\n)*((\&gt;))+\n/cg) {
+    if ($bol && m/\G(\s*\n)*((\&gt;))+\n/cog) {
        return $q->p();
    }
    # > hi, you mentioned that:
    # >> I don't like Oddmuse.
    # > in last letter.
-    elsif ($bol && m/\G(\s*\n)*((\&gt;)+)[ \t]/cg
-           or InElement('dd') && m/\G(\s*\n)+((\&gt;)+)[ \t]/cg) {
+    elsif ($bol && m/\G(\s*\n)*((\&gt;)+)[ \t]/cog
+           or InElement('dd') && m/\G(\s*\n)+((\&gt;)+)[ \t]/cog) {
        my $leng = length($2) / 4;
        return CloseHtmlEnvironmentUntil('dd') . OpenHtmlEnvironment('dl',$leng, 'quote')
        . $q->dt() . AddHtmlEnvironment('dd');
--- a/modules/enclosure.pl
+++ b/modules/enclosure.pl
@@ -28,7 +28,7 @@ push(@MyRules, \&EnclosureRule);
 # [[enclosure:url|size in bytes|mime type]]

 sub EnclosureRule {
-  if (m!\G\[\[enclosure:\s*$FreeLinkPattern(\|([^\]]+))?\]\]!cgi) {
+  if (m!\G\[\[enclosure:\s*$FreeLinkPattern(\|([^\]]+))?\]\]!ogci) {
    my $id = FreeToNormal($1);
    # Make sure we don't add duplicates; we will add non-existing
    # enclosures as well. We test for existence only when the RSS feed
@@ -56,8 +56,8 @@ sub NewEnclosureRssItem {
  my $id = shift;
  my $rss = OldEnclosureRssItem($id, @_);
  require MIME::Base64;
-  my $data = ParseData(ReadFileOrDie(GetPageFile($id)));
-  my @enclosures = split(' ', $data->{enclosures});
+  my %data = ParseData(ReadFileOrDie(GetPageFile($id)));
+  my @enclosures = split(' ', $data{enclosures});
  my $enclosures = '';
  foreach my $enclosure (@enclosures) {
    # Don't add the enclosure if the page has been deleted in the mean
--- a/modules/faq.pl
+++ b/modules/faq.pl
@@ -38,10 +38,10 @@ $FaqAnswerText = "Answer: " unless $FaqAnswerText;
 push(@MyRules, \&FaqRule);

 sub FaqRule {
-  if ($bol && m/\GQ: (.+)/cg) {
+  if ($bol && m/\GQ: (.+)/gc) {
    return $q->a({name=>'FAQ_' . UrlEncode($1)},'')
      . $q->div({class=>'question'}, $FaqQuestionText . $1);
-  } elsif ($bol && m/\GA:[ \t]*/cg) {
+  } elsif ($bol && m/\GA:[ \t]*/gc) {
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment('div', "class='answer'") . $FaqAnswerText;
  }
--- a/modules/fckeditor.pl
+++ b/modules/fckeditor.pl
@@ -29,7 +29,7 @@ $FCKeditorHeight = 400; # Pixel
 push (@MyRules, \&WysiwygRule);

 sub WysiwygRule {
-  if (m/\G(&lt;.*?&gt;)/cg) {
+  if (m/\G(&lt;.*?&gt;)/gc) {
    return $1 if substr($1,5,6) eq 'script'
      or substr($1,4,6) eq 'script';
    return UnquoteHtml($1);
--- a/modules/flickrgallery.pl
+++ b/modules/flickrgallery.pl
@@ -66,7 +66,7 @@ $RuleOrder{\&FlickrGalleryRule} = -10;

 sub FlickrGalleryRule {
 	# This code is used when Markdown is not available
-	if (/\G^([\n\r]*\&lt;\s*FlickrSet:\s*(\d+)\s*\&gt;\s*)$/cgim) {
+	if (/\G^([\n\r]*\&lt;\s*FlickrSet:\s*(\d+)\s*\&gt;\s*)$/mgci) {
 		my $oldpos = pos;
 		my $oldstr = $_;

@@ -79,7 +79,7 @@ sub FlickrGalleryRule {
 		return '';
 	}

-	if (/\G^([\n\r]*\&lt;\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\&gt;\s*)$/cgim) {
+	if (/\G^([\n\r]*\&lt;\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\&gt;\s*)$/mgci) {
 		my $oldpos = pos;
 		my $oldstr = $_;

@@ -103,13 +103,13 @@ sub MarkdownFlickrGalleryRule {
 		^&lt;FlickrSet:\s*(\d+)\s*\>
 	}{
 		FlickrGallery($1);
-	}egimx;
+	}xmgei;

 	$text =~ s{
 		^&lt;FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\>
 	}{
 		GetFlickrPhoto($1,$2,$3);
-	}egimx;
+	}xmgei;

 	return $text
 }
@@ -135,7 +135,7 @@ sub FlickrGallery {

 	$result = $FlickrHeaderTemplate;

-	$result =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
+	$result =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;

 	# Get list of photos and process them
 	$url = $FlickrBaseUrl . "?method=flickr.photosets.getPhotos&api_key=" .
@@ -153,7 +153,7 @@ sub FlickrGallery {

 	my $footer = $FlickrFooterTemplate;

-	$footer =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
+	$footer =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
 	$result .= $footer;

 	return $result;
@@ -192,7 +192,7 @@ sub FlickrPhoto {


 	my $output = $FlickrImageTemplate;
-	$output =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
+	$output =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;

 	return $output
 }
--- a/modules/footnotes.pl
+++ b/modules/footnotes.pl
@@ -242,13 +242,13 @@ sub FootnotesRule {
  # Footnotes and the set of all footnotes must be marked so as to ensure their
  # reevaluation, as each of the footnotes might contain Wiki markup requiring
  # reevaluation (like, say, free links).
-  if (m/\G($FootnotePattern)(?=([ \t]*$FootnotePattern)?)/cgs) {
+  if (m/\G($FootnotePattern)(?=([ \t]*$FootnotePattern)?)/gcos) {
    Dirty($1);  # do not cache the prefixing "\G"
    my $footnote_text = $2;
    my $is_adjacent_footnote = defined $3;

    # A number range (e.g., "2-5") of references to other footnotes.
-    if ($footnote_text =~ m/^(\d+)-(\d+)$/) {
+    if ($footnote_text =~ m/^(\d+)-(\d+)$/o) {
      my ($footnote_number_first, $footnote_number_last) = ($1, $2);
      # '&#x2013;', below, is the HTML entity for a Unicode en-dash.
      print $q->a({-href=> '#footnotes' .$footnote_number_first,
@@ -261,7 +261,7 @@ sub FootnotesRule {
                  }, $footnote_number_last.($is_adjacent_footnote ? ', ' : ''));
    }
    # A number (e.g., "5") implying reference to another footnote.
-    elsif ($footnote_text =~ m/^(\d+)$/) {
+    elsif ($footnote_text =~ m/^(\d+)$/o) {
      my $footnote_number = $1;
      print $q->a({-href=> '#footnotes' .$footnote_number,
                   -title=> 'Footnote #'.$footnote_number,
@@ -285,7 +285,7 @@ sub FootnotesRule {
    return '';
  }
  # The "<footnotes>" list of all footnotes at the foot of a page.
-  elsif ($bol && m/\G($FootnotesPattern)/cgis) {
+  elsif ($bol && m/\G($FootnotesPattern)/gcios) {
    Clean(CloseHtmlEnvironments());
    Dirty($1);  # do not cache the prefixing "\G"

--- a/modules/forms.pl
+++ b/modules/forms.pl
@@ -19,9 +19,9 @@ sub FormsRule {
      my $oldpos = pos;
      Clean(CloseHtmlEnvironments());
      Dirty($form);
-      $form =~ s/\%([a-z]+)\%/GetParam($1)/eg;
+      $form =~ s/\%([a-z]+)\%/GetParam($1)/ge;
      $form =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-        .$q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+        .$q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
      print UnquoteHtml($form);
      pos = $oldpos;
      return AddHtmlEnvironment('p');
--- a/modules/gd_security_image.pl
+++ b/modules/gd_security_image.pl
@@ -240,9 +240,9 @@ sub GdSecurityImageCheck {
  if ($answer ne '' && GdSecurityImageIsValidId($id)) {
    my ($status, $data) = ReadFile(GdSecurityImageGetTicketFile($id));
    if ($status) {
-      my $page = ParseData($data);
-      if ($page->{generation_time} + $GdSecurityImageDuration > $Now) {
-        if ($answer eq $page->{string}) {
+      my %page = ParseData($data);
+      if ($page{generation_time} + $GdSecurityImageDuration > $Now) {
+        if ($answer eq $page{string}) {
          $GdSecurityImageId = '';
          if (!$GdSecurityImageRememberAnswer) {
            SetParam('gd_security_image_id', '');
--- a/modules/google-plus-one.pl
+++ b/modules/google-plus-one.pl
@@ -56,7 +56,7 @@ sub GooglePlusPrintFooter {
    return q{
 <!-- start of Google+ -->
 <script type="text/javascript">
-function loadScript(jssource) {
+function loadScript(jssource,link_id) {
   // add javascript
   var jsnode = document.createElement('script');
   jsnode.setAttribute('type','text/javascript');
@@ -66,24 +66,15 @@ function loadScript(jssource) {
   var butn = document.createElement('div');
   butn.setAttribute('class', 'g-plusone');
   butn.setAttribute('id', 'my_plusone');
-   var link = document.getElementById('plus1');
+   var link = document.getElementById(link_id);
   link.parentNode.insertBefore(butn, link);
   // hide the link
   link.innerHTML = "";
-   // when looking at action=plusone
-   var ul = document.getElementById('plus1s');
-   var children = ul.children;
-   for (var i = 0; i < children.length; i++) {
-     var li = children[i];
-     butn = document.createElement('g:plusone');
-     butn.setAttribute('href', li.firstElementChild.getAttribute('href'));
-     butn.setAttribute('id', 'my_plusone' + i);
-     li.appendChild(butn);
-   }
 }
+ var plus1source = "https://apis.google.com/js/plusone.js";
 </script>
 <p id="plus1">
-  <a href="javascript:loadScript('https://apis.google.com/js/plusone.js')">
+  <a href="javascript:loadScript(plus1source,'plus1')">
    <img src="/pics/plusone-h24.png" alt="Show Google +1" />
  </a>
 </p>
@@ -112,9 +103,11 @@ sub DoPlusOne {
    push(@pages, $id) if $id =~ /^\d\d\d\d-\d\d-\d\d/;
  }
  splice(@pages, 0, $#pages - 19); # last 20 items
-  print '<ul id="plus1s">';
+  print "<ul>";
  foreach my $id (@pages) {
-    print $q->li(GetPageLink($id), ' ');
+    my $url = ScriptUrl(UrlEncode($id));
+    print $q->li(GetPageLink($id),
+                qq{ <g:plusone href="$url"></g:plusone>});
  }
  print "</ul>";
  print $q->end_div();
--- a/modules/gotobar.pl
+++ b/modules/gotobar.pl
@@ -39,7 +39,7 @@ sub GotobarInit {
    @UserGotoBarPages = ();
    $UserGotoBar = '';
    my $count = 0;
-    while ($Page{text} =~ m/($LinkPattern|\[\[$FreeLinkPattern\]\]|\[\[$FreeLinkPattern\|([^\]]+)\]\]|\[$InterLinkPattern\s+([^\]]+?)\]|\[$FullUrlPattern[|[:space:]]([^\]]+?)\])/g) {
+    while ($Page{text} =~ m/($LinkPattern|\[\[$FreeLinkPattern\]\]|\[\[$FreeLinkPattern\|([^\]]+)\]\]|\[$InterLinkPattern\s+([^\]]+?)\]|\[$FullUrlPattern[|[:space:]]([^\]]+?)\])/og) {
      my $page = $2||$3||$4||$6||$8;
      my $text = $5||$7||$9;
      $UserGotoBar .= ' ' if $UserGotoBar;
--- a/modules/gravatar.pl
+++ b/modules/gravatar.pl
@@ -29,7 +29,7 @@ my $gravatar_regexp = "\\[\\[gravatar:(?:$FullUrlPattern )?([^\n:]+):([0-9a-f]+)
 push(@MyRules, \&GravatarRule);

 sub GravatarRule {
-  if ($bol && m!\G$gravatar_regexp!cg) {
+  if ($bol && m!\G$gravatar_regexp!cog) {
    my $url = $1;
    my $gravatar = "https://secure.gravatar.com/avatar/$3";
    my $name = FreeToNormal($2);
@@ -53,7 +53,7 @@ sub GravatarFormAddition {
  return $html unless $type eq 'comment';

  my $addition = $q->span({-class=>'mail'},
-			  $q->label({-for=>'mail'}, T('Email:') . ' ')
+			  $q->label({-for=>'mail'}, T('Email: '))
 			  . ' ' . $q->textfield(-name=>'mail', -id=>'mail',
 						-default=>GetParam('mail', '')));
  $html =~ s!(name="homepage".*?)</p>!$1 $addition</p>!i;
@@ -90,6 +90,6 @@ sub AddGravatar {

 sub GravatarNewGetSummary {
  my $summary = GravatarOldGetSummary(@_);
-  $summary =~ s/^$gravatar_regexp *//;
+  $summary =~ s/^$gravatar_regexp *//o;
  return $summary;
 }
--- a/modules/grep.pl
+++ b/modules/grep.pl
@@ -45,7 +45,7 @@ sub PrintGrep {
  foreach my $id (AllPagesList()) {
    my $text = GetPageContent($id);
    next if (TextIsFile($text)); # skip files
-    while ($text =~ m{($regexp)}gi) {
+    while ($text =~ m{($regexp)}ig) {
      print $q->li(GetPageLink($id) . ': ' . $1);
    }
  }
--- a/modules/headers.pl
+++ b/modules/headers.pl
@@ -41,7 +41,7 @@ $RuleOrder{\&HeadersRule} = 95;

 sub HeadersRule {
  my $oldpos = pos;
-  if ($bol && (m/\G((.+?)[ \t]*\n(---+|===+)[ \t]*\n)/cg)) {
+  if ($bol && (m/\G((.+?)[ \t]*\n(---+|===+)[ \t]*\n)/gc)) {
    my $html = CloseHtmlEnvironments() . ($PortraitSupportColorDiv ? '</div>' : '');
    if (substr($3,0,1) eq '=') {
      $html .= $q->h2($2);
--- a/modules/headlines.pl
+++ b/modules/headlines.pl
@@ -32,7 +32,7 @@ push(@MyRules, \&HeadlinesRule);
 $HeadlineNumber = 20;

 sub HeadlinesRule {
-  if (m/\G(\&lt;headlines(:(\d+))?\&gt;)/cgi) {
+  if (m/\G(\&lt;headlines(:(\d+))?\&gt;)/gci) {
    if (($3) and ($3>0)) {$HeadlineNumber = $3;};
    Clean(CloseHtmlEnvironments());
    Dirty($1);
--- a/modules/hibernal.pl
+++ b/modules/hibernal.pl
@@ -1212,7 +1212,7 @@ sub GetHibernalArchiveMonth {
  ~e;
  $html_month =~ s~( {1,2})(\d{1,2})\b~
    $1.GetHibernalArchiveMonthDay($post_name_regexp, $year, $month, $2)
-  ~eg;
+  ~ge;

  # Float the HTML for each month horizontally past the month preceding it;
  # failure to float months in this manner causes these months to stack
--- a/modules/image.pl
+++ b/modules/image.pl
@@ -32,7 +32,7 @@ push(@MyRules, \&ImageSupportRule);

 sub ImageSupportRule {
  my $result = undef;
-  if (m!\G\[\[image((/[a-z]+)*)( external)?:\s*([^]|]+?)\s*(\|[^]|]+?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*\]\](\{([^}]+)\})?!cg) {
+  if (m!\G\[\[image((/[a-z]+)*)( external)?:\s*([^]|]+?)\s*(\|[^]|]+?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*\]\](\{([^}]+)\})?!gc) {
    my $oldpos = pos;
    my $class = 'image' . $1;
    my $external = $3;
--- a/modules/irc.pl
+++ b/modules/irc.pl
@@ -33,7 +33,7 @@ $IrcLinkNick = 0;
 # This adds an extra <br> at the beginning.  Alternatively, add it to
 # the last line, or only add it when required.
 sub IrcRule {
-  if ($bol && m/\G(?:\[?(\d\d?:\d\d(?:am|pm)?)\]?)?\s*&lt;($IrcNickRegexp)&gt; ?/cg) {
+  if ($bol && m/\G(?:\[?(\d\d?:\d\d(?:am|pm)?)\]?)?\s*&lt;($IrcNickRegexp)&gt; ?/gc) {
    my ($time, $nick) = ($1, $2);
    my ($error) = ValidId($nick);
    # if we're in a dl, close the open dd but not the dl.  (if we're
--- a/modules/joiner.pl
+++ b/modules/joiner.pl
@@ -149,7 +149,7 @@ sub JoinerGetPasswordHash {
 sub JoinerRequestLockOrError {
  my ($name) = @_;
  # 10 tries, 3 second wait, die on error
-  return RequestLockDir($name, 10, 3, 1);
+  return RequestLockDir($name, 0, 10, 3, 1);
 }

 sub JoinerGetEmailFile {
@@ -174,17 +174,18 @@ sub JoinerCreateAccount {
  }

  my ($email_status, $email_data) = ReadFile(JoinerGetEmailFile($email));
+  my %email_page = ();
  if ($email_status) {
-    my $email_page = ParseData($email_data);
-    if ($email_page->{confirmed}) {
+    %email_page = ParseData($email_data);
+    if ($email_page{confirmed}) {
      return Ts('The email address %s has already been used.', $email);
    }
-    if ($email_page->{registration_time} + $JoinerWait > $Now) {
-      my $min = 1 + int(($email_page->{registration_time} + $JoinerWait - $Now) / 60);
+    if ($email_page{registration_time} + $JoinerWait > $Now) {
+      my $min = 1 + int(($email_page{registration_time} + $JoinerWait - $Now) / 60);
      return Ts('Wait %s minutes before try again.', $min);
    }
  }
-  my %email_page = ();
+  %email_page = ();
  $email_page{username} = $username;
  $email_page{email} = $email;
  $email_page{confirmed} = 0;
@@ -214,7 +215,7 @@ sub JoinerSendRegistrationConfirmationEmail {
  print $EMAIL "From: $JoinerEmailSenderAddress\n";
  print $EMAIL "Subject: $SiteName " . T('Registration Confirmation') . "\n";
  print $EMAIL "\n";
-  print $EMAIL T('Visit the link below to confirm registration.') . "\n";
+  print $EMAIL T('Visit the link blow to confirm registration.') . "\n";
  print $EMAIL "\n";
  print $EMAIL "$link\n";
  print $EMAIL "\n";
@@ -467,37 +468,37 @@ sub JoinerDoConfirmRegistration {
    JoinerShowRegistrationConfirmationFailed();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);

-  if ($key ne $page->{key}) {
+  if ($key ne $page{key}) {
    $JoinerMessage = T('Invalid key.');
    JoinerShowRegistrationConfirmationFailed();
    return;
  }

-  if ($page->{registration_time} + $JoinerWait < $Now) {
+  if ($page{registration_time} + $JoinerWait < $Now) {
    $JoinerMessage = T('The key expired.');
    JoinerShowRegistrationConfirmationFailed();
    return;
  }

-  $page->{key} = '';
-  $page->{confirmed} = 1;
+  $page{key} = '';
+  $page{confirmed} = 1;
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

-  my $email = $page->{email};
+  my $email = $page{email};
  JoinerRequestLockOrError('joiner');
  my ($email_status, $email_data) = ReadFile(JoinerGetEmailFile($email));
  ReleaseLockDir('joiner');
  if ($email_status) {
-    my $email_page = ParseData($email_data);
-    $email_page->{confirmed} = 1;
+    my %email_page = ParseData($email_data);
+    $email_page{confirmed} = 1;
    JoinerRequestLockOrError('joiner');
    CreateDir($JoinerEmailDir);
-    WriteStringToFile(JoinerGetEmailFile($email), EncodePage(%$email_page));
+    WriteStringToFile(JoinerGetEmailFile($email), EncodePage(%email_page));
    ReleaseLockDir('joiner');
  }

@@ -569,41 +570,41 @@ sub JoinerDoProcessLogin {
    JoinerDoLogin();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);
  my $hash = JoinerGetPasswordHash($password);
-  if ($hash eq $page->{password}) {
-    $page->{recover} = 0;
+  if ($hash eq $page{password}) {
+    $page{recover} = 0;
    SetParam('joiner_recover', 0);
-  } elsif ($key ne '' && $key eq $page->{recover_key}) {
-    if ($page->{recover_time} + $JoinerWait < $Now) {
+  } elsif ($key ne '' && $key eq $page{recover_key}) {
+    if ($page{recover_time} + $JoinerWait < $Now) {
      $JoinerMessage = T('The key expired.');
      JoinerDoLogin();
      return;
    }
-    $page->{recover} = 1;
+    $page{recover} = 1;
    SetParam('joiner_recover', 1);
  } else {
    $JoinerMessage = T('Login failed.');
    JoinerDoLogin();
    return;
  }
-  if ($page->{banned}) {
+  if ($page{banned}) {
    $JoinerMessage = T('You are banned.');
    JoinerDoLogin();
    return;
  }

-  if (!$page->{confirmed}) {
+  if (!$page{confirmed}) {
    $JoinerMessage = T('You must confirm email address.');
    JoinerDoLogin();
    return;
  }

  my $session = Digest::MD5::md5_hex(rand());
-  $page->{session} = $session;
+  $page{session} = $session;
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  SetParam('username', $username);
@@ -616,7 +617,7 @@ sub JoinerDoProcessLogin {
  print Ts('%s has logged in.', $username);
  print $q->end_p();

-  if ($page->{recover}) {
+  if ($page{recover}) {
    print $q->start_p();
    print T('You should set new password immediately.');
    print $q->end_p();
@@ -734,9 +735,9 @@ sub JoinerDoProcessChangePassword {
    JoinerDoChangePassword();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);
  my $hash = JoinerGetPasswordHash($current_password);
-  if (!$page->{recover} && $hash ne $page->{password}) {
+  if (!$page{recover} && $hash ne $page{password}) {
    $JoinerMessage = T('Current Password:') . ' ' . T('Password is wrong.');
    JoinerDoChangePassword();
    return;
@@ -753,12 +754,12 @@ sub JoinerDoProcessChangePassword {
    return;
  }

-  $page->{password} = JoinerGetPasswordHash($new_password);
-  $page->{key} = '';
-  $page->{recover} = '';
+  $page{password} = JoinerGetPasswordHash($new_password);
+  $page{key} = '';
+  $page{recover} = '';
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  SetParam('joiner_recover', 0);
@@ -822,9 +823,9 @@ sub JoinerDoProcessForgotPassword {
    JoinerDoForgotPassword();
    return;
  }
-  my $email_page = ParseData($email_data);
+  my %email_page = ParseData($email_data);

-  my $username = $email_page->{username};
+  my $username = $email_page{username};
  JoinerRequestLockOrError('joiner');
  my ($status, $data) = ReadFile(JoinerGetAccountFile($username));
  ReleaseLockDir('joiner');
@@ -833,27 +834,27 @@ sub JoinerDoProcessForgotPassword {
    JoinerDoForgotPassword();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);

-  if ($email ne $page->{email}) {
+  if ($email ne $page{email}) {
    $JoinerMessage = T('The mail address is not valid anymore.');
    JoinerDoForgotPassword();
    return;
  }

-  if ($page->{recover_time} + $JoinerWait > $Now) {
-    my $min = 1 + int(($page->{recover_time} + $JoinerWait - $Now) / 60);
+  if ($page{recover_time} + $JoinerWait > $Now) {
+    my $min = 1 + int(($page{recover_time} + $JoinerWait - $Now) / 60);
    $JoinerMessage = Ts('Wait %s minutes before try again.', $min);
    JoinerDoForgotPassword();
    return;
  }

  my $key = Digest::MD5::md5_hex($JoinerGeneratorSalt . rand());
-  $page->{recover_time} = $Now;
-  $page->{recover_key} = $key;
+  $page{recover_time} = $Now;
+  $page{recover_key} = $key;
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  JoinerSendRecoverAccountEmail($email, $username, $key);
@@ -921,8 +922,8 @@ sub JoinerDoProcessChangeEmail {
  my ($email_status, $email_data) = ReadFile(JoinerGetEmailFile($email));
  ReleaseLockDir('joiner');
  if ($email_status) {
-    my $email_page = ParseData($email_data);
-    if ($email_page->{confirmed} && $email_page->{username} ne $username) {
+    my %email_page = ParseData($email_data);
+    if ($email_page{confirmed} && $email_page{username} ne $username) {
      $JoinerMessage = T('Email:') . ' ' .
        Ts('The email address %s has already been used.', $email);
      JoinerDoChangeEmail();
@@ -938,29 +939,29 @@ sub JoinerDoProcessChangeEmail {
    JoinerDoChangeEmail();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);

-  if ($page->{change_email_time} + $JoinerWait > $Now) {
-    my $min = 1 + int(($page->{change_email_time} + $JoinerWait - $Now) / 60);
+  if ($page{change_email_time} + $JoinerWait > $Now) {
+    my $min = 1 + int(($page{change_email_time} + $JoinerWait - $Now) / 60);
    $JoinerMessage = Ts('Wait %s minutes before try again.', $min);
    JoinerDoChangeEmail();
    return;
  }

  my $hash = JoinerGetPasswordHash($password);
-  if ($hash ne $page->{password}) {
+  if ($hash ne $page{password}) {
    $JoinerMessage = T('Password:') . ' ' . T('Password is wrong.');
    JoinerDoChangeEmail();
    return;
  }

  my $key = Digest::MD5::md5_hex(rand());
-  $page->{change_email} = $email;
-  $page->{change_email_key} = $key;
-  $page->{change_email_time} = $Now;
+  $page{change_email} = $email;
+  $page{change_email_key} = $key;
+  $page{change_email_time} = $Now;
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  JoinerSendChangeEmailEmail($email, $username, $key);
@@ -1011,22 +1012,22 @@ sub JoinerDoConfirmEmail {
    JoinerShowConfirmEmailFailed();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);

-  if ($key ne $page->{change_email_key}) {
+  if ($key ne $page{change_email_key}) {
    $JoinerMessage = T('Invalid key.');
    JoinerShowConfirmEmailFailed();
    return;
  }

-  my $new_email = $page->{change_email};
-  $page->{email} = $new_email;
-  $page->{change_email} = '';
-  $page->{change_email_key} = '';
-  $page->{change_email_time} = '';
+  my $new_email = $page{change_email};
+  $page{email} = $new_email;
+  $page{change_email} = '';
+  $page{change_email_key} = '';
+  $page{change_email_time} = '';
  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  my %email_page = ();
@@ -1127,30 +1128,30 @@ sub JoinerDoProcessBan {
    JoinerDoBan();
    return;
  }
-  my $page = ParseData($data);
+  my %page = ParseData($data);

  if ($ban) {
-    if ($page->{banned}) {
+    if ($page{banned}) {
      $JoinerMessage = Ts('%s is already banned.', $username);
      JoinerDoBan();
      return;
    }
-    $page->{banned} = 1;
-    $page->{session} = '';
+    $page{banned} = 1;
+    $page{session} = '';
    $JoinerMessage = Ts('%s has been banned.', $username);
  } else {
-    if (!$page->{banned}) {
+    if (!$page{banned}) {
      $JoinerMessage = Ts('%s is not banned.', $username);
      JoinerDoBan();
      return;
    }
-    $page->{banned} = 0;
+    $page{banned} = 0;
    $JoinerMessage = Ts('%s has been unbanned.', $username);
  }

  JoinerRequestLockOrError('joiner');
  CreateDir($JoinerDir);
-  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%$page));
+  WriteStringToFile(JoinerGetAccountFile($username), EncodePage(%page));
  ReleaseLockDir('joiner');

  JoinerDoBan();
@@ -1177,16 +1178,16 @@ sub JoinerIsLoggedIn {
    $JoinerLoggedIn = 0;
    return $JoinerLoggedIn;
  }
-  my $page = ParseData($data);
-  if (!$page->{confirmed}) {
+  my %page = ParseData($data);
+  if (!$page{confirmed}) {
    $JoinerLoggedIn = 0;
    return $JoinerLoggedIn;
  }
-  if ($session ne $page->{session}) {
+  if ($session ne $page{session}) {
    $JoinerLoggedIn = 0;
    return $JoinerLoggedIn;
  }
-  if ($page->{banned}) {
+  if ($page{banned}) {
    $JoinerLoggedIn = 0;
    return $JoinerLoggedIn;
  }
--- a/modules/lang.pl
+++ b/modules/lang.pl
@@ -33,7 +33,7 @@ our ($q, @HtmlStack, @MyRules, $FullUrl);
 push(@MyRules, \&LangRule);

 sub LangRule {
-  if  (m/\G\[([a-z][a-z])\]/cg) {
+  if  (m/\G\[([a-z][a-z])\]/gc) {
    my $html;
    $html .= "</" . shift(@HtmlStack) . ">"  if $HtmlStack[0] eq 'span';
    return $html . AddHtmlEnvironment('span', "lang=\"$1\"") . "[$1]";
--- a/modules/latex.pl
+++ b/modules/latex.pl
@@ -98,7 +98,7 @@ EOT
 push(@MyRules, \&LatexRule);

 sub LatexRule {
-  if (m/\G\\\[(\(.*?\))?((.*\n)*?.*?)\\\]/cg) {
+  if (m/\G\\\[(\(.*?\))?((.*\n)*?.*?)\\\]/gc) {
    my $label = $1;
    my $latex = $2;
    $label =~ s#\(?\)?##g;# Remove the ()'s from the label and convert case
@@ -106,13 +106,13 @@ sub LatexRule {
    $eqCounter++;
    $eqHash{$label} = $eqCounter;
    return &MakeLaTeX("\\begin{displaymath} $latex \\end{displaymath}", "display math",$label);
-  } elsif (m/\G\$\$((.*\n)*?.*?)\$\$/cg) {
+  } elsif (m/\G\$\$((.*\n)*?.*?)\$\$/gc) {
    return &MakeLaTeX("\$\$ $1 \$\$", $LatexSingleDollars ? "display math" : "inline math");
-  } elsif ($LatexSingleDollars and m/\G\$((.*\n)*?.*?)\$/cg) {
+  } elsif ($LatexSingleDollars and m/\G\$((.*\n)*?.*?)\$/gc) {
    return &MakeLaTeX("\$ $1 \$", "inline math");
-  } elsif ($allowPlainLaTeX && m/\G\$\[((.*\n)*?.*?)\]\$/cg) { #Pick up plain LaTeX commands
+  } elsif ($allowPlainLaTeX && m/\G\$\[((.*\n)*?.*?)\]\$/gc) { #Pick up plain LaTeX commands
    return &MakeLaTeX(" $1 ", "LaTeX");
-  } elsif (m/\GEQ\((.*?)\)/cg) { # Handle references to equations
+  } elsif (m/\GEQ\((.*?)\)/gc) { # Handle references to equations
    my $label = $1;
    $label =~ tr/A-Z/a-z/;
    if ($eqHash{$label}) {
@@ -166,7 +166,7 @@ sub MakeLaTeX {
      close $F;
    }
    my $template = ReadFileOrDie($LatexDefaultTemplateName);
-    $template =~ s/<math>/$latex/gi;
+    $template =~ s/<math>/$latex/ig;
    #setup rendering directory
    my $dir = "$LatexDir/$hash";
    if (-d $dir) {
--- a/modules/link-all.pl
+++ b/modules/link-all.pl
@@ -23,7 +23,7 @@ push(@MyRules, \&LinkAllRule);
 $RuleOrder{\&LinkAllRule} = 1000;

 sub LinkAllRule {
-  if (/\G([A-Za-z\x{0080}-\x{fffd}]+)/cg) {
+  if (/\G([A-Za-z\x{0080}-\x{fffd}]+)/gc) {
    my $oldpos = pos;
    Dirty($1);
    # print the word, or the link to the word
--- a/modules/links.pl
+++ b/modules/links.pl
@@ -71,31 +71,31 @@ sub GetLinkList { # for the currently open page
  my %links;
  foreach my $block (@blocks) {
    if (shift(@flags)) {  # dirty block and interlinks or normal links
-      if ($inter and ($BracketText && $block =~ m/^(\[$InterLinkPattern\s+([^\]]+?)\])$/
-		      or $BracketText && $block =~ m/^(\[\[$FreeInterLinkPattern\|([^\]]+?)\]\])$/
-		      or $block =~ m/^(\[$InterLinkPattern\])$/
-		      or $block =~ m/^(\[\[\[$FreeInterLinkPattern\]\]\])$/
-		      or $block =~ m/^($InterLinkPattern)$/
-		      or $block =~ m/^(\[\[$FreeInterLinkPattern\]\])$/)) {
+      if ($inter and ($BracketText && $block =~ m/^(\[$InterLinkPattern\s+([^\]]+?)\])$/o
+		      or $BracketText && $block =~ m/^(\[\[$FreeInterLinkPattern\|([^\]]+?)\]\])$/o
+		      or $block =~ m/^(\[$InterLinkPattern\])$/o
+		      or $block =~ m/^(\[\[\[$FreeInterLinkPattern\]\]\])$/o
+		      or $block =~ m/^($InterLinkPattern)$/o
+		      or $block =~ m/^(\[\[$FreeInterLinkPattern\]\])$/o)) {
 	$links{$raw ? $2 : GetInterLink($2, $3)} = 1 if $InterSite{substr($2,0,index($2, ':'))};
      } elsif ($link
-	       and (($WikiLinks and $block !~ m/!$LinkPattern/
-		     and ($BracketWiki && $block =~ m/^(\[$LinkPattern\s+([^\]]+?)\])$/
-			  or $block =~ m/^(\[$LinkPattern\])$/
-			  or $block =~ m/^($LinkPattern)$/))
+	       and (($WikiLinks and $block !~ m/!$LinkPattern/o
+		     and ($BracketWiki && $block =~ m/^(\[$LinkPattern\s+([^\]]+?)\])$/o
+			  or $block =~ m/^(\[$LinkPattern\])$/o
+			  or $block =~ m/^($LinkPattern)$/o))
 		    or ($FreeLinks
-			and ($BracketWiki && $block =~ m/^(\[\[$FreeLinkPattern\|([^\]]+)\]\])$/
-			     or $block =~ m/^(\[\[\[$FreeLinkPattern\]\]\])$/
-			     or $block =~ m/^(\[\[$FreeLinkPattern\]\])$/)))) {
+			and ($BracketWiki && $block =~ m/^(\[\[$FreeLinkPattern\|([^\]]+)\]\])$/o
+			     or $block =~ m/^(\[\[\[$FreeLinkPattern\]\]\])$/o
+			     or $block =~ m/^(\[\[$FreeLinkPattern\]\])$/o)))) {
 	$links{$raw ? FreeToNormal($2) : GetPageOrEditLink($2, $3)} = 1;
-      } elsif ($url and $block =~ m/^\[$FullUrlPattern\]$/g) {
+      } elsif ($url and $block =~ m/^\[$FullUrlPattern\]$/og) {
 	$links{$raw ? $1 : GetUrl($1)} = 1;
      }
    } elsif ($url) {		# clean block and url
-      while ($block =~ m/$UrlPattern/g) {
+      while ($block =~ m/$UrlPattern/og) {
 	$links{$raw ? $1 : GetUrl($1)} = 1;
      }
-      while ($block =~ m/\[$FullUrlPattern\s+[^\]]+?\]/g) {
+      while ($block =~ m/\[$FullUrlPattern\s+[^\]]+?\]/og) {
 	$links{$raw ? $1 : GetUrl($1)} = 1;
      }
    }
--- a/modules/linktagmap.pl
+++ b/modules/linktagmap.pl
@@ -52,7 +52,7 @@ push (@MyRules, \&LinkTagRule, \&LinkDescriptionRule);

 sub LinkTagRule { # Process link tags on a page

-    if ( m/\G$LinkTagMark(.*?)$LinkTagMark/cg) {      # find tags
+    if ( m/\G$LinkTagMark(.*?)$LinkTagMark/gc) {      # find tags
        my @linktags = split /,\s*/, $1;              # push them in array
        @linktags = map {                             # and generate html output:
            qq{<a href="$ScriptName?action=linktagsearch;linktag=$_">$_</a>};  # each tag is a link to search all links with that tag
@@ -66,7 +66,7 @@ sub LinkTagRule { # Process link tags on a page

 sub LinkDescriptionRule { # Process link descriptions on a page

-    if ( m/\G$LinkDescMark(.*?)$LinkDescMark/cg) {          # find description
+    if ( m/\G$LinkDescMark(.*?)$LinkDescMark/gc) {          # find description
        return qq{<span class="$LinkDescClass">$1</span>};  # put it in SPAN block
    }
    return;
@@ -184,7 +184,7 @@ sub PrintLinkTagMap {
        my $tag = $1;

        "<li id=\"$tag\">$tag</li>\n<ul>";
-    }egsx;
+    }xsge;

    $result =~ s/\<\/tag\>/<\/ul>/g;
    $result =~ s{
@@ -194,7 +194,7 @@ sub PrintLinkTagMap {
        my $name = $2; if ( length $name == 0 ) { $name = $url; }   # name (if not present use url instead)
        my $description = $3;                                       # and description
        "<li><a href=\"$url\">$name</a> <span class=\"$LinkDescClass\">$description</span></li>";
-    }egsx;
+    }xsge;
    print $result;

 }
--- a/modules/list-banned-content.pl
+++ b/modules/list-banned-content.pl
@@ -39,7 +39,7 @@ sub DoListBannedContent {
  print $BannedRegexps . ': ' . scalar(keys(%text_regexps)) . $q->br() . "\n";
 PAGE: foreach my $id (@pages) {
    OpenPage($id);
-    my @urls = $Page{text} =~ /$FullUrlPattern/g;
+    my @urls = $Page{text} =~ /$FullUrlPattern/go;
    foreach my $url (@urls) {
      foreach my $re (keys %url_regexps) {
 	if ($url =~ $re) {
--- a/modules/listtags.pl
+++ b/modules/listtags.pl
@@ -31,7 +31,7 @@ $TagListLabel = "tag:";
 push(@MyRules, \&ListTagRule);

 sub ListTagRule {
-  if ($bol && /\G(\[\[\!tag\s*(.+)\]\])/cg) {
+  if ($bol && /\G(\[\[\!tag\s*(.+)\]\])/gc) {
    my $tag_text = $2;
    my @tags = split /,\s*/, $tag_text;
    @tags = map {
--- a/modules/live-templates.pl
+++ b/modules/live-templates.pl
@@ -26,7 +26,7 @@ our ($q, $bol, @MyRules, $FreeLinkPattern);
 push(@MyRules, \&LiveTemplateRule);

 sub LiveTemplateRule {
-  if ($bol and /\G(&lt;&lt;$FreeLinkPattern\n)/cg) {
+  if ($bol and /\G(&lt;&lt;$FreeLinkPattern\n)/cog) {
    Clean(CloseHtmlEnvironments());
    my $str = $1;
    my $template = FreeToNormal($2);
@@ -35,12 +35,12 @@ sub LiveTemplateRule {
    Dirty($str);
    my $oldpos = pos;
    my $old_ = $_;
-    my $hash = ParseData($2);
+    my %hash = ParseData($2);
    my $text = GetPageContent($template);
    return $q->p($q->strong(Ts('The template %s is either empty or does not exist.',
 			       $template))) . AddHtmlEnvironment('p') unless $text;
-    foreach my $key (keys %$hash) {
-      $text =~ s/\$$key\$/$hash->{$key}/g;
+    foreach my $key (keys %hash) {
+      $text =~ s/\$$key\$/$hash{$key}/g;
    }
    print "<div class=\"template $template\">";
    ApplyRules(QuoteHtml($text), 1, 1, undef, 'p');
--- a/modules/load-lang.pl
+++ b/modules/load-lang.pl
@@ -18,38 +18,32 @@ use v5.10;

 AddModuleDescription('load-lang.pl', 'Language Browser Preferences');

-our ($q, %CookieParameters, $ConfigFile, $DataDir, $ModuleDir, $NamespaceCurrent, @MyInitVariables);
-our $CurrentLanguage;
-
-our $LoadLanguageDir = "$ModuleDir/translations"; # by default same as in git
+our ($q, %CookieParameters, $ConfigFile, $DataDir, $NamespaceCurrent, @MyInitVariables);
+our ($CurrentLanguage, $LoadLanguageDir);

 $CookieParameters{interface} = '';

-our %TranslationsLibrary = (
-  'bg'    => 'bulgarian-utf8.pl',
-  'ca'    => 'catalan-utf8.pl',
-  'de'    => 'german-utf8.pl',
-  'es'    => 'spanish-utf8.pl',
-  'fi'    => 'finnish-utf8.pl',
-  'fr'    => 'french-utf8.pl',
-  'gr'    => 'greek-utf8.pl',
-  'he'    => 'hebrew-utf8.pl',
-  'it'    => 'italian-utf8.pl',
-  'ja'    => 'japanese-utf8.pl',
-  'ko'    => 'korean-utf8.pl',
-  'nl'    => 'dutch-utf8.pl',
-  'pl'    => 'polish-utf8.pl',
-  'pt'    => 'portuguese-utf8.pl',
-  'pt-br' => 'brazilian-portuguese-utf8.pl',
-  'ro'    => 'romanian-utf8.pl',
-  'ru'    => 'russian-utf8.pl',
-  'se'    => 'swedish-utf8.pl',
-  'sr'    => 'serbian-utf8.pl',
-  'uk'    => 'ukrainian-utf8.pl',
-  'zh'    => 'chinese-utf8.pl',
-  'zh-cn' => 'chinese_cn-utf8.pl',
-  'zh-tw' => 'chinese-utf8.pl',
-    );
+my %library= ('bg' => 'bulgarian-utf8.pl',
+	      'de' => 'german-utf8.pl',
+	      'es' => 'spanish-utf8.pl',
+	      'fr' => 'french-utf8.pl',
+	      'fi' => 'finnish-utf8.pl',
+	      'gr' => 'greek-utf8.pl',
+	      'he' => 'hebrew-utf8.pl',
+	      'it' => 'italian-utf8.pl',
+	      'ja' => 'japanese-utf8.pl',
+	      'ko' => 'korean-utf8.pl',
+	      'nl' => 'dutch-utf8.pl',
+	      'pl' => 'polish-utf8.pl',
+	      'pt' => 'portuguese-utf8.pl',
+	      'ro' => 'romanian-utf8.pl',
+	      'ru' => 'russian-utf8.pl',
+	      'se' => 'swedish-utf8.pl',
+	      'sr' => 'serbian-utf8.pl',
+	      'zh' => 'chinese-utf8.pl',
+	      'zh-cn' => 'chinese_cn-utf8.pl',
+	      'zh-tw' => 'chinese-utf8.pl',
+	     );

 sub LoadLanguage {
  # my $requested_language = "da, en-gb;q=0.8, en;q=0.7";
@@ -71,7 +65,7 @@ sub LoadLanguage {
  #      . $q->end_html) && exit if GetParam('debug', '');
  foreach (@prefs) {
    last if $Lang{$_} eq 'en'; # the default
-    my $file = $TranslationsLibrary{$Lang{$_}};
+    my $file = $library{$Lang{$_}};
    $file = "$LoadLanguageDir/$file" if defined $LoadLanguageDir;
    if (-r $file) {
      do $file;
--- a/modules/localnames.pl
+++ b/modules/localnames.pl
@@ -103,7 +103,7 @@ L<http://ln.taoriver.net/>.
 push(@MyRules, \&LocalNamesRule);

 sub LocalNamesRule {
-  if (m/\G\[\[ln:$FullUrlPattern\s*([^\]]*)\]\]/cg) {
+  if (m/\G\[\[ln:$FullUrlPattern\s*([^\]]*)\]\]/cog) {
    # [[ln:url text]], [[ln:url]]
    return $q->a({-class=>'url outside ln', -href=>$1}, $2||$1);
  }
@@ -144,7 +144,7 @@ sub LocalNamesInit {
  $LocalNamesPage = FreeToNormal($LocalNamesPage); # spaces to underscores
  $AdminPages{$LocalNamesPage} = 1;
  my $data = GetPageContent($LocalNamesPage);
-  while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/g) {
+  while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/go) {
    my ($page, $url) = ($2, $1);
    my $id = FreeToNormal($page);
    $LocalNames{$id} = $url;
@@ -152,7 +152,7 @@ sub LocalNamesInit {
  # Now read data from ln links, checking cache if possible. For all
  # URLs not in the cache or with invalid cache, fetch the file again,
  # and save it in the cache.
-  my @ln = $data =~ m/\[\[ln:$FullUrlPattern[^\]]*?\]\]/g;
+  my @ln = $data =~ m/\[\[ln:$FullUrlPattern[^\]]*?\]\]/go;
  my %todo = map {$_, GetLnFile($_)} @ln;
  my %data = ();
  if (GetParam('cache', $UseCache) > 0) {
@@ -347,13 +347,13 @@ sub DoLocalNames {
  if (GetParam('expand', 0)) {
    print "# Local names defined on $LocalNamesPage:\n";
    my $data = GetPageContent($LocalNamesPage);
-    while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/g) {
+    while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/go) {
      my ($title, $url) = ($2, $1);
      my $id = FreeToNormal($title);
      print qq{LN "$title" "$url"\n};
    }
    print "# Namespace delegations defined on $LocalNamesPage:\n";
-    while ($data =~ m/\[\[ln:$FullUrlPattern([^\]]*)?\]\]/g) {
+    while ($data =~ m/\[\[ln:$FullUrlPattern([^\]]*)?\]\]/go) {
      my ($title, $url) = ($2, $1);
      my $id = FreeToNormal($title);
      print qq{NS "$title" "$url"\n};
@@ -396,10 +396,10 @@ sub DoDefine {
      $q->start_div({-class=>'content define'}),
 	GetFormStart(undef, 'get', 'def');
    my $go = T('Go!');
-    print $q->p($q->label({-for=>"defined"}, T('Name:') . ' '),
+    print $q->p($q->label({-for=>"defined"}, T('Name: ')),
 		$q->textfield(-name=>"name", -id=>"defined",
 			      -tabindex=>"1", -size=>20));
-    print $q->p($q->label({-for=>"definition"}, T('URL:') . ' '),
+    print $q->p($q->label({-for=>"definition"}, T('URL: ')),
 		$q->textfield(-name=>"link", -id=>"definition",
 			      -tabindex=>"2", -size=>20));
    print $q->p($q->submit(-label=>$go, -tabindex=>"3"),
@@ -430,7 +430,7 @@ sub GetWantedPages {
  # skip comment pages
  if ($CommentsPrefix) {
    foreach my $id (keys %WantedPages) {
-      delete $WantedPages{$id} if $id =~ /^$CommentsPrefix/; # TODO use $CommentsPattern ?
+      delete $WantedPages{$id} if $id =~ /^$CommentsPrefix/o; # TODO use $CommentsPattern ?
    }
  }
  # now something more complicated: if near-links.pl was loaded, then
@@ -446,7 +446,7 @@ sub GetWantedPages {
  # if any wanted pages remain, print them
  if (@wanted) {
    return $q->div({-class=>'definition'},
-		   $q->p(T('Define external redirect:'), ' ',
+		   $q->p(T('Define external redirect: '),
 			 map { my $page = NormalToFree($_);
 			       ScriptLink('action=define;name='
 					  . UrlEncode($page),
--- a/modules/login.pl
+++ b/modules/login.pl
@@ -199,9 +199,9 @@ sub DoRegister {
 	my $id = shift;
 	print GetHeader('', Ts('Register for %s', $SiteName), '');
 	print '<div class="content">';
-    $RegistrationForm =~ s/\%([a-z]+)\%/GetParam($1)/egi;
+    $RegistrationForm =~ s/\%([a-z]+)\%/GetParam($1)/ige;
    $RegistrationForm =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
 	print $RegistrationForm;
 	print '</div>';
 	PrintFooter();
@@ -271,9 +271,9 @@ sub DoLogin {
 	my $id = shift;
 	print GetHeader('', Ts('Login to %s', $SiteName), '');
 	print '<div class="content">';
-    $LoginForm =~ s/\%([a-z]+)\%/GetParam($1)/eg;
+    $LoginForm =~ s/\%([a-z]+)\%/GetParam($1)/ge;
    $LoginForm =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
 	print $LoginForm;
 	print '</div>';
 	PrintFooter();
@@ -305,9 +305,9 @@ sub DoLogout {
 	print GetHeader('', Ts('Logout of %s', $SiteName), '');
 	print '<div class="content">';
 	print '<p>' . Ts('Logout of %s?',$SiteName) . '</p>';
-    $LogoutForm =~ s/\%([a-z]+)\%/GetParam($1)/eg;
+    $LogoutForm =~ s/\%([a-z]+)\%/GetParam($1)/ge;
    $LogoutForm =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
 	print $LogoutForm;
 	print '</div>';
 	PrintFooter();
@@ -628,9 +628,9 @@ sub DoReset {
 	print GetHeader('', Ts('Reset Password for %s', $SiteName), '');
 	print '<div class="content">';
 	print '<p>' . T('Reset Password?') . '</p>';
-    $ResetForm =~ s/\%([a-z]+)\%/GetParam($1)/eg;
+    $ResetForm =~ s/\%([a-z]+)\%/GetParam($1)/ge;
    $ResetForm =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
 	print $ResetForm;
 	print '</div>';
 	PrintFooter();
@@ -652,9 +652,9 @@ sub DoChangePassword {
 	print GetHeader('', Ts('Change Password for %s', $SiteName), '');
 	print '<div class="content">';
 	print '<p>' . T('Change Password?') . '</p>';
-    $ChangePassForm =~ s/\%([a-z]+)\%/GetParam($1)/eg;
+    $ChangePassForm =~ s/\%([a-z]+)\%/GetParam($1)/ge;
    $ChangePassForm =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
+      . $q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
 	print $ChangePassForm;
 	print '</div>';
 	PrintFooter();
--- a/modules/logout.pl
+++ b/modules/logout.pl
@@ -118,7 +118,7 @@ sub DoLogout {

  print
    GetHeader('', Ts('Logged out of %s', $SiteName), '') .
-    $q->div({-class=> 'content'}, $q->p(T('You are now logged out.'), $id ? $q->p(ScriptLink('action=browse;id=' . UrlEncode($id) . '&time=' . time, Ts('Return to %s', NormalToFree($id)))) : ''));
+    $q->div({-class=> 'content'}, $q->p(T('You are now logged out.'), $id ? $q->p(ScriptLink('action=browse;id=' . UrlEncode($id) . '&time=' . time, T('Return to ' . NormalToFree($id)))) : ''));
  PrintFooter();
 }

@@ -201,10 +201,10 @@ sub CookieUsernameFix {
  # Only valid usernames get stored in the new cookie.
  my   $name = GetParam('username', '');
  if (!$name) { }
-  elsif (!$FreeLinks && !($name =~ /^$LinkPattern$/)) {
+  elsif (!$FreeLinks && !($name =~ /^$LinkPattern$/o)) {
    CookieUsernameFixDelete(Ts('Invalid UserName %s: not saved.', $name));
  }
-  elsif ($FreeLinks && (!($name =~ /^$FreeLinkPattern$/))) {
+  elsif ($FreeLinks && (!($name =~ /^$FreeLinkPattern$/o))) {
    CookieUsernameFixDelete(Ts('Invalid UserName %s: not saved.', $name));
  }
  elsif (length($name) > 50) {  # Too long
--- a/modules/mail.pl
+++ b/modules/mail.pl
@@ -84,7 +84,7 @@ sub MailNewInitCookie {
  $q->delete('mail');
  if (!$mail) {
    # do nothing
-  } elsif (!($mail =~ /$MailPattern/)) {
+  } elsif (!($mail =~ /$MailPattern/o)) {
    $Message .= $q->p(Ts('Invalid Mail %s: not saved.', $mail));
  } else {
    SetParam('mail', $mail);
@@ -106,7 +106,7 @@ sub MailFormAddition {
      . ScriptLink("action=subscribe;pages=$id", T('subscribe'), 'subscribe');
  }
  $addition = $q->span({-class=>'mail'},
-	       $q->label({-for=>'mail'}, T('Email:') . ' ')
+	       $q->label({-for=>'mail'}, T('Email: '))
 	       . ' ' . $q->textfield(-name=>'mail', -id=>'mail',
 				     -default=>GetParam('mail', ''))
 		       . $addition);
@@ -311,8 +311,8 @@ sub DoMailSubscriptionList {
    if ($raw) {
      print join(' ', $key, @values) . "\n";
    } else {
-        print $q->li(Ts('%s:', MailLink($key, @values)) . ' '
-		     . join(' ', map { MailLink($_, $key) } @values));
+        print $q->li(Ts('%s: ', MailLink($key, @values)),
+		     join(' ', map { MailLink($_, $key) } @values));
    }
  }
  print '</ul></div>' unless $raw;
--- a/modules/markdown-rule.pl
+++ b/modules/markdown-rule.pl
@@ -45,14 +45,14 @@ sub MarkdownRule {
      . AddHtmlEnvironment("p");
  }
  # setext headers
-  elsif ($bol and m/\G((\s*\n)*(.+?)[ \t]*\n(-+|=+)[ \t]*\n)/cg) {
+  elsif ($bol and m/\G((\s*\n)*(.+?)[ \t]*\n(-+|=+)[ \t]*\n)/gc) {
    return CloseHtmlEnvironments()
      . (substr($4,0,1) eq '=' ? $q->h2($3) : $q->h3($3))
      . AddHtmlEnvironment('p');
  }
  # > blockquote
  # with continuation
-  elsif ($bol and m/\G&gt;/cg) {
+  elsif ($bol and m/\G&gt;/gc) {
    return CloseHtmlEnvironments()
      . AddHtmlEnvironment('blockquote');
  }
@@ -117,20 +117,20 @@ sub MarkdownRule {
      . AddHtmlEnvironment('td');
  }
  # whitespace indentation = code
-  elsif ($bol and m/\G(\s*\n)*(    .+)\n?/cg) {
+  elsif ($bol and m/\G(\s*\n)*(    .+)\n?/gc) {
    my $str = substr($2, 4);
-    while (m/\G(    .*)\n?/cg) {
+    while (m/\G(    .*)\n?/gc) {
      $str .= "\n" . substr($1, 4);
    }
    return OpenHtmlEnvironment('pre',1) . $str; # always level 1
  }
  # ``` = code
-  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/cgs) {
+  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/gcs) {
    return CloseHtmlEnvironments() . $q->pre($1)
      . AddHtmlEnvironment("p");
  }
  # [an example](http://example.com/ "Title")
-  elsif (m/\G\[(.+?)\]\($FullUrlPattern(\s+"(.+?)")?\)/cg) {
+  elsif (m/\G\[(.+?)\]\($FullUrlPattern(\s+"(.+?)")?\)/goc) {
    my ($text, $url, $title) = ($1, $2, $4);
    $url =~ /^($UrlProtocols)/;
    my %params;
--- a/modules/markup.pl
+++ b/modules/markup.pl
@@ -142,18 +142,18 @@ sub MarkupTag {
 }

 sub MarkupRule {
-  if ($bol and %MarkupLines and m/$markup_lines_re/cg) {
+  if ($bol and %MarkupLines and m/$markup_lines_re/gc) {
    my ($tag, $str) = ($1, $2);
    $str = $q->span($tag) . $str;
-    while (m/$markup_lines_re/cg) {
+    while (m/$markup_lines_re/gc) {
      $str .= $q->span($1) . $2;
    }
    return CloseHtmlEnvironments()
      . MarkupTag($MarkupLines{UnquoteHtml($tag)}, $str)
      . AddHtmlEnvironment('p');
-  } elsif (%MarkupSingles and m/$markup_singles_re/cg) {
+  } elsif (%MarkupSingles and m/$markup_singles_re/gc) {
    return $MarkupSingles{UnquoteHtml($1)};
-  } elsif (%MarkupForcedPairs and m/$markup_forced_pairs_re/cg) {
+  } elsif (%MarkupForcedPairs and m/$markup_forced_pairs_re/gc) {
    my $tag = $1;
    my $start = $tag;
    my $end = $tag;
@@ -168,20 +168,20 @@ sub MarkupRule {
    $endre .= '[ \t]*\n?' if $block_element{$start}; # skip trailing whitespace if block
    # may match the empty string, or multiple lines, but may not span
    # paragraphs.
-    if ($endre and m/\G$endre/cg) {
+    if ($endre and m/\G$endre/gc) {
      return $tag . $end;
-    } elsif ($tag eq $end && m/\G((:?.+?\n)*?.+?)$endre/cg) { # may not span paragraphs
+    } elsif ($tag eq $end && m/\G((:?.+?\n)*?.+?)$endre/gc) { # may not span paragraphs
      return MarkupTag($data, $1);
-    } elsif ($tag ne $end && m/\G((:?.|\n)+?)$endre/cg) {
+    } elsif ($tag ne $end && m/\G((:?.|\n)+?)$endre/gc) {
      return MarkupTag($data, $1);
    } else {
      return $tag;
    }
-  } elsif (%MarkupPairs and m/$markup_pairs_re/cg) {
+  } elsif (%MarkupPairs and m/$markup_pairs_re/gc) {
    return MarkupTag($MarkupPairs{UnquoteHtml($1)}, $2);
-  } elsif ($MarkupPairs{'/'} and m|\G~/|cg) {
+  } elsif ($MarkupPairs{'/'} and m|\G~/|gc) {
    return '~/'; # fix ~/elisp/ example
-  } elsif ($MarkupPairs{'/'} and m|\G(/[-A-Za-z0-9\x{0080}-\x{fffd}/]+/$words/)|cg) {
+  } elsif ($MarkupPairs{'/'} and m|\G(/[-A-Za-z0-9\x{0080}-\x{fffd}/]+/$words/)|gc) {
    return $1; # fix /usr/share/lib/! example
  }
  # "foo
--- a/modules/module-bisect.pl
+++ b/modules/module-bisect.pl
@@ -68,7 +68,7 @@ sub BisectInitialScreen {
    }
    print $q->submit(-name=>'bad', -value=>T('Start'));
  } else {
-    print T('Bisecting proccess is already active.'), $q->br();
+    print T('Biscecting proccess is already active.'), $q->br();
    print $q->submit(-name=>'stop', -value=>T('Stop'));
  }
  print $q->end_form();
@@ -102,7 +102,7 @@ sub BisectProcess {
    print $q->end_form();
    return;
  }
-  print T('Module count (only testable modules):'), ' ', $q->strong(scalar @files), $q->br();
+  print T('Module count (only testable modules): '), $q->strong(scalar @files), $q->br();
  print $q->br(), T('Current module statuses:'), $q->br();
  my $halfsize = ($end - $start + 1) / 2.0; # + 1 because it is count
  $end -= int($halfsize) unless $isGood;
--- a/modules/moin.pl
+++ b/modules/moin.pl
@@ -64,13 +64,13 @@ sub MoinListLevel {

 sub MoinRule {
  # ["free link"]
-  if (m/\G(\["(.*?)"\])/cgs) {
+  if (m/\G(\["(.*?)"\])/gcs) {
    Dirty($1);
    print GetPageOrEditLink($2);
    return '';
  }
  # [[BR]]
-  elsif (m/\G\[\[BR\]\]/cg) {
+  elsif (m/\G\[\[BR\]\]/gc) {
    return $q->br();
  }
  # {{{
--- a/modules/multi-url-spam-block.pl
+++ b/modules/multi-url-spam-block.pl
@@ -46,13 +46,13 @@ sub NewMultiUrlBannedContent {

 sub MultiUrlBannedContent {
  my $str = shift;
-  my @urls = $str =~ /$FullUrlPattern/g;
+  my @urls = $str =~ /$FullUrlPattern/go;
  my %domains;
  my %whitelist;
  my $max = 0;
  my $label = '[a-z]([a-z0-9-]*[a-z0-9])?'; # RFC 1034
  foreach (split(/\n/, GetPageContent($MultiUrlWhiteList))) {
-    next unless m/^\s*($label\.$label)/i;
+    next unless m/^\s*($label\.$label)/io;
    $whitelist{$1} = 1;
  }
  foreach my $url (@urls) {
--- a/modules/namespaces.pl
+++ b/modules/namespaces.pl
@@ -227,7 +227,7 @@ sub NewNamespaceGetRcLines { # starttime, hash of seen pages to use as a second
  foreach my $file (@rcfiles) {
    open(my $F, '<:encoding(UTF-8)', $file);
    my $line = <$F>;
-    my ($ts) = split(/$FS/, $line); # the first timestamp in the regular rc file
+    my ($ts) = split(/$FS/o, $line); # the first timestamp in the regular rc file
    my @new;
    if (not $ts or $ts > $starttime) {	# we need to read the old rc file, too
      push(@new, GetRcLinesFor($rcoldfiles{$file}, $starttime,\%match, \%following));
@@ -381,8 +381,7 @@ sub NewNamespaceBrowsePage {
  #REDIRECT into different namespaces
  my ($id, $raw, $comment, $status) = @_;
  OpenPage($id);
-  my ($revisionPage, $revision) = GetTextRevision(GetParam('revision', ''), 1);
-  my $text = $revisionPage->{text};
+  my ($text, $revision) = GetTextRevision(GetParam('revision', ''), 1);
  my $oldId = GetParam('oldid', '');
  if (not $oldId and not $revision and (substr($text, 0, 10) eq '#REDIRECT ')
      and (($WikiLinks and $text =~ /^\#REDIRECT\s+(($InterSitePattern:)?$InterLinkPattern)/)
--- a/modules/near-links.pl
+++ b/modules/near-links.pl
@@ -185,7 +185,7 @@ sub NewNearLinksResolveId {
  my $id = shift;
  my @result = OldNearLinksResolveId($id, @_);
  my %forbidden = map { $_ => 1 } @UserGotoBarPages, %AdminPages;
-  $forbidden{$id} = 1 if $CommentsPrefix and $id =~ /^$CommentsPrefix/;
+  $forbidden{$id} = 1 if $CommentsPrefix and $id =~ /^$CommentsPrefix/o;
  if (not $result[1] and $NearSource{$id} and not $forbidden{$id}) {
    $NearLinksUsed{$id} = 1;
    my $site = $NearSource{$id}[0];
@@ -264,18 +264,18 @@ sub SearchNearPages {
  if (%NearSearch and GetParam('near', 1) > 1 and GetParam('context',1)) {
    foreach my $site (keys %NearSearch) {
      my $url = $NearSearch{$site};
-      $url =~ s/\%s/UrlEncode($string)/eg or $url .= UrlEncode($string);
+      $url =~ s/\%s/UrlEncode($string)/ge or $url .= UrlEncode($string);
      print $q->hr(), $q->p(Ts('Fetching results from %s:', $q->a({-href=>$url}, $site)))
 	unless GetParam('raw', 0);
      my $data = GetRaw($url);
      my @entries = split(/\n\n+/, $data);
      shift @entries; # skip head
      foreach my $entry (@entries) {
-	my $entryPage = ParseData($entry); # need to pass reference
-	my $name = $entryPage->{title};
+	my %entry = ParseData($entry); # need to pass reference
+	my $name = $entry{title};
 	next if $found{$name}; # do not duplicate local pages
 	$found{$name} = 1;
-	PrintSearchResultEntry($entryPage, $regex); # with context and full search!
+	PrintSearchResultEntry(\%entry, $regex); # with context and full search!
      }
    }
  }
--- a/modules/new-window.pl
+++ b/modules/new-window.pl
@@ -24,8 +24,8 @@ our ($q, @MyRules, $FullUrlPattern, $UrlProtocols, $BracketText);
 push(@MyRules, \&NewWindowLink);
 sub NewWindowLink {
  # compare sub LinkRules in oddmuse.pl
-  if ($BracketText && m/\G(\[new:$FullUrlPattern\s+([^\]]+?)\])/cg
-      or m/\G(\[new:$FullUrlPattern\])/cg) {
+  if ($BracketText && m/\G(\[new:$FullUrlPattern\s+([^\]]+?)\])/cog
+      or m/\G(\[new:$FullUrlPattern\])/cog) {
    my ($url, $text) = ($2, $3);
    $url =~ /^($UrlProtocols)/;
    my $class = "url $1";      # get protocol (http, ftp, ...)
--- a/modules/nosearch.pl
+++ b/modules/nosearch.pl
@@ -25,7 +25,7 @@ sub NewGetSearchLink {
  my ($text, $class, $name, $title) = @_;
  $name = UrlEncode($name);
  $text =~ s/_/ /g;
-  return $q->span({-class=>$class}, $text);
+  return $q->span({-class=>$class }, $text);
 }

 push(@MyAdminCode, \&BacklinksMenu);
@@ -34,8 +34,8 @@ sub BacklinksMenu {
  if ($id) {
      my $text = T('Backlinks');
      my $class = 'backlinks';
-      my $name = 'backlinks';
-      my $title = T('Click to search for references to this page');
+      my $name = "backlinks";
+      my $title = T("Click to search for references to this page");
      my $link = ScriptLink('search=' . $id, $text, $class, $name, $title);
      push(@$menuref, $link);
  }
--- a/modules/numbered-list.pl
+++ b/modules/numbered-list.pl
@@ -25,8 +25,8 @@ push(@MyRules, \&NumberedListRule);
 sub NumberedListRule {
  # numbered lists using # copied from usemod.pl but allow leading
  # whitespace
-  if ($bol && m/\G(\s*\n)*\s*(\#+)[ \t]/cg
-      or InElement('li') && m/\G(\s*\n)+\s*(\#+)[ \t]/cg) {
+  if ($bol && m/\G(\s*\n)*\s*(\#+)[ \t]/cog
+      or InElement('li') && m/\G(\s*\n)+\s*(\#+)[ \t]/cog) {
    return CloseHtmlEnvironmentUntil('li')
      . OpenHtmlEnvironment('ol',length($2))
      . AddHtmlEnvironment('li');
--- a/modules/offline.pl
+++ b/modules/offline.pl
@@ -78,7 +78,7 @@ sub DoManifest {
  #   print ScriptUrl($id) . "\n" unless $IndexHash{$id};
  # }
  # External CSS
-  print ref $StyleSheet ? join("\n", @$StyleSheet) . "\n" : "$StyleSheet\n" if $StyleSheet;
+  print $StyleSheet . "\n" if $StyleSheet;
  # FIXME: $StyleSheetPage
  # FIXME: external images, stuff in $HtmlHeaders
  # Error message all the stuff that's not available offline.
--- a/modules/olocalmap.pl
+++ b/modules/olocalmap.pl
@@ -99,9 +99,9 @@ sub LocalMapWorkHorse {

   my $retval_children = '';
   if ($depth > 0) {
-      my $data = ParseData(ReadFileOrDie(GetPageFile($id)));
-      my @flags = split(/$FS/, $data->{'flags'});
-      my @blocks = split(/$FS/, $data->{'blocks'});
+      my %data = ParseData(ReadFileOrDie(GetPageFile($id)));
+      my @flags = split(/$FS/, $data{'flags'});
+      my @blocks = split(/$FS/, $data{'blocks'});
      my @subpages;

      # Iterate over blocks, operate only on "dirty" ones
@@ -111,14 +111,14 @@ sub LocalMapWorkHorse {
         local $_ = $blocks[$i];

         if ($WikiLinks
-             && ($BracketWiki && m/\G(\[$LinkPattern\s+([^\]]+?)\])/cg
-                 or m/\G(\[$LinkPattern\])/cg or m/\G($LinkPattern)/cg)) {
+             && ($BracketWiki && m/\G(\[$LinkPattern\s+([^\]]+?)\])/cog
+                 or m/\G(\[$LinkPattern\])/cog or m/\G($LinkPattern)/cog)) {
            $sub_id = $1;
         } elsif ($FreeLinks
                  && (($BracketWiki
-                       && m/\G(\[\[($FreeLinkPattern)\|([^\]]+)\]\])/cg)
-                      or m/\G(\[\[\[($FreeLinkPattern)\]\]\])/cg
-                      or m/\G(\[\[($FreeLinkPattern)\]\])/cg)) {
+                       && m/\G(\[\[($FreeLinkPattern)\|([^\]]+)\]\])/cog)
+                      or m/\G(\[\[\[($FreeLinkPattern)\]\]\])/cog
+                      or m/\G(\[\[($FreeLinkPattern)\]\])/cog)) {
            $sub_id = $2;
         }

--- a/modules/org-mode.pl
+++ b/modules/org-mode.pl
@@ -27,7 +27,7 @@ my $org_emph_re = qr!\G([ \t('\"])*(([*/_=+])([^ \t\r\n,*/_=+].*?(?:\n.*?){0,1}[
 my %org_emphasis_alist = qw!* b / i _ u = code + del!;

 sub OrgModeRule {
-  if (/$org_emph_re/cg) {
+  if (/$org_emph_re/cgo) {
    my $tag = $org_emphasis_alist{$3};
    return "$1<$tag>$4</$tag>$5";
  }
--- a/modules/page-trail.pl
+++ b/modules/page-trail.pl
@@ -54,7 +54,7 @@ sub UpdatePageTrail {

 sub NewPageTrailGetGotoBar {
  my $bar = OldPageTrailGetGotoBar(@_);
-  $bar .= $q->span({-class=>'trail'}, $q->br(), T('Trail:') . ' ',
+  $bar .= $q->span({-class=>'trail'}, $q->br(), T('Trail: '),
 		   map { GetPageLink($_) } reverse(@PageTrail))
    if @PageTrail;
  return $bar;
--- a/modules/paragraph-link.pl
+++ b/modules/paragraph-link.pl
@@ -28,7 +28,7 @@ push(@MyRules, \&ParagraphLinkRule);
 $RuleOrder{\&ParagraphLinkRule} = 100;

 sub ParagraphLinkRule {
-  if ($bol && m/\G(\[(-)?$FreeLinkPattern\])/cg) {
+  if ($bol && m/\G(\[(-)?$FreeLinkPattern\])/cog) {
    Dirty($1);
    my $invisible = $2;
    my $orig = $3;
--- a/modules/partial-journal.pl
+++ b/modules/partial-journal.pl
@@ -27,7 +27,7 @@ our ($q, %Page, @MyRules, $CommentsPrefix);
 push(@MyRules, \&PartialCutRule);

 sub PartialCutRule {
-  if (m/\G(?<=\n)\s*--\s*cut\s*--\s*(?=\n)/cg) {
+  if (m/\G(?<=\n)\s*--\s*cut\s*--\s*(?=\n)/gc) {
    return CloseHtmlEnvironments() . '<hr class="cut" />' . AddHtmlEnvironment('p');
  }
  return;
--- a/modules/permanent-anchors.pl
+++ b/modules/permanent-anchors.pl
@@ -78,7 +78,7 @@ push(@MyRules, \&PermanentAnchorsRule);

 sub PermanentAnchorsRule {
  my ($locallinks, $withanchors) = @_;
-  if (m/\G(\[::$FreeLinkPattern\])/cg) {
+  if (m/\G(\[::$FreeLinkPattern\])/cog) {
    #[::Free Link] permanent anchor create only $withanchors
    Dirty($1);
    if ($withanchors) {
@@ -99,7 +99,7 @@ sub GetPermanentAnchor {
 		    ScriptLink(UrlEncode($resolved), $text, 'alias')) . ']';
  } elsif ($PermanentAnchors{$id} ne $OpenPageName
 	   # 10 tries, 3 second wait, die on error
-	   and RequestLockDir('permanentanchors', 10, 3, 1)) {
+	   and RequestLockDir('permanentanchors', 1, 10, 3, 1)) {
    # Somebody may have added a permanent anchor in the mean time.
    # Comparing $LastUpdate to the $IndexFile mtime does not work for
    # subsecond changes and updates are rare, so just reread the file!
@@ -190,7 +190,7 @@ sub NewPermanentAnchorsSave {
 sub DeletePermanentAnchors {
  my $id = shift;
  # 10 tries, 3 second wait, die on error
-  RequestLockDir('permanentanchors', 10, 3, 1);
+  RequestLockDir('permanentanchors', 1, 10, 3, 1);
  foreach (keys %PermanentAnchors) {
    if ($PermanentAnchors{$_} eq $id and !$PagePermanentAnchors{$_}) {
      delete($PermanentAnchors{$_}) ;
@@ -246,7 +246,7 @@ sub NewPermanentAnchorsGetPageContent {
  if (not $result and $PermanentAnchors{$id}) {
    $result = OldPermanentAnchorsGetPageContent($PermanentAnchors{$id});
    $result =~ s/^(.*\n)*.*\[::$id\]// or return '';
-    $result =~ s/(\n=|\n----|\[::$FreeLinkPattern\])(.*\n)*.*$//;
+    $result =~ s/(\n=|\n----|\[::$FreeLinkPattern\])(.*\n)*.*$//o;
  }
  return $result;
 }
--- a/modules/plainsite.pl
+++ b/modules/plainsite.pl
@@ -45,7 +45,7 @@ sub CommentFooterLink {
  my @elements;
  if ($id and $rev ne 'history' and $rev ne 'edit') {
    if ($CommentsPrefix) {
-      if ($OpenPageName =~ /^$CommentsPrefix(.*)/) {
+      if ($OpenPageName =~ /^$CommentsPrefix(.*)/o) {
 	push(@elements, GetPageLink($1, undef, 'original'));
      } else {
 	push(@elements, GetPageLink($CommentsPrefix . $OpenPageName, undef, 'comment'));
--- a/modules/portrait-support.pl
+++ b/modules/portrait-support.pl
@@ -21,8 +21,8 @@ AddModuleDescription('portrait-support.pl', 'Portraits Support Extension');
 our ($q, $bol, $Now, @MyMacros, @MyRules, $FreeLinkPattern, $UrlPattern, $FS);

 push(@MyMacros, sub{ s/\[new::\]/"[new:" . GetParam('username', T('Anonymous'))
-		       . ':' . TimeToText($Now) . "]"/eg });
-push(@MyMacros, sub{ s/\[new:$FreeLinkPattern\]/"[new:$1:" . TimeToText($Now) . "]"/eg });
+		       . ':' . TimeToText($Now) . "]"/ge });
+push(@MyMacros, sub{ s/\[new:$FreeLinkPattern\]/"[new:$1:" . TimeToText($Now) . "]"/ge });

 push(@MyRules, \&PortraitSupportRule);

@@ -41,9 +41,9 @@ sub PortraitSupportRule {
 	. $q->hr() . AddHtmlEnvironment('p');
      $PortraitSupportColorDiv = 0;
      return $html;
-    } elsif ($bol && m/\Gportrait:$UrlPattern/cg) {
+    } elsif ($bol && m/\Gportrait:$UrlPattern/gc) {
      return $q->img({-src=>$1, -alt=>T("Portrait"), -class=>'portrait'});
-    } elsif ($bol && m/\G(:*)\[new(.*)\]/cg) {
+    } elsif ($bol && m/\G(:*)\[new(.*)\]/gc) {
      my $portrait = '';
      my $depth = length($1);
      my ($ignore, $name, $time) = split(/:/, $2, 3);
--- a/modules/preview.pl
+++ b/modules/preview.pl
@@ -1,65 +0,0 @@
-# Copyright (C) 2015  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 Preview Extension
-
-This module allows you to preview changes in HTML output. Oddmuse keeps a cache
-of the HTML produced for each wiki page. If you install new modules, the HTML
-produced for a page can change, but visitors will not see the new HTML because
-the cache still contains the old HTML. Now you have two options: 1. clear the
-HTML cache (Oddmuse will regenerate it as visitors look at the old pages), or 2.
-edit each page in order to regenerate the HTML cache. What happens in practice
-is that you add new modules and you aren't sure whether this breaks old pages
-and so you do don't dare clear the HTML cache. Let sleeping dogs lie.
-
-The Preview Extension produces a list of all the pages where the cached HTML
-differs from the HTML produced by the current set of modules. If you agree with
-the new HTML, feel free to clear the HTML cache. That's the point of this
-extension.
-
-=cut
-
-our ($q, %Action, $UseCache, @MyAdminCode);
-
-AddModuleDescription('preview.pl', 'Preview Extension');
-
-$Action{preview} = \&DoPreview;
-
-sub DoPreview {
-  print GetHeader('', T('Pages with changed HTML'));
-  print $q->start_div({-class=>'content preview'}), $q->start_p();
-  foreach my $id (AllPagesList()) {
-    OpenPage($id);
-    my $cache = ToString(\&PrintPageHtml);
-    local $UseCache = 0;
-    my $html = ToString(\&PrintPageHtml);
-    if ($cache ne $html) {
-      print GetPageLink($id), ' ',
-      ScriptLink("action=browse;id=$id;cache=0", T('Preview')),
-      $q->br();
-    }
-  }
-  print $q->end_p(), $q->end_div();
-  PrintFooter();
-}
-
-push(@MyAdminCode, \&PreviewMenu);
-
-sub PreviewMenu {
-  my ($id, $menuref, $restref) = @_;
-  push(@$menuref, ScriptLink('action=preview', T('Preview changes in HTML output'), 'preview'));
-}
--- a/modules/private-pages.pl
+++ b/modules/private-pages.pl
@@ -69,8 +69,8 @@ sub NewPrivatePagesUserCanEdit {
  my $result = OldPrivatePagesUserCanEdit($id, $editing, @rest);
  # bypass OpenPage and GetPageContent (these are redefined below)
  if ($result > 0 and $editing and $IndexHash{$id}) {
-    my $data = ParseData(ReadFileOrDie(GetPageFile($id)));
-    if (PrivatePageLocked($data->{text})) {
+    my %data = ParseData(ReadFileOrDie(GetPageFile($id)));
+    if (PrivatePageLocked($data{text})) {
      return 0;
    }
  }
@@ -128,11 +128,11 @@ sub NewPrivatePagesGetPageContent {
 *GetTextRevision = \&NewPrivatePagesGetTextRevision;

 sub NewPrivatePagesGetTextRevision {
-  my ($page, $revision) = OldPrivatePagesGetTextRevision(@_);
-  if (PrivatePageLocked($page->{text})) {
-    return ({text => NewPrivatePageNewText()}, $revision); # XXX faking a page object like this is not good
+  my ($text, $revision) = OldPrivatePagesGetTextRevision(@_);
+  if (PrivatePageLocked($text)) {
+    return (NewPrivatePageNewText(), $revision);
  }
-  return wantarray ? ($page, $revision) : $page;
+  return ($text, $revision);
 }

 # hide #PASSWORD
@@ -140,7 +140,7 @@ sub NewPrivatePagesGetTextRevision {
 push(@MyRules, \&PrivatePageRule);

 sub PrivatePageRule {
-  if (pos == 0 && m/\G#PASSWORD.*\n/cg) {
+  if (pos == 0 && m/\G#PASSWORD.*\n/gc) {
    return '';
  }
  return;
--- a/modules/private-wiki.pl
+++ b/modules/private-wiki.pl
@@ -21,7 +21,7 @@ use Crypt::Random::Seed;

 AddModuleDescription('private-wiki.pl', 'Private Wiki Extension');

-our ($q, $FS, @IndexList, %IndexHash, $IndexFile, $TempDir, $KeepDir, %LockCleaners, $ShowAll);
+our ($q, $FS, @IndexList, %IndexHash, $IndexFile, $TempDir, $KeepDir);

 my ($cipher, $random);
 my $PrivateWikiInitialized = '';
@@ -216,7 +216,6 @@ sub DoDiff {      # Actualy call the diff program
  my $oldName = "$TempDir/old";
  my $newName = "$TempDir/new";
  RequestLockDir('diff') or return '';
-  $LockCleaners{'diff'} = sub { unlink $oldName if -f $oldName; unlink $newName if -f $newName; };
  OldPrivateWikiWriteStringToFile($oldName, $_[0]); # CHANGED Here we use the old sub!
  OldPrivateWikiWriteStringToFile($newName, $_[1]); # CHANGED
  my $diff_out = `diff -- \Q$oldName\E \Q$newName\E`;
@@ -236,9 +235,6 @@ sub MergeRevisions {   # merge change from file2 to file3 into file1
  my ($name1, $name2, $name3) = ("$TempDir/file1", "$TempDir/file2", "$TempDir/file3");
  CreateDir($TempDir);
  RequestLockDir('merge') or return T('Could not get a lock to merge!');
-  $LockCleaners{'merge'} = sub { # CHANGED
-    unlink $name1 if -f $name1; unlink $name2 if -f $name2; unlink $name3 if -f $name3;
-  };
  OldPrivateWikiWriteStringToFile($name1, $file1); # CHANGED
  OldPrivateWikiWriteStringToFile($name2, $file2); # CHANGED
  OldPrivateWikiWriteStringToFile($name3, $file3); # CHANGED
@@ -250,6 +246,25 @@ sub MergeRevisions {   # merge change from file2 to file3 into file1
  return $output;
 }

+*OldPrivateWikiCleanLock = \&CleanLock;
+*CleanLock = \&NewPrivateWikiCleanLock;
+
+sub NewPrivateWikiCleanLock {
+  my ($name) = @_;
+  if ($name eq 'diff') {
+    my $oldName = "$TempDir/old";
+    my $newName = "$TempDir/new";
+    unlink $oldName if -f $oldName;
+    unlink $newName if -f $newName;
+  } elsif ($name eq 'merge') {
+    my ($name1, $name2, $name3) = ("$TempDir/file1", "$TempDir/file2", "$TempDir/file3");
+    unlink $name1 if -f $name1;
+    unlink $name2 if -f $name2;
+    unlink $name3 if -f $name3;
+  }
+  OldPrivateWikiCleanLock(@_);
+}
+
 # Surge protection has to be unencrypted because in the context of this module
 # it is a tool against people who have no password set (thus we have no key
 # to do encryption).
@@ -262,7 +277,7 @@ sub ReadRecentVisitors {
  %RecentVisitors = ();
  return unless $status;
  foreach (split(/\n/, $data)) {
-    my @entries = split /$FS/;
+    my @entries = split /$FS/o;
    my $name = shift(@entries);
    $RecentVisitors{$name} = \@entries if $name;
  }
@@ -325,7 +340,7 @@ sub GetRcLines { # starttime, hash of seen pages to use as a second return value
  open my $F, '<:encoding(UTF-8)', \$filelike or die $!; # CHANGED

  my $line = <$F>;
-  my ($ts) = split(/$FS/, $line); # the first timestamp in the regular rc file
+  my ($ts) = split(/$FS/o, $line); # the first timestamp in the regular rc file
  if (not $ts or $ts > $starttime) { # we need to read the old rc file, too
    push(@result, GetRcLinesFor($RcOldFile, $starttime, \%match, \%following));
  }
@@ -343,7 +358,7 @@ sub GetRcLinesFor {
  my %following = %{$_[1]}; # deref
  # parameters
  my $showminoredit = GetParam('showedit', $ShowEdits); # show minor edits
-  my $all = GetParam('all', $ShowAll);
+  my $all = GetParam('all', 0);
  my ($idOnly, $userOnly, $hostOnly, $clusterOnly, $filterOnly, $match, $lang,
      $followup) = map { UnquoteHtml(GetParam($_, '')); }
  qw(rcidonly rcuseronly rchostonly
@@ -357,7 +372,7 @@ sub GetRcLinesFor {
  while (my $line = <$F>) {
    chomp($line);
    my ($ts, $id, $minor, $summary, $host, $username, $revision,
-	$languages, $cluster) = split(/$FS/, $line);
+	$languages, $cluster) = split(/$FS/o, $line);
    next if $ts < $starttime;
    $following{$id} = $ts if $followup and $followup eq $username;
    next if $followup and (not $following{$id} or $ts <= $following{$id});
@@ -372,7 +387,7 @@ sub GetRcLinesFor {
    next if $lang and @languages and not grep(/$lang/, @languages);
    if ($PageCluster) {
      ($cluster, $summary) = ($1, $2) if $summary =~ /^\[\[$FreeLinkPattern\]\] ?: *(.*)/
-	  or $summary =~ /^$LinkPattern ?: *(.*)/;
+	  or $summary =~ /^$LinkPattern ?: *(.*)/o;
      next if ($clusterOnly and $clusterOnly ne $cluster);
      $cluster = '' if $clusterOnly; # don't show cluster if $clusterOnly eq $cluster
      if ($all < 2 and not $clusterOnly and $cluster) {
--- a/modules/relation.pl
+++ b/modules/relation.pl
@@ -44,7 +44,7 @@ sub RelationRead {
 }

 sub RelationRule {
-  if (m/\G((forward@@|backward@@|forward@|backward@):([_A-Za-z0-9 ]+?);)/cg) {
+  if (m/\G((forward@@|backward@@|forward@|backward@):([_A-Za-z0-9 ]+?);)/gc) {
    Dirty($1);
    my $rememberpos = pos;
    my $fwbw =$2;
--- a/modules/searchtags.pl
+++ b/modules/searchtags.pl
@@ -26,7 +26,7 @@ our (@MyRules);
 push(@MyRules, \&SearchTagRule);

 sub SearchTagRule {
-  if (m/\GTags:\s*(.+)/cg) {
+  if (m/\GTags:\s*(.+)/gc) {
    my $tag_text = $1;
    my @tags = split /,\s*/, $tag_text;
    @tags = map {
--- a/modules/setext.pl
+++ b/modules/setext.pl
@@ -41,7 +41,7 @@ push(@MyRules, \&SeTextRule);
 my $word = '([-A-Za-z\x{0080}-\x{fffd}]+)';
 sub SeTextRule {
  my $oldpos = pos;
-  if ($bol && ((m/\G((.+?)[ \t]*\n(-+|=+)[ \t]*\n)/cg
+  if ($bol && ((m/\G((.+?)[ \t]*\n(-+|=+)[ \t]*\n)/gc
 		and (length($2) == length($3)))
 	       or ((pos = $oldpos) and 0))) {
    my $html = CloseHtmlEnvironments() . ($PortraitSupportColorDiv ? '</div>' : '');
@@ -52,17 +52,17 @@ sub SeTextRule {
    }
    $PortraitSupportColorDiv = 0;
    return $html . AddHtmlEnvironment('p');
-  } elsif ($bol && m/\G((&gt; .*\n)+)/cg) {
+  } elsif ($bol && m/\G((&gt; .*\n)+)/gc) {
    my $text = $1;
    return CloseHtmlEnvironments() . $q->pre($text) . AddHtmlEnvironment('p');
-  } elsif (m/\G\*\*($word( $word)*)\*\*/cg) {
+  } elsif (m/\G\*\*($word( $word)*)\*\*/goc) {
    return "<b>$1</b>";
-  } elsif (m/\G~$word~/cg) {
+  } elsif (m/\G~$word~/goc) {
    return "<i>$1</i>";
-  } elsif (m/\G\b_($word(_$word)*)_\b/cg) {
+  } elsif (m/\G\b_($word(_$word)*)_\b/goc) {
    return '<em style="text-decoration: underline; font-style: normal;">'
      . join(' ', split(/_/, $1)) . "</em>"; # don't clobber pos
-  } elsif (m/\G`_(.+)_`/cg) {
+  } elsif (m/\G`_(.+)_`/gc) {
    return $1;
  }
  return;
--- a/modules/signature.pl
+++ b/modules/signature.pl
@@ -26,17 +26,17 @@ our ($Now, @MyRules, @MyMacros);
 push(@MyRules, \&SignatureExceptionRule);

 push(@MyMacros, sub{ s/(?<![!+])\+\+\+\+/'-- ' . GetParam('username', T('Anonymous'))
-                       . ' ' . TimeToText($Now) /eg });
-push(@MyMacros, sub{ s/(?<![!+])\+\+\+/'-- ' . GetParam('username', T('Anonymous'))/eg });
+                       . ' ' . TimeToText($Now) /ge });
+push(@MyMacros, sub{ s/(?<![!+])\+\+\+/'-- ' . GetParam('username', T('Anonymous'))/ge });

 push(@MyMacros, sub{ s/(?<![!+])\~\~\~\~/GetParam('username', T('Anonymous'))
-                       . ' ' . TimeToText($Now) /eg });
-push(@MyMacros, sub{ s/(?<![!~])\~\~\~/GetParam('username', T('Anonymous'))/eg });
+                       . ' ' . TimeToText($Now) /ge });
+push(@MyMacros, sub{ s/(?<![!~])\~\~\~/GetParam('username', T('Anonymous'))/ge });

 sub SignatureExceptionRule {
-  if (m/\G!\+\+\+/cg) {
+  if (m/\G!\+\+\+/gc) {
    return '+++';
-  } elsif (m/\G!\~\~\~/cg) {
+  } elsif (m/\G!\~\~\~/gc) {
    return '~~~';
  }
  return;
--- a/modules/simple-rules.pl
+++ b/modules/simple-rules.pl
@@ -68,7 +68,7 @@ sub NewSimpleRulesApplyRules {
      }
      ($block =~ s/(\&lt;journal(\s+(\d*))?(\s+"(.*)")?(\s+(reverse))?\&gt;)/
       my ($str, $num, $regexp, $reverse) = ($1, $3, $5, $7);
-       SimpleRulesDirty($str, sub { PrintJournal($num, $regexp, $reverse)});/eg);
+       SimpleRulesDirty($str, sub { PrintJournal($num, $regexp, $reverse)});/ego);
      $result .= NewSimpleRulesApplyInlineRules($block);
    }
  }
@@ -78,14 +78,14 @@ sub NewSimpleRulesApplyRules {
 sub NewSimpleRulesApplyInlineRules {
  my ($block, $locallinks) = @_;
  $block = NewSimpleRulesApplyDirtyInlineRules($block, $locallinks);
-  $block =~ s/$UrlPattern/SimpleRulesProtect($q->a({-href=>$1}, $1))/egs;
+  $block =~ s/$UrlPattern/SimpleRulesProtect($q->a({-href=>$1}, $1))/seg;
  $block =~ s/~(\S+)~/SimpleRulesProtect($q->em($1))/eg;
-  $block =~ s/\*\*(.+?)\*\*/SimpleRulesProtect($q->strong($1))/egs;
-  $block =~ s/\/\/(.+?)\/\//SimpleRulesProtect($q->em($1))/egs;
-  $block =~ s/\_\_(.+?)\_\_/SimpleRulesProtect($q->u($1))/egs;
-  $block =~ s/\*(.+?)\*/SimpleRulesProtect($q->b($1))/egs;
-  $block =~ s/\/(.+?)\//SimpleRulesProtect($q->i($1))/egs;
-  $block =~ s/\_(.+?)\_/SimpleRulesProtect($q->u($1))/egs;
+  $block =~ s/\*\*(.+?)\*\*/SimpleRulesProtect($q->strong($1))/seg;
+  $block =~ s/\/\/(.+?)\/\//SimpleRulesProtect($q->em($1))/seg;
+  $block =~ s/\_\_(.+?)\_\_/SimpleRulesProtect($q->u($1))/seg;
+  $block =~ s/\*(.+?)\*/SimpleRulesProtect($q->b($1))/seg;
+  $block =~ s/\/(.+?)\//SimpleRulesProtect($q->i($1))/seg;
+  $block =~ s/\_(.+?)\_/SimpleRulesProtect($q->u($1))/seg;
  return $block;
 }

@@ -94,10 +94,10 @@ sub NewSimpleRulesApplyDirtyInlineRules {
  if ($locallinks) {
    ($block =~ s/(\[\[$FreeLinkPattern\]\])/
     my ($str, $link) = ($1, $2);
-     SimpleRulesDirty($str, GetPageOrEditLink($link,0,0,1))/eg);
+     SimpleRulesDirty($str, GetPageOrEditLink($link,0,0,1))/ego);
    ($block =~ s/(\[\[image:$FreeLinkPattern\]\])/
     my ($str, $link) = ($1, $2);
-     SimpleRulesDirty($str, GetDownloadLink($link, 1))/eg);
+     SimpleRulesDirty($str, GetDownloadLink($link, 1))/ego);
  }
  return $block;
 }
@@ -159,7 +159,7 @@ sub SimpleRulesMungeResult {

 sub SimpleRulesUnprotect {
  my $raw = shift;
-  $raw =~ s/$PROT([0-9]+)$PROT/$protected{$1}/eg
+  $raw =~ s/$PROT([0-9]+)$PROT/$protected{$1}/ge
    while $raw =~ /$PROT([0-9]+)$PROT/; # find recursive replacements!
  return $raw;
 }
--- a/modules/smarttitles.pl
+++ b/modules/smarttitles.pl
@@ -28,8 +28,8 @@ file for your Oddmuse Wiki.

 =cut
 our ($SmartTitlesBrowserTitle,
-     $SmartTitlesBrowserTitleWithoutSubtitle,
-     $SmartTitlesSubUrlText);
+            $SmartTitlesBrowserTitleWithoutSubtitle,
+            $SmartTitlesSubUrlText);

 =head2 $SmartTitlesBrowserTitle

@@ -94,7 +94,7 @@ that point.

 =cut
 sub SmartTitlesRule {
-  return '' if m/\G (^|\n)? \#(TITLE|SUBTITLE|SUBURL) [ \t]+ (.*?) \s*(\n+|$) /cgx;
+  return '' if m/\G(^|\n)?#(TITLE|SUBTITLE|SUBURL:?)[ \t]+(.*?)\s*(\n+|$)/cg;
  return;
 }

@@ -112,10 +112,10 @@ extensions (namely, hibernal) to obtain the title and subtitle for pages.

 =cut
 sub GetSmartTitles {
-  my ($title)    = $Page{text} =~ m/ (?:^|\n) \#TITLE    [ \t]+ (.*?) \s*\n+ /x;
-  my ($subtitle) = $Page{text} =~ m/ (?:^|\n) \#SUBTITLE [ \t]+ (.*?) \s*\n+ /x;
-  my ($suburl)   = $Page{text} =~ m/ (?:^|\n) \#SUBURL   [ \t]+ (.*?) \s*\n+ /x;
-  return ($title, $subtitle, $suburl);
+  my ($title)    = $Page{text} =~ m/(?:^|\n)\#TITLE[ \t]+(.*?)\s*\n+/;
+  my ($subtitle) = $Page{text} =~ m/(?:^|\n)\#SUBTITLE[ \t]+(.*?)\s*\n+/;
+  my ($interlink, $suburl) = $Page{text} =~ m/(?:^|\n)\#SUBURL(:)?[ \t]+(.*?)\s*\n+/;
+  return ($title, $subtitle, $suburl, $interlink ? 1 : '');
 }

 =head2 GetHeaderSmartTitles
@@ -127,30 +127,27 @@ within that passed page's Wiki content.

 sub GetHeaderSmartTitles {
  my ($page_name, $title, undef, undef, undef, undef, $subtitle) = @_;
-  my ($smart_title, $smart_subtitle, $smart_suburl);
+  my ($smart_title, $smart_subtitle, $smart_suburl, $smart_interlink);
  my  $html_header = GetHeaderSmartTitlesOld(@_);

  if ($page_name) {
    OpenPage($page_name);
    $title = NormalToFree($title);
-    ($smart_title, $smart_subtitle, $smart_suburl) = GetSmartTitles();
+    ($smart_title, $smart_subtitle, $smart_suburl, $smart_interlink) = GetSmartTitles();
  }

  $smart_title ||= $title;
  $smart_subtitle ||= $subtitle;

-  $smart_title    = QuoteHtml($smart_title);
+  $smart_title = QuoteHtml($smart_title);
  $smart_subtitle = QuoteHtml($smart_subtitle);
-  $smart_suburl   = QuoteHtml($smart_suburl);

  $html_header =~ s~\Q>$title</a>\E~>$smart_title</a>~g;
  if ($smart_subtitle) {
    my $subtitlehtml = '<p class="subtitle">' . $smart_subtitle;
    if ($smart_suburl) {
-      # ApplyRules is too much, we just want links. LinkRules should be enough.
-      # $subtitlehtml .= ' ' . ToString(sub { ApplyRules($smart_suburl, 1, 1) }) if $smart_suburl;
-      $_ = $smart_suburl;
-      $subtitlehtml .= ' ' . ToString(sub {LinkRules(1)});
+      $subtitlehtml .= $smart_interlink ? GetInterLink($smart_suburl, undef, 1, 1)
+	                                : GetUrl($smart_suburl, $SmartTitlesSubUrlText, 1);
    }
    $html_header =~ s~\Q</h1>\E~</h1>$subtitlehtml</p>~;
  }
@@ -175,7 +172,7 @@ sub GetHeaderSmartTitles {
 The information below applies to everything in this distribution,
 except where noted.

-Copyright 2014-2015 Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+Copyright 2014 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>.

--- a/modules/static-copy.pl
+++ b/modules/static-copy.pl
@@ -117,9 +117,9 @@ sub StaticFileName {
  my ($status, $data) = ReadFile(GetPageFile(UrlDecode($id)));
  # If the link points to a wanted page, we cannot make this static.
  return $id unless $status;
-  my $hash = ParseData($data);
+  my %hash = ParseData($data);
  my $ext = '.html';
-  if ($hash->{text} =~ /^\#FILE ([^ \n]+ ?[^ \n]*)\n(.*)/s) {
+  if ($hash{text} =~ /^\#FILE ([^ \n]+ ?[^ \n]*)\n(.*)/s) {
    %StaticMimeTypes = StaticMimeTypes() unless %StaticMimeTypes;
    $ext = $StaticMimeTypes{"$1"};
    $ext = '.' . $ext if $ext;
@@ -232,11 +232,7 @@ EOT
 sub StaticWriteCss {
  my $css;
  if ($StyleSheet) {
-    if (ref $StyleSheet) {
-      $css = join '', map { GetRaw($_) } @$StyleSheet;
-    } else {
-      $css = GetRaw($StyleSheet);
-    }
+    $css = GetRaw($StyleSheet);
  }
  if (not $css and $IndexHash{$StyleSheetPage}) {
    $css = GetPageContent($StyleSheetPage);
--- a/modules/static-hybrid.pl
+++ b/modules/static-hybrid.pl
@@ -113,9 +113,9 @@ sub StaticFileName {
 	return $StaticFiles{$id} if $StaticFiles{$id}; # cache filenames
 	my ($status, $data) = ReadFile(GetPageFile(StaticUrlDecode($id)));
 	print "cannot read " . GetPageFile(StaticUrlDecode($id)) . $q->br() unless $status;
-	my $hash = ParseData($data);
+	my %hash = ParseData($data);
 	my $ext = '.html';
-	if ($hash->{text} =~ /^\#FILE ([^ \n]+)\n(.*)/s) {
+	if ($hash{text} =~ /^\#FILE ([^ \n]+)\n(.*)/s) {
 		$ext = $StaticMimeTypes{$1};
 		$ext = '.' . $ext if $ext;
 	}
@@ -125,7 +125,7 @@ sub StaticFileName {

 sub StaticUrlDecode {
 	my $str = shift;
-	$str =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/eg;
+	$str =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/ge;
 	return $str;
 }

@@ -410,7 +410,7 @@ sub StaticNewDoRollback {
  my @ids = ();
  if (not $page) { # cannot just use list length because of ('')
    return unless UserIsAdminOrError(); # only admins can do mass changes
-    my %ids = map { my ($ts, $id) = split(/$FS/); $id => 1; } # make unique via hash
+    my %ids = map { my ($ts, $id) = split(/$FS/o); $id => 1; } # make unique via hash
      GetRcLines($Now - $KeepDays * 86400, 1); # 24*60*60
    @ids = keys %ids;
  } else {
@@ -445,15 +445,15 @@ sub StaticNewDespamPage {
  # from DoHistory()
  my @revisions = sort {$b <=> $a} map { m|/([0-9]+).kp$|; $1; } GetKeepFiles($OpenPageName);
  foreach my $revision (@revisions) {
-    my ($revisionPage, $rev) = GetTextRevision($revision, 1); # quiet
+    my ($text, $rev) = GetTextRevision($revision, 1); # quiet
    if (not $rev) {
      print ': ' . Ts('Cannot find revision %s.', $revision);
      return;
-    } elsif (not DespamBannedContent($revisionPage->{text})) {
+    } elsif (not DespamBannedContent($text)) {
      my $summary = Tss('Revert to revision %1: %2', $revision, $rule);
      print ': ' . $summary;
-      Save($OpenPageName, $revisionPage->{text}, $summary) unless GetParam('debug', 0);
-      StaticDeleteFile($OpenPageName);
+      Save($OpenPageName, $text, $summary) unless GetParam('debug', 0);
+		StaticDeleteFile($OpenPageName);
      return;
    }
  }
@@ -461,7 +461,7 @@ sub StaticNewDespamPage {
    my $summary = Ts($rule). ' ' . Ts('Marked as %s.', $DeletedPage);
    print ': ' . $summary;
    Save($OpenPageName, $DeletedPage, $summary) unless GetParam('debug', 0);
-    StaticDeleteFile($OpenPageName);
+	StaticDeleteFile($OpenPageName);
  } else {
    print ': ' . T('Cannot find unspammed revision.');
  }
--- a/modules/strange-spam.pl
+++ b/modules/strange-spam.pl
@@ -0,0 +1,57 @@
+# Copyright (C) 2006–2015  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('strange-spam.pl', 'StrangeBannedContent');
+
+our (%AdminPages, $OpenPageName, @MyInitVariables, %LockOnCreation, %PlainTextPages, $BannedContent);
+our ($StrangeBannedContent);
+
+$StrangeBannedContent = 'StrangeBannedContent';
+
+*StrangeOldBannedContent = \&BannedContent;
+*BannedContent = \&StrangeNewBannedContent;
+
+push(@MyInitVariables, \&StrangeBannedContentInit);
+
+sub StrangeBannedContentInit {
+  $LockOnCreation{$StrangeBannedContent} = 1;
+  $AdminPages{$StrangeBannedContent} = 1;
+  $PlainTextPages{$StrangeBannedContent} = 1;
+}
+
+sub StrangeNewBannedContent {
+  my $str = shift;
+  my $rule = StrangeOldBannedContent($str, @_);
+  return $rule if $rule;
+  # changes here have effects on despam.pl!
+  foreach (split(/\n/, GetPageContent($StrangeBannedContent))) {
+    next unless m/^\s*([^#]+?)\s*(#\s*(\d\d\d\d-\d\d-\d\d\s*)?(.*))?$/;
+    my ($regexp, $comment) = ($1, $4);
+    if ($str =~ /($regexp)/ or $OpenPageName =~ /($regexp)/) {
+      my $match = $1;
+      $match =~ s/\n/ /g;
+      return Tss('Rule "%1" matched "%2" on this page.', QuoteHtml($regexp),
+		 QuoteHtml($match)) . ' '
+		   . ($comment
+		      ? Ts('Reason: %s.', $comment)
+		      : T('Reason unknown.')) . ' '
+		   . Ts('See %s for more information.',
+			GetPageLink($StrangeBannedContent));
+    }
+  }
+  return 0;
+}
--- a/modules/subscriberc.pl
+++ b/modules/subscriberc.pl
@@ -27,11 +27,11 @@ push(@MyRules, \&SubscribedRecentChangesRule);

 sub SubscribedRecentChangesRule {
  if ($bol) {
-    if (m/\GMy\s+subscribed\s+pages:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)+)categories:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/cg) {
+    if (m/\GMy\s+subscribed\s+pages:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)+)categories:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/gc) {
      return Subscribe($1, $4);
-    } elsif (m/\GMy\s+subscribed\s+pages:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/cg) {
+    } elsif (m/\GMy\s+subscribed\s+pages:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/gc) {
      return Subscribe($1, '');
-    } elsif (m/\GMy\s+subscribed\s+categories:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/cg) {
+    } elsif (m/\GMy\s+subscribed\s+categories:\s*((?:(?:$LinkPattern|\[\[$FreeLinkPattern\]\]),\s*)*(?:$LinkPattern|\[\[$FreeLinkPattern\]\]))/gc) {
      return Subscribe('', $1);
    }
  }
--- a/modules/svg-edit.pl
+++ b/modules/svg-edit.pl
@@ -42,7 +42,7 @@ sub NewSvgGetDownloadLink {
  local (%Page, $OpenPageName);
  OpenPage($name);
  if ($revision) {
-    $data = GetTextRevision($revision)->{text}; # ignore revision reset
+    ($data) = GetTextRevision($revision); # ignore revision reset
  } else {
    $data = $Page{text};
  }
@@ -88,7 +88,7 @@ $Action{svg} = \&DoSvg;

 sub DoSvg {
  my $id = shift;
-  my $summary = T('Summary of your changes:') . ' ';
+  my $summary = T('Summary of your changes: ');
  $HtmlHeaders .= qq{
 <script type="text/javascript">

--- a/modules/sync.pl
+++ b/modules/sync.pl
@@ -27,7 +27,7 @@ push(@MyRules, \&SyncRule);

 sub SyncRule {
  # [[copy:http://example.com/wiki]]
-  if (m/\G\[\[(copy:$FullUrlPattern)\]\]/cg) {
+  if (m/\G\[\[(copy:$FullUrlPattern)\]\]/cog) {
    my ($text, $url) = ($1, $2);
    return $q->a({-href=>$2, class=>'outside copy'}, $text);
  }
--- a/modules/tagmap.pl
+++ b/modules/tagmap.pl
@@ -49,7 +49,7 @@ my $TagXML;

 sub TagRule { # Process page tags on a page

-    if ( m/\G$TagMark\s*(.*)/cg) {  # find page tags
+    if ( m/\G$TagMark\s*(.*)/gc) {  # find page tags
        my @tags = split /,\s*/, $1;  # push them in array
        @tags = map {                 # and generate html output:
            qq{<a href="$ScriptName?action=tagsearch;tag=$_">$_</a>};  # each tag is a link to search all pages with that tag
@@ -161,7 +161,7 @@ sub PrintTagMap {
 		my $tag = $1;

 		"<li>$tag</li>\n<ul>";
-	}egsx;
+	}xsge;

 	$result =~ s/\<\/tag\>/<\/ul>/g;
 	$result =~ s{
@@ -171,7 +171,7 @@ sub PrintTagMap {
 		my $name = $id;
 		$name =~ s/_/ /g;
 		"<li><a href=\"$ScriptName\/$id\">$name</a></li>";
-	}egsx;
+	}xsge;
 	print $result;
 }

--- a/Show More
+++ b/Show More