aawrapperdiv.pl: wrap PrintFooter correctly

Changing everything to return objects is a worthy goal, but for now we have
taken enough destructive steps towards it. Therefore, this commit fixes the
problem in backwards compatible way (by adding one more parameter to the
signatures).

Note that this additional parameter is NOT a timestamp, it is a whole page
object. Which means that we are still moving towards our goal of using page
objects everywhere, this commit is just doing it in a backwards-compatible
way.

README.creole

@@ -1,5 +1,5 @@
 This is the README file distributed together with the
-[[http://oddmuse.org/|Oddmuse]] script.
+[[https://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 http://www.oddmuse.org/ to learn more about the translation
+Visit https://www.oddmuse.org/ to learn more about the translation
 files and modules that are part of this package.
 
 == Apache

contrib/campaignwiki/add-link.pl

@@ -292,6 +292,7 @@ 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') {

contrib/oddmuse-curl.el

@@ -602,7 +602,7 @@ This command is used to reflect new pages to `oddmuse-pages-hash'."
     ("{{{.*?}}}"
      0 '(face shadow
 	      help-echo "Creole code"))
-    ("^{{{\n\\(.*\n\\)+?}}}\n"
+    ("^{{{\\(.*\n\\)+?}}}\n"
      0 '(face shadow
 	      help-echo "Creole multiline code")))
     "Implement markup rules for the Creole markup extension.
@@ -841,7 +841,9 @@ WIKI is the name of the wiki as defined in `oddmuse-wikis',
 PAGENAME is the pagename of the page you want to edit. If the
 page is already in a buffer, pop to that buffer instead of
 loading the page Use a prefix argument to force a reload of the
-page."
+page. Use \\[oddmuse-reload] to reload the list of pages
+available if you changed the URL in `oddmuse-wikis' or if other
+people have been editing the wiki in the mean time."
   (interactive (oddmuse-pagename))
   (make-directory (concat oddmuse-directory "/" wiki) t)
   (let ((name (concat wiki ":" pagename)))

contrib/undo-double-quotes.pl

@@ -0,0 +1,114 @@
+#! /usr/bin/perl -w
+
+# 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 utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement_block {
+  my ($block, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "";
+}
+
+sub translate_file {
+  my ($data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}} )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  # The problem is that these replacements don't adjust @no_go! Perhaps it is good enough?
+  my $subs = '';
+  $subs = $subs || $data =~ s/ ( \[\/quote\] \n \n \[quote\] ) /replacement_block($1, pos($data), @no_go)/gex;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file(read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+Example: $0 --dir=~/alexschroeder/raw
+}
+} else {
+  main ($dir);
+}

contrib/undo-local-names.pl

@@ -0,0 +1,170 @@
+#! /usr/bin/perl -w
+
+# 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 utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+my $LinkPattern = '(\p{Uppercase}+\p{Lowercase}+\p{Uppercase}\p{Alphabetic}*)';
+my $FreeLinkPattern = "([-,.()'%&?;<> _1-9A-Za-z\x{0080}-\x{fffd}]|[-,.()'%&?;<> _0-9A-Za-z\x{0080}-\x{fffd}][-,.()'%&?;<> _0-9A-Za-z\x{0080}-\x{fffd}]+)";
+my $UrlProtocols = 'http|https|ftp|afs|news|nntp|mid|cid|mailto|wais|prospero|telnet|gopher|irc|feed';
+my $UrlChars = '[-a-zA-Z0-9/@=+$_~*.,;:?!\'"()&#%]'; # see RFC 2396
+my $FullUrlPattern="((?:$UrlProtocols):$UrlChars+)"; # when used in square brackets
+
+# either a single letter, or a string that begins with a single letter and ends with a non-space
+my $words = '([A-Za-z\x{0080}-\x{fffd}](?:[-%.,:;\'"!?0-9 A-Za-z\x{0080}-\x{fffd}]*?[-%.,:;\'"!?0-9A-Za-z\x{0080}-\x{fffd}])?)';
+# zero-width assertion to prevent km/h from counting
+my $nowordstart = '(?:(?<=[^-0-9A-Za-z\x{0080}-\x{fffd}])|^)';
+# zero-width look-ahead assertion to prevent km/h from counting
+my $nowordend = '(?=[^-0-9A-Za-z\x{0080}-\x{fffd}]|$)';
+
+my $IrcNickRegexp = qr{[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*};
+
+sub FreeToNormal {    # trim all spaces and convert them to underlines
+  my $id = shift;
+  return '' unless $id;
+  $id =~ s/ /_/g;
+  $id =~ s/__+/_/g;
+  $id =~ s/^_//;
+  $id =~ s/_$//;
+  return $id;
+}
+
+sub parse_local_names {
+  my $filename = shift;
+  print "Reading $filename\n";
+  open(my $fh, '<:utf8', $filename) or die "Cannot read $filename: $!";
+  my $data = <$fh>;
+  close($fh);
+  print "Parsing $filename\n";
+  my %names = ();
+  while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/g) {
+    my ($page, $url) = ($2, $1);
+    my $id = FreeToNormal($page);
+    $names{$id} = $url;
+  }
+  return \%names;
+}
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement {
+  my ($names, $id, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $id if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "[[$id]]" if exists $index{$id}; # local page exists
+  return $id unless $names->{$id};
+  return '[' . $names->{$id} . ' ' . $id . ']';
+}
+
+sub translate_file {
+  my ($names, $data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}}
+                   | ${nowordstart} \* ${words} \* ${nowordend}
+                   | ${nowordstart} \/ ${words} \/ ${nowordend}
+                   | ${nowordstart} \_ ${words} \_ ${nowordend}
+                   | ${nowordstart} \! ${words} \! ${nowordend}
+                   | \[\[ $FreeLinkPattern .*? \]\]
+                   | \[ $FullUrlPattern \s+ [^\]]+? \]
+                   | ^( \h+.+\n )+
+                   | ^(?: \[? \d\d?:\d\d (?:am|pm)?  \]? )? \s* < $IrcNickRegexp > )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  my $subs = $data =~ s/(?<![:![])\b$LinkPattern(?![:])/replacement($names, $1, pos($data), @no_go)/ge;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir, $local_names) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  my $names = parse_local_names("$dir/$local_names");
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    next if $id eq "$local_names";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file($names, read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $names = 'LocalNames';
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("names=s"   => \$names,
+	    "dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR] [--names=LocalNames]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+--names=LocalNames is the page name with all the local names on
+  it. Default: LocalNames
+
+Example: $0 --dir=~/alexschroeder/raw --names=Names
+}
+} else {
+  main ($dir, $names);
+}

contrib/undo-usemod.pl

@@ -0,0 +1,128 @@
+#! /usr/bin/perl -w
+
+# 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 utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement_block {
+  my ($block, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "[quote]\n" . join("\n", split(/ \n :+ \h? /x, $block)) . "[/quote]\n";
+}
+
+sub replacement {
+  my ($block, $tag, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return $tag . $block . $tag;
+}
+
+sub translate_file {
+  my ($data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}} )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  # The problem is that these replacements don't adjust @no_go! Perhaps it is good enough?
+  my $subs = '';
+  $subs = $subs || $data =~ s/ ''' (.*?) ''' /replacement($1, '**', pos($data), @no_go)/gxe;
+  $subs = $subs || $data =~ s/  '' (.*?) ''  /replacement($1, '\/\/', pos($data), @no_go)/gxe;
+  $subs = $data =~ s/ ^ :+ \h? ( .* \n (?: .+ \n ) * ) /replacement_block($1, pos($data), @no_go)/gmxe;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file(read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+Example: $0 --dir=~/alexschroeder/raw
+}
+} else {
+  main ($dir);
+}

css/alex-2015.css

@@ -100,7 +100,7 @@
 }
 @font-face {
   font-family: 'Symbola';
-  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff') url('/fonts/Symbola.ttf') format('truetype');
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff'), url('/fonts/Symbola.ttf') format('truetype');
 }
 
 body, rss {
@@ -271,7 +271,7 @@ label[for="searchlang"], #searchlang, .header input[type="submit"] {
     visibility: hidden; position: absolute;
 }
 /* wrap on the iphone */
-@media media only screen and (max-device-width: 480px) {
+@media only screen and (max-device-width: 480px) {
 }
 
 .header input {

css/wiki.css

@@ -188,7 +188,7 @@ div.footer hr {
 
 div.content > div.comment {
     border-top: none;
-    padding-top: none;
+    padding-top: 0;
     border-left: 1ex solid #bbb;
     padding-left: 1ex;
 }
@@ -213,7 +213,12 @@ pre {
 
 tt, pre, code {
     font-size: 80%;
-};
+}
+
+code {
+    background: #eee;
+    white-space: pre-wrap;
+}
 
 @font-face {
   font-family: 'Gentium Basic';

modules/404handler.pl

@@ -27,7 +27,7 @@ my @path = split(/\//, $ENV{REDIRECT_URL});
 my $file = $path[$#path];
 
 # for dynamic pages
-use vars qw($NotFoundHandlerExceptionsPage);
+our ($NotFoundHandlerExceptionsPage);
 $NotFoundHandlerExceptionsPage = 'NoCachePages';
 $RunCGI = 0;
 do $script;

modules/aawrapperdiv.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('aawrapperdiv.pl', 'WrapperDiv Module');
 
@@ -35,8 +36,7 @@ sub WrapperGetHeader {
 *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);
+  OldPrintFooter(@_);
 }

modules/accesskeys.pl

@@ -14,6 +14,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('accesskeys.pl', 'Links With AccessKeys Extension');
 
@@ -21,7 +22,7 @@ our (@MyRules, $FreeLinkPattern);
 
 push(@MyRules, \&LinksWithAccessKeys);
 sub LinksWithAccessKeys {
-  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cog) {
+  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cg) {
     my ($id, $key) = ($2, $3);
     Dirty($1);
     $id = FreeToNormal($id);

modules/admin.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 our ($q, %Page, %Action, $IndexFile, $PageDir, $KeepDir, @MyAdminCode, $RefererDir);
 
@@ -39,7 +40,7 @@ sub AdminPowerDelete {
   } else {
     print $q->p(GetPageLink($id) . ' ' . T('deleted'));
     WriteRcLog($id, Ts('Deleted %s', $id), 0, $Page{revision},
-	       GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	       GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	       GetCluster($Page{text}));
   }
   # Regenerate index on next request
@@ -88,10 +89,10 @@ sub AdminPowerRename {
   # RecentChanges
   OpenPage($new);
   WriteRcLog($id, Ts('Renamed to %s', $new), 0, $Page{revision},
-	     GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	     GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	     GetCluster($Page{text}));
   WriteRcLog($new, Ts('Renamed from %s', $id), 0, $Page{revision},
-	     GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	     GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	     GetCluster($Page{text}));
   print $q->p(Tss('Renamed %1 to %2.', GetPageLink($id), GetPageLink($new)));
   ReleaseLock();

modules/adsense.pl

@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('adsense.pl', 'AdSense Module');
 

modules/advanced-uploads.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('advanced-uploads.pl', 'Advanced File Upload Extension');
 

modules/age.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('age.pl', 'Age Indication Extension');
 

modules/aggregate.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('aggregate.pl', 'Front Page Extension');
 
@@ -25,7 +26,7 @@ our ($q, $bol, %Action, %Page, $OpenPageName, $UseDiff, $UsePathInfo, $RssStyleS
 push(@MyRules, \&AggregateRule);
 
 sub AggregateRule {
-  if ($bol && m/\G(<aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))>)/gc) {
+  if ($bol && m/\G(<aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))>)/cg) {
     Clean(CloseHtmlEnvironments());
     Dirty($1);
     my ($oldpos, $old_, $str, $sort, $search) = ((pos), $_, $3, $5, $6);
@@ -125,8 +126,8 @@ sub DoAggregate {
       }
     }
     foreach my $id (@pages) {
-      my %data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
+      my $data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
-      my $page = $data{text};
+      my $page = $data->{text};
       my $size = length($page);
       my $i = index($page, "\n=");
       my $j = index($page, "\n----");
@@ -135,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 $date = TimeToRFC822($data->{ts});
-      my $host = $data{host};
+      my $host = $data->{host};
-      my $username = $data{username};
+      my $username = $data->{username};
       $username = QuoteHtml($username);
       $username = $host unless $username;
-      my $minor = $data{minor};
+      my $minor = $data->{minor};
-      my $revision = $data{revision};
+      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...')))

modules/agree-disagree.pl

@@ -0,0 +1,119 @@
+# Copyright (C) 2005  Bayle Shanks http://purl.net/net/bshanks
+#
+# 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;
+
+our ($Now, @MyMacros, @MyRules, $DefaultStyleSheet, $q, $bol);
+
+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 });
+push(@MyMacros, sub{ s/\[\-\]/"[-:" . GetParam('username', T('Anonymous'))
+                       . ':' . TimeToText($Now) . "]"/eg });
+push(@MyMacros, sub{ s/\[\-(:[^]:]+)\]/"[-$1:" . TimeToText($Now) . "]"/eg });
+
+
+$DefaultStyleSheet .= <<'EOT' unless $DefaultStyleSheet =~ /div\.agree/; # mod_perl?
+    div.agreeCount {
+ float: left;
+ clear: left;
+background-color: Green;
+padding-left: .5em;
+padding-right: .5em;
+padding-top: .5em;
+padding-bottom: .5em;
+}
+div.disagreeCount {
+  float: left;
+ clear: right;
+background-color: Red;
+padding-left: .5em;
+padding-right: .5em;
+padding-top: .5em;
+padding-bottom: .5em;
+}
+
+div.agreeNames {
+  float: left;
+background-color: Green;
+font-size: xx-small;
+ display: none;
+}
+div.disagreeNames {
+  float: left;
+background-color: Red;
+font-size: xx-small;
+ display: none;
+}
+
+
+
+EOT
+
+
+
+
+    my %AgreePortraits = ();
+
+
+sub AgreeDisagreeSupportRule {
+  if ($bol) {
+    if ($bol && m/(\G(\s*\[\+(.*?)\]|\s*\[-(.*?)\])+)/cgs) {
+
+      my $votes = $1;
+      my @ayes = ();
+      my @nayes = ();
+      while ($votes =~ m/\G.*?\[\+(.*?)\]/cgs) {
+        my ($ignore, $name, $time) = split(/:/, $1, 3);
+        push(@ayes, $name);
+      }
+      my $votes2 = $votes;
+      while ($votes2 =~ m/\G.*?\[-(.*?)\]/cgs) {
+        my ($ignore, $name, $time) = split(/:/, $1, 3);
+        push(@nayes, $name);
+      }
+
+      my $html = CloseHtmlEnvironments() ;
+      $html .= $q->div({-class=>'agreeCount'}) . ($#ayes+1) . '  ' . '</div>' ;
+
+      $html .= $q->div({-class=>'agreeNames'}) . printNames(@ayes) . '</div>' ;
+      $html .= $q->div({-class=>'disagreeCount'}) . '  ' . ($#nayes+1) . '</div>' ;
+      $html .= $q->div({-class=>'disagreeNames'}) . printNames(@nayes) . '</div>' ;
+
+
+      return $html;
+    }
+  }
+  return undef;
+}
+
+
+sub printNames {
+  my @names = @_;
+
+  my $html = '';
+  foreach my $name (@names)  {
+    $html .= "$name<br>";
+  }
+  return $html;
+}

modules/all.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('all.pl', 'All Action');
 

modules/anchors.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('anchors.pl', 'Local Anchor Extension');
 
@@ -20,13 +21,13 @@ our ($q, %Page, $FootnoteNumber, $FreeLinkPattern, @MyRules, $BracketWiki);
 push(@MyRules, \&AnchorsRule);
 
 sub AnchorsRule {
-  if (m/\G\[\[\#$FreeLinkPattern\]\]/gc) {
+  if (m/\G\[\[\#$FreeLinkPattern\]\]/cg) {
     return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $1);
-  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/gc) {
+  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/cg) {
     return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $2);
-  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cog
+  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cg
-	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cog
+	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cg
-	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cog) {
+	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cg) {
     # 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 '[[[');
@@ -46,7 +47,7 @@ sub AnchorsRule {
     $text = $id unless $text;
     $text =~ s/_/ /g;
     return ScriptLink(UrlEncode($id), $text, $class, undef, $title);
-  } elsif (m/\G\[\:$FreeLinkPattern\]/gc) {
+  } elsif (m/\G\[\:$FreeLinkPattern\]/cg) {
     return $q->a({-name=>FreeToNormal($1), -class=>'anchor'}, '');
   }
   return;

modules/antispam.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('antispam.pl', 'Antispam Module');
 
@@ -33,7 +34,7 @@ push(@MyRules, \&MaskEmailRule);
 
 sub MaskEmailRule {
 	# Allow [email@foo.bar Email Me] links
-	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/igc) {
+	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/cgi) {
 		my $chunk = $1;
 		$chunk =~ s/($EmailRegExp)//i;
 		my $email = $1;
@@ -50,7 +51,7 @@ sub MaskEmailRule {
 		return "<a href=\"mailto:$email\">$chunk</a>";
 	}
 
-	if (m/\G($EmailRegExp)/igc) {
+	if (m/\G($EmailRegExp)/cgi) {
 		my $email = $1;
 		if ($DoMaskEmail) {
 			my $masked="";

modules/archive.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('archive.pl', 'Archive Extension');
 

modules/askpage.pl

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('askpage.pl', 'Ask Page Extension');
 
@@ -50,12 +51,14 @@ sub NewAskPageDoPost {
   OldAskPageDoPost($id, @_); # keep original functionality for regular edits
 }
 
-*OldAskPageGetCommentForm=\&GetCommentForm;
+*OldAskPageGetTextArea=\&GetTextArea;
-*GetCommentForm=\&NewAskPageGetCommentForm;
+*GetTextArea=\&NewAskPageGetTextArea;
-sub NewAskPageGetCommentForm {
+sub NewAskPageGetTextArea {
-  my ($id, $rev, $comment) = @_;
+  my ($name, $text, @rest) = @_;
-  $comment = $NewQuestion if not $comment and $id eq $AskPage;
+  if ($name eq 'aftertext' and not $text and GetId() eq $AskPage) {
-  OldAskPageGetCommentForm(@_);
+    $text = $NewQuestion;
+  }
+  OldAskPageGetTextArea($name, $text, @rest);
 }
 
 *OldAskPageJournalSort=\&JournalSort;

modules/atom.pl

@@ -14,7 +14,9 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
+use XML::Atom;
 use XML::Atom::Entry;
 use XML::Atom::Link;
 use XML::Atom::Person;

modules/autolock.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ autolock.pl                        ]====================
 
@@ -174,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/o);
+  return 0 if $EditAllowed >= 2 and (not $CommentsPrefix or $id !~ /^$CommentsPrefix/);
   return 1 if $EditAllowed >= 3 and ($comment or (GetParam('aftertext', '') and not GetParam('text', '')));
   return 0 if $EditAllowed >= 3;
   return 1;

modules/backlinkage.pl

@@ -20,6 +20,7 @@
 # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
 
 use strict;
+use v5.10;
 
 use Fcntl;
 use MLDBM qw( DB_File Storable );

modules/backlinks.pl

@@ -11,6 +11,7 @@
 # http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension
 
 use strict;
+use v5.10;
 
 AddModuleDescription('backlinks.pl', 'Backlinks Extension');
 

modules/ban-contributors.pl

@@ -25,6 +25,7 @@ the IP or hostname will be added to the C<BannedHosts> page for you.
 
 =cut
 use strict;
+use v5.10;
 our ($q, $Now, %Page, $OpenPageName, %Action, $UrlPattern, $BannedContent, $BannedHosts, @MyAdminCode);
 
 AddModuleDescription('ban-contributors.pl', 'Ban Contributors Extension');
@@ -123,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);
+    my $old = GetTextRevision($Page{revision} - 1, 1)->{text};
-    my %urls = map {$_ => 1 } $old =~ /$UrlPattern/og;
+    my %urls = map {$_ => 1 } $old =~ /$UrlPattern/g;
     # we open the file again to force a load of the despammed page
-    foreach my $url ($Page{text} =~ /$UrlPattern/og) {
+    foreach my $url ($Page{text} =~ /$UrlPattern/g) {
       delete($urls{$url});
     }
     # we also remove any candidates that are already banned

modules/ban-quick-editors.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2013–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
@@ -16,10 +16,11 @@
 # editors will be logged.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('ban-quick-editors.pl', 'Banning Quick Editors');
 
-our ($Now, %RecentVisitors, $SurgeProtection);
+our ($q, $Now, %RecentVisitors, $SurgeProtection);
 
 *BanQuickOldUserIsBanned = \&UserIsBanned;
 *UserIsBanned = \&BanQuickNewUserIsBanned;
@@ -29,7 +30,7 @@ sub BanQuickNewUserIsBanned {
   if (not $rule
       and $SurgeProtection # need surge protection
       and GetParam('title')) {
-    my $name = GetParam('username', GetRemoteHost());
+    my $name = GetParam('username', $q->remote_addr());
     my @entries = @{$RecentVisitors{$name}};
     # $entry[0] is $Now after AddRecentVisitor
     my $ts = $entries[1];

modules/banned-regexps.pl

@@ -13,14 +13,17 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('banned-regexps.pl', 'Banning Regular Expressions');
 
-=h1 Compatibility
+=encoding utf8
+
+=head1 Compatibility
 
 This extension works with logbannedcontent.pl.
 
-=h1 Example content for the BannedRegexps page:
+=head1 Example content for the BannedRegexps page:
 
     # This page lists regular expressions that prevent the saving of a page.
     # The regexps are matched against any page or comment submitted.

modules/bbcode.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('bbcode.pl', 'bbCode Extension');
 
@@ -60,12 +61,12 @@ sub bbCodeRule {
       return AddHtmlEnvironment('strong', qq{class="highlight"}); }
     elsif ($tag eq 'url') {
       if ($option) {
-	$option =~ /^($UrlProtocols)/o;
+	$option =~ /^($UrlProtocols)/;
 	my $class = "url $1";
 	return AddHtmlEnvironment('a', qq{href="$option" class="$class"}); }
-      elsif (/\G$FullUrlPattern\s*\[\/url\]/cogi) {
+      elsif (/\G$FullUrlPattern\s*\[\/url\]/cgi) {
 	return GetUrl($1); }}
-    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cogi) {
+    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cgi) {
       return GetUrl($1, undef, undef, 1); } # force image
     elsif ($tag eq 'quote') {
       my $html = CloseHtmlEnvironments();

modules/big-brother.pl

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('big-brother.pl', 'Big Brother Extension');
 

modules/blockquote.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('blockquote.pl', 'Comments on Text Formatting Rules');
 
@@ -27,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]*/cog) {
+  if (InElement('blockquote') && m/\G(\s*\n)+:[ \t]*/cg) {
     return CloseHtmlEnvironmentUntil('blockquote')
       . AddHtmlEnvironment('p');
-  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cog) {
+  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cg) {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment('blockquote')
       . AddHtmlEnvironment('p');

modules/calendar.pl

@@ -18,6 +18,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('calendar.pl', 'Calendar Extension');
 
@@ -73,7 +74,7 @@ sub Cal {
       $link .= ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
     }
     $link;
-  }}ge;
+  }}eg;
   $cal =~ s{(\S+) (\d\d\d\d)}{{
     my ($month_text, $year_text) = ($1, $2);
     my $date = sprintf("%d-%02d", $year, $mon);
@@ -117,22 +118,22 @@ sub DoCollect {
 push(@MyRules, \&CalendarRule);
 
 sub CalendarRule {
-  if (/\G(calendar:(\d\d\d\d))/gc) {
+  if (/\G(calendar:(\d\d\d\d))/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);
     PrintYearCalendar($2);
     pos = $oldpos;
     return AddHtmlEnvironment('p');
-  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/gc) {
+  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);
     print Cal($2, $3);
     pos = $oldpos;
     return AddHtmlEnvironment('p');
-  } elsif (/\G(month:([+-]\d\d?))/gc
+  } elsif (/\G(month:([+-]\d\d?))/cg
-	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/gc) {
+	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);

modules/canonical.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('canonical.pl', 'Canonical Names');
 

modules/cart.pl

@@ -0,0 +1,180 @@
+# Copyright (C) 2008 Eric Hsu <apricotan@gmail.com>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (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;
+use utf8;
+
+AddModuleDescription('cart.pl', 'Cart Extension');
+
+our ($q, %Action, $UserGotoBar, $CookieName);
+our ($CartPic, $CartName, %Cart, $ShowCart, @CartOrdered);
+my $LOADED_CART_JS;
+
+# ============
+# = cart-bfc =
+# ============
+
+# This is a simple shopping cart for pages!
+# Requires searchpaged-bfc.pl.
+
+# We make a checkbox that onChange, uses Yahoo! UI Cookie 2.6 (note we need 2.6!) routines to set a subcookie.
+# We have the cookie "$CartName" (by default $Cookiename . "Cart")
+# which holds the actual cart and is managed almost entirely
+# in client-side javascript. That means the checkboxes directly control the cookie.
+
+# If you want a little picture of a cart, you can set the URL at $CartPic.
+
+# InitCart loads the cookie values into %Cart. $Cart->{$pagename}=1 if it's in the cart.
+# In theory cookies are capped at 4K. Our page names are capped around 90ish chars. That leaves room for 40 maximal names in the cart. Probably enough.
+
+# We'll need the cookie values for
+# action=cart;subaction=show; along with other future subactions (download in latex, bibtex)
+# we'll feed this display to a variant of search display.
+# I'll have to check oddmuse.pl.
+
+# load Yahoo UI code bit to manage subcookies.
+
+$Action{cart} = \&DoCart;
+
+sub DoCart {
+  # foreach $key (keys %Cart) {
+  # 	push @cart, $key  if ($Cart{"$key"});
+  # }
+  DoSearch(\@CartOrdered);
+}
+
+$UserGotoBar .= '<a href="?action=cart;cache=0">View Cart</a>';
+
+# Manage Cart Routines
+
+#push @MyPrintSearchResultsPrefix, \&PrintCheckboxTableStart;
+#push @MyPrintSearchResultsSuffix, \&PrintCheckboxTableEnd;
+
+# I can't hack into Init, so let's tap into InitCookie.
+# We also tap into Cookie() to arrange writing out our cleaned up Cart.
+
+*OldInitCookie = *InitCookie;
+*InitCookie = *InitCookieAndCart;
+
+# To get a checkbox in the titles of pages, we patch GetHeader.
+*OldGetHeader = *GetHeader;
+*GetHeader = *GetHeaderAndCart;
+
+sub InitCookieAndCart {
+  OldInitCookie();
+  InitCart();
+}
+
+sub GetHeaderAndCart {
+  my ($id, $title, $oldId, $nocache, $status) = @_;
+  my $result = OldGetHeader(@_);
+
+  return ($result) unless ($id);
+
+  my $checkbox = MakeCheckbox($id);
+  $checkbox = qq(<span class="cart-checkbox" style="float:right">$checkbox</span>);
+
+  $result =~ s/(<\/h1>)/$checkbox$1/;
+
+  return ($result);
+}
+
+
+# We load the contents of our Cart cookie into the global %Cart and @CartOrdered
+sub InitCart {
+  $CartName = $CookieName . "Cart" unless (defined ($CartName) );
+  my @pairs;
+
+  %Cart = ();
+  @CartOrdered = ();
+
+  if ($q->cookie($CartName)) {
+    # @pairs = split(/&/, $q->cookie($CartName));
+    @pairs =  $q->cookie($CartName);
+    foreach my $pair (@pairs) {
+      # my $encodedequals = UrlEncode("=");
+      my ($name, $val)= split(/\=/, $pair);
+      $Cart{"$name"}=$val;
+      push @CartOrdered, $name;
+    }
+  }
+}
+
+sub PrintCheckboxTableStart {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  $html .= "<table><tr>";
+  my $checkbox = MakeCheckbox(@_);
+  $html .= qq(<td valign=top>$checkbox</td>);
+  $html .= "<td valign=top>";
+  print $html;
+}
+
+sub PrintCheckboxTableEnd {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  $html .= "</td>";
+  $html .= "</tr></table>";
+
+  print $html;
+}
+
+
+sub MakeCheckbox {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  return unless ($ShowCart);
+  unless ($LOADED_CART_JS) {
+    $html .= '<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.7.0/build/yahoo/yahoo-min.js&2.7.0/build/cookie/cookie-min.js&2.7.0/build/event/event-min.js"></script>';
+    $LOADED_CART_JS=1;
+  }
+
+  my $selected = qq(checked="yes") if ($Cart{"$name"});
+
+	$html .=<<HTMLEND;
+	$CartPic<input type="checkbox" value="cart" id="$name-set" title="Add To Cart" $selected/> <br>
+	<script type="text/javascript">
+	(function(){
+	    YAHOO.util.Event.on("$name-set", "change", function(){
+	        var value = YAHOO.util.Cookie.getSub("$CartName", "$name");
+	        if (value == 1 ) { YAHOO.util.Cookie.removeSub("$CartName", "$name"); }
+	        else { YAHOO.util.Cookie.setSub("$CartName", "$name", 1 ); }
+	    });
+	})();
+	</script>
+HTMLEND
+
+  return $html unless ($q->param('action') eq 'edit' || $q->param('Preview'));
+  # no checkboxes for edit pages.
+  return;
+}
+
+__END__
+
+=
+(0.7) Load JS libraries on first checkbox (so won't load if we are editing).
+(0.6) Changed the JS source to be Yahoo's CDN.
+(0.51) Use CSS class cart-checkbox for the cart checkbox!  That way, we can remove them for printouts, for instance.
+(0.5) Our hack of cookies was not working cross-platform. We have a mismatch because our attempts to send out a cookie from oddmuse were getting the contents encoded and unreadable for the YUI routines.  Instead,we will use removeSub to avoid ever having to send the cookie back from our server!
+(0.4) Now every page title has a checkbox floated to the right, which controls the cart status.
+(0.3) Allow cart editing from cart display. Currently, doesn't seem to affect the cart.
+(0.2) Cart now displays.
+(0.1) Cart is now persistent and is edited by the checkboxes.

modules/checkbox.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('checkbox.pl', 'Checklist Extension');
 
@@ -76,7 +77,7 @@ sub DoCheckBox{
       $summary{$3} = 0 if $2 eq 'x' or $2 eq 'X';
       "${1}[[ :${3}]]";
     }
-  }eig;
+  }egi;
   SetParam('text', $text);
   SetParam('summary', join(', ', map {
     if ($summary{$_}) {

modules/clustermap.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('clustermap.pl', 'ClusterMap Module');
 
@@ -61,7 +62,7 @@ foreach (@ClusterMapAdminPages){
 }
 
 sub ClusterMapRule {
-	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/mgc) {
+	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/cgm) {
 		Dirty($1);
 		my $oldpos = pos;
 		my $oldstr = $_;

modules/comment-div-wrapper.pl

@@ -14,6 +14,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('comment-div-wrapper.pl', 'Comment Div Wrapper Extension');
 
@@ -29,7 +30,7 @@ sub CommentDivWrapper {
       return $q->start_div({-class=>'userComment'});
     }
   }
-  if ($OpenPageName =~ /$CommentsPattern/o) {
+  if ($OpenPageName =~ /$CommentsPattern/) {
     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'})

modules/commentcount.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('commentcount.pl', 'Comment Count Extension');
 
@@ -51,7 +52,7 @@ 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))/ge; # undo urlencode
+    $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/eg; # undo urlencode
     my $comments = GetPageContent($id);
     my $num = 0;
     if($comments =~ /=== (\d+) Comments?\. ===/) {

modules/compilation.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('compilation.pl', 'Compilation Extension');
 

modules/context.pl

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('context.pl', 'Calendar Extension');
 

modules/creationdate.pl

@@ -24,6 +24,7 @@
 # Of course, you can customize this to store more information
 
 use strict;
+use v5.10;
 
 AddModuleDescription('creationdate.pl', 'CreationDate Module');
 

modules/creole.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ creole.pl                          ]====================
 
@@ -217,7 +218,7 @@ sub CreoleRule {
   }
   # escape next char (and prevent // in URLs from enabling italics)
   # ~
-  elsif (m/\G(~($FullUrlPattern|\S))/cgo) {
+  elsif (m/\G(~($FullUrlPattern|\S))/cg) {
     return
       ($CreoleTildeAlternative and
        index( 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -233,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\}\})/cgos) {
+  elsif (m/\G(\{\{$FreeLinkPattern$CreoleLinkTextPattern\}\})/cgs) {
     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\}\}/cgos) {
+  elsif (m/\G\{\{$FullUrlPattern$CreoleLinkTextPattern\}\}/cgs) {
     return GetCreoleImageHtml(
       $q->a({-href=> UnquoteHtml($1),
              -class=> 'image outside'},
@@ -249,7 +250,7 @@ sub CreoleRule {
   }
   # image link: [[link|{{pic}}]] and [[link|{{pic|text}}]]
   elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkPipePattern
-              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
+              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
     my $text = $5 || $2;
     return GetCreoleLinkHtml($1, GetCreoleImageHtml(
       ScriptLink(UrlEncode(FreeToNormal($2)),
@@ -260,7 +261,7 @@ sub CreoleRule {
   }
   # image link: [[link|{{url}}]] and [[link|{{url|text}}]]
   elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkPipePattern
-              \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
+              \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
     my $text = $5 || $2;
     return GetCreoleLinkHtml($1, GetCreoleImageHtml(
       ScriptLink(UrlEncode(FreeToNormal($2)),
@@ -271,7 +272,7 @@ sub CreoleRule {
   }
   # image link: [[url|{{pic}}]] and [[url|{{pic|text}}]]
   elsif (m/\G(\[\[$FullUrlPattern$CreoleLinkPipePattern
-              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgosx) {
+              \{\{$FreeLinkPattern$CreoleLinkTextPattern\}\}\]\])/cgsx) {
     my $text = $5 || $2;
     return GetCreoleLinkHtml($1, GetCreoleImageHtml(
       $q->a({-href=> UnquoteHtml($2), -class=> 'image outside'},
@@ -282,7 +283,7 @@ sub CreoleRule {
   }
   # image link: [[url|{{url}}]] and [[url|{{url|text}}]]
   elsif (m/\G\[\[$FullUrlPattern$CreoleLinkPipePattern
-             \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\]/cgosx) {
+             \{\{$FullUrlPattern$CreoleLinkTextPattern\}\}\]\]/cgsx) {
     return GetCreoleImageHtml(
       $q->a({-href=> UnquoteHtml($1), -class=> 'image outside'},
             $q->img({-src=> UnquoteHtml($2),
@@ -291,7 +292,7 @@ sub CreoleRule {
                      -class=> 'url outside'})));
   }
   # link: [[url]] and [[url|text]]
-  elsif (m/\G\[\[$FullUrlPattern$CreoleLinkTextPattern\]\]/cgos) {
+  elsif (m/\G\[\[$FullUrlPattern$CreoleLinkTextPattern\]\]/cgs) {
     # Permit embedding of Creole syntax within link text. (Rather complicated,
     # but it does the job remarkably.)
     my $link_url  = $1;
@@ -304,7 +305,7 @@ sub CreoleRule {
     return GetUrl($link_url, $link_text, 1);
   }
   # link: [[page]] and [[page|text]]
-  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkTextPattern\]\])/cgos) {
+  elsif (m/\G(\[\[$FreeLinkPattern$CreoleLinkTextPattern\]\])/cgs) {
     my $markup =    $1;
     my $page_name = $2;
     my $link_text = $4 ? CreoleRuleRecursive($4, @_) : $page_name;
@@ -314,7 +315,7 @@ sub CreoleRule {
   }
   # interlink: [[Wiki:page]] and [[Wiki:page|text]]
   elsif ($is_interlinking and
-         m/\G(\[\[$FreeInterLinkPattern$CreoleLinkTextPattern\]\])/cgos) {
+         m/\G(\[\[$FreeInterLinkPattern$CreoleLinkTextPattern\]\])/cgs) {
     my $markup =    $1;
     my $interlink = $2;
     my $interlink_text = $4;

modules/creoleaddition.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ creoleaddition.pl                  ]====================
 

modules/crossbar.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ crossbar.pl                         ]====================
 

modules/crumbs.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('crumbs.pl', 'List Parent Pages Extension');
 
@@ -27,8 +28,8 @@ $RuleOrder{\&CrumbsRule} = -10; # run before default rules!
 
 sub CrumbsRule {
   if (not (pos) # first!
-      and (($WikiLinks && /\G($LinkPattern\n)/cgo)
+      and (($WikiLinks && /\G($LinkPattern\n)/cg)
-	   or ($FreeLinks && /\G(\[\[$FreeLinkPattern\]\]\n)/cgo))) {
+	   or ($FreeLinks && /\G(\[\[$FreeLinkPattern\]\]\n)/cg))) {
     my $oldpos = pos; # will be trashed below
     my $cluster = FreeToNormal($2);
     my %seen = ($cluster => 1);

modules/css-install.pl

@@ -1,4 +1,5 @@
 use strict;
+use v5.10;
 
 =head1 NAME
 

modules/csv.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('csv.pl', 'Comments on Long Table Markup Extension');
 

modules/dates.pl

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('dates.pl', 'Dates Extension');
 

modules/delete-all.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('delete-all.pl');
 

modules/despam.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 our ($q, $Now, %IndexHash, %Action, %Page, $OpenPageName, $FS, $BannedContent, $RcFile, $RcDefault, @MyAdminCode, $FullUrlPattern, $DeletedPage, $StrangeBannedContent);
 
@@ -132,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 ($text, $rev) = GetTextRevision($revision, 1); # quiet
+    my ($revisionPage, $rev) = GetTextRevision($revision, 1); # quiet
     if (not $rev) {
       print ': ' . Ts('Cannot find revision %s.', $revision);
       return;
-    } elsif (not DespamBannedContent($text)) {
+    } elsif (not DespamBannedContent($revisionPage->{text})) {
       my $summary = Tss('Revert to revision %1: %2', $revision, $rule);
       print ': ' . $summary;
-      Save($OpenPageName, $text, $summary) unless GetParam('debug', 0);
+      Save($OpenPageName, $revisionPage->{text}, $summary) unless GetParam('debug', 0);
       return;
     }
   }

modules/diff.pl

@@ -14,6 +14,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('diff.pl', 'Diff Action Extension');
 

modules/div-foo.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('div-foo.pl', 'Div Foo Extension');
 

modules/dojo.pl

@@ -14,6 +14,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('dojo.pl', 'Using Dojo Instead Of Wiki Markup');
 
@@ -29,7 +30,7 @@ $DojoTheme = 'tundra';
 push (@MyRules, \&WysiwygRule);
 
 sub WysiwygRule {
-  if (m/\G(&lt;.*?&gt;)/gc) {
+  if (m/\G(&lt;.*?&gt;)/cg) {
     return $1 if substr($1,5,6) eq 'script'
       or substr($1,4,6) eq 'script';
     return UnquoteHtml($1);

modules/doubleclick.pl

@@ -22,6 +22,7 @@
 # JavaScript enabled for this to work.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('doubleclick.pl', 'Doubleclick Extension');
 

modules/download.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('download.pl', 'Download Extension');
 
@@ -27,8 +28,8 @@ push( @MyRules, \&DownloadSupportRule );
 # [[download:page name|alternate title]]
 
 sub DownloadSupportRule {
-  if (m/\G(\[\[download:$FreeLinkPattern\|([^\]]+)\]\])/cog
+  if (m/\G(\[\[download:$FreeLinkPattern\|([^\]]+)\]\])/cg
-      or m!\G(\[\[download:$FreeLinkPattern\]\])!cog) {
+      or m!\G(\[\[download:$FreeLinkPattern\]\])!cg) {
     Dirty($1);
     print GetDownloadLink($2, undef, undef, $3);
     return '';

modules/drafts.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 use File::Glob ':glob';
 our ($DraftDir);
@@ -28,7 +29,7 @@ push(@MyInitVariables, \&DraftInit);
 sub DraftInit {
   if (GetParam('Draft', '')) {
     SetParam('action', 'draft') ; # Draft button used
-  } elsif (-f "$DraftDir/" . GetParam('username', GetRemoteHost()) # draft exists
+  } elsif (-f "$DraftDir/" . GetParam('username', $q->remote_addr()) # draft exists
 	   and $FooterNote !~ /action=draft/) {                    # take care of mod_perl persistence
     $FooterNote = $q->p(ScriptLink('action=draft', T('Recover Draft'))) . $FooterNote;
   }
@@ -38,7 +39,7 @@ $Action{draft} = \&DoDraft;
 
 sub DoDraft {
   my $id = shift;
-  my $draft = $DraftDir . '/' . GetParam('username', GetRemoteHost());
+  my $draft = $DraftDir . '/' . GetParam('username', $q->remote_addr());
   if ($id) {
     my $text = GetParam('text', '');
     ReportError(T('No text to save'), '400 BAD REQUEST') unless $text;
@@ -47,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');
   }

modules/duckduckgo-search.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('duckduckgo-search.pl', 'Use DuckDuckGo For Searches');
 

modules/dynamic-comments.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('dynamic-comments.pl', 'Dynamic Comments Extension');
 

modules/dynlogo.pl

@@ -28,6 +28,7 @@
 #
 
 use strict;
+use v5.10;
 
 AddModuleDescription('dynlogo.pl', 'Dynamic Logo');
 

modules/edit-assist.pl

@@ -15,6 +15,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('edit-assist.pl', 'Edit Assist Extension');
 

modules/edit-cluster.pl

@@ -14,6 +14,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('edit-cluster.pl', 'Edit Cluster Extension');
 

modules/edit-paragraphs.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('edit-paragraphs.pl', 'Edit Paragraphs Extension');
 

modules/emailquote.pl

@@ -11,6 +11,7 @@
 # http://www.oddmuse.org/cgi-bin/oddmuse/Email_Quote_Extension
 
 use strict;
+use v5.10;
 
 AddModuleDescription('emailquote.pl', 'Email Quote Extension');
 
@@ -20,14 +21,14 @@ push(@MyRules, \&EmailQuoteRule);
 
 sub EmailQuoteRule {
     #  > on a line of its own should work
-    if ($bol && m/\G(\s*\n)*((\>))+\n/cog) {
+    if ($bol && m/\G(\s*\n)*((\>))+\n/cg) {
         return $q->p();
     }
     # > hi, you mentioned that:
     # >> I don't like Oddmuse.
     # > in last letter.
-    elsif ($bol && m/\G(\s*\n)*((\>)+)[ \t]/cog
+    elsif ($bol && m/\G(\s*\n)*((\>)+)[ \t]/cg
-           or InElement('dd') && m/\G(\s*\n)+((\>)+)[ \t]/cog) {
+           or InElement('dd') && m/\G(\s*\n)+((\>)+)[ \t]/cg) {
         my $leng = length($2) / 4;
         return CloseHtmlEnvironmentUntil('dd') . OpenHtmlEnvironment('dl',$leng, 'quote')
         . $q->dt() . AddHtmlEnvironment('dd');

modules/emoji.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('emoji.pl', 'Smilies');
 

modules/enclosure.pl

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('enclosure.pl', 'Podcasting');
 
@@ -27,7 +28,7 @@ push(@MyRules, \&EnclosureRule);
 # [[enclosure:url|size in bytes|mime type]]
 
 sub EnclosureRule {
-  if (m!\G\[\[enclosure:\s*$FreeLinkPattern(\|([^\]]+))?\]\]!ogci) {
+  if (m!\G\[\[enclosure:\s*$FreeLinkPattern(\|([^\]]+))?\]\]!cgi) {
     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
@@ -55,8 +56,8 @@ sub NewEnclosureRssItem {
   my $id = shift;
   my $rss = OldEnclosureRssItem($id, @_);
   require MIME::Base64;
-  my %data = ParseData(ReadFileOrDie(GetPageFile($id)));
+  my $data = ParseData(ReadFileOrDie(GetPageFile($id)));
-  my @enclosures = split(' ', $data{enclosures});
+  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

modules/faq.pl

@@ -24,6 +24,7 @@
 # the css classes div.question and div.answer.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('faq.pl', 'FAQ Extension');
 
@@ -37,10 +38,10 @@ $FaqAnswerText = "Answer: " unless $FaqAnswerText;
 push(@MyRules, \&FaqRule);
 
 sub FaqRule {
-  if ($bol && m/\GQ: (.+)/gc) {
+  if ($bol && m/\GQ: (.+)/cg) {
     return $q->a({name=>'FAQ_' . UrlEncode($1)},'')
       . $q->div({class=>'question'}, $FaqQuestionText . $1);
-  } elsif ($bol && m/\GA:[ \t]*/gc) {
+  } elsif ($bol && m/\GA:[ \t]*/cg) {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment('div', "class='answer'") . $FaqAnswerText;
   }

modules/fckeditor.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA,
 
 use strict;
+use v5.10;
 
 AddModuleDescription('fckeditor.pl', 'Using FCKeditor In Addition To Wiki Markup');
 
@@ -28,7 +29,7 @@ $FCKeditorHeight = 400; # Pixel
 push (@MyRules, \&WysiwygRule);
 
 sub WysiwygRule {
-  if (m/\G(<.*?>)/gc) {
+  if (m/\G(<.*?>)/cg) {
     return $1 if substr($1,5,6) eq 'script'
       or substr($1,4,6) eq 'script';
     return UnquoteHtml($1);

modules/fieldlist.pl

@@ -11,6 +11,7 @@
 # http://www.oddmuse.org/cgi-bin/oddmuse/Field_List_Extension
 
 use strict;
+use v5.10;
 
 AddModuleDescription('fieldlist.pl', 'Field List Extension');
 

modules/find.pl

@@ -14,6 +14,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('find.pl', 'Find Extension');
 

modules/fix-encoding.pl

@@ -14,6 +14,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('fix-encoding.pl', 'Fix Encoding');
 

modules/flashbox.pl

@@ -1,257 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-
-# ====================[ flashbox.pl                        ]====================
-
-=head1 NAME
-
-flashbox - An Oddmuse module for embedding offsite-hosted Flash videos within
-           an Oddmuse Wiki page - especially those hosted by Google Videos,
-           YouTube, and SlideShare.
-
-=head1 INSTALLATION
-
-flashbox is easily installable: move this file into the B<wiki/modules/>
-directory of your Oddmuse Wiki.
-
-=cut
-AddModuleDescription('flashbox.pl', 'Flashbox Extension');
-
-our ($bol, @MyRules, %RuleOrder);
-
-# ....................{ CONFIGURATION                      }....................
-
-=head1 CONFIGURATION
-
-flashbox is easily configurable: set these variables in the B<wiki/config.pl>
-file for your Oddmuse Wiki.
-
-=cut
-our ($FlashboxWidth,
-            $FlashboxHeight);
-
-=head2 $FlashboxWidth
-
-The width of the HTML object "frame" for Flash videos, in pixels.
-
-The default value for this variable is (usually) fine.
-
-=cut
-$FlashboxWidth = 420;
-
-=head2 $FlashboxHeight
-
-The height of the HTML object "frame" for Flash videos, in pixels. For any
-specific width, a height roughly 83.33% of that width tends to provide a
-respectable frame for viewing Flash videos.
-
-The default value for this variable is (usually) fine.
-
-=cut
-$FlashboxHeight = 350;
-
-# ....................{ MARKUP                             }....................
-
-=head1 MARKUP
-
-flashbox provides a few new markup rules. These are:
-
-=over
-
-=item [[GoogleVideo:${GoogleVideoID}]]
-
-=over
-
-=item Embeds the Google Video uniquely identified by ${GoogleVideoID} into the
-      Oddmuse Wiki page, where ${GoogleVideoID} is the signed integer
-      following the "docID" parameter in the Google Video URL for that video;
-      for example, [[GoogleVideo:8649250863235826256]] embeds Derrick Jensen's
-      "Endgame: Part I" Google Video into the Oddmuse Wiki page.
-
-=back
-
-=item [[YouTube:${YouTubeVideoID}]]
-
-=over
-
-=item Embeds the YouTube video uniquely identified by ${YouTubeVideoID} into the
-      Oddmuse Wiki page, where ${YouTubeVideoID} is the string following the
-      "watch?v" parameter in the YouTube URL for that video; for example,
-      [[YouTube:Q1ZeXnmDZMQ]] embeds James Howard Kunstler's "The Tragedy of
-      Suburbia TED Talk" YouTube video into the Oddmuse Wiki page.
-
-=back
-
-=item [[SlideShare:${SlideSharePresentationID}]]
-
-=over
-
-=item Embeds the SlideShare presentation uniquely identified by
-      ${SlideSharePresentationID} into the Oddmuse Wiki page, where
-      ${SlideSharePresentationID} is a string composed of the title for that
-      presentation and an arbitrary signed integer. Unfortunately, this string
-      is more difficult to obtain than for Google Video and YouTube; for any
-      given presentation, see the small "Embed" box on that presentation's
-      SlideShare page and the string following the "doc" parameter in that
-      box. For example,
-      [[SlideShare:the-tyranny-of-human-civilization-13479]] embeds
-      huer1278ft's "The Tyranny of Human Civilization" SlideShare presentation
-      into the Oddmuse Wiki page.
-
-=back
-
-=back
-
-=cut
-push(@MyRules, \&FlashboxRule);
-
-# "FlashboxRule" conflicts with "CreoleRule"-style interpretation of "[[...]]"
-# syntax; and must, thus, be applied before that rule.
-$RuleOrder{\&FlashboxRule} = -11;
-
-sub FlashboxRule {
-  if    (/\G\[\[googlevideo:([0-9-]+)\]\]/cgi) {
-    return FlashboxHtml('googlevideo',
-                        "http://video.google.com/googleplayer.swf?docId=${1}&hl=en");
-  }
-  elsif (/\G\[\[slideshare:([a-z0-9-]+)\]\]/cgi) {
-    return FlashboxHtml('slideshare',
-                        "http://static.slideshare.net/swf/ssplayer2.swf?doc=${1}");
-  }
-  elsif (/\G\[\[youtube:([a-z0-9-_]{11})\]\]/cgi) {
-    return FlashboxHtml('youtube',
-                        "http://www.youtube.com/v/${1}");
-  }
-  return;
-}
-
-sub FlashboxHtml {
-  my ($paragraph_class, $flashbox_url) = @_;
-  return
-    ($bol
-     ? CloseHtmlEnvironments().AddHtmlEnvironment('p', qq~class="flashbox ${paragraph_class}"~)
-     : '').qq~
-<object width="${FlashboxWidth}" height="${FlashboxHeight}">
-  <param name="movie"     value="${flashbox_url}"/>
-  <param name="pluginurl" value="http://www.macromedia.com/go/getflashplayer"/>
-  <param name="quality"   value="high"/>
-  <param name="wmode"     value="transparent"/>
-  <param name="allowFullScreen"   value="true"/>
-  <param name="allowScriptAccess" value="always"/>
-  <embed type="application/x-shockwave-flash"
-         width="${FlashboxWidth}" height="${FlashboxHeight}"
-         src="${flashbox_url}"
-         wmode="transparent"
-         allowscriptaccess="always" allowfullscreen="true"/>
-</object>~;
-}
-
-=head1 CSS
-
-flashbox also provides a few new HTML classes for CSS-stylizing the HTML emitted
-by these markup rules. Of necessity, flashbox embeds Flash videos in an
-"<object>...</object>" HTML tag-set; technically, therefore, you can stylize
-such videos with a CSS selector resembling:
-
-  # This CSS selector selects all HTML-embedded objects (e.g., Flash videos).
-  object {
-    # These CSS properties are supposed to horizontally center such objects;
-    # however, they do not.
-    margin:  1.500em auto;
-    padding: 1.500em 0.000em 0.500em 0.000em;
-    text-align:  center;
-    text-indent: 0.000em;
-  }
-
-Unfortunately, most browsers ignore most CSS properties on the CSS "object"
-selector (including those in the example, above).
-
-To circumvent this, flashbox enwraps all block-level, flashbox-specific markup
-(i.e., flashbox-specific markup preceded by at least two newlines) within an
-HTML paragraph having two unique classes. This HTML paragraph, unlike the
-"<object>...</object>" HTML tag-set, is styleable by all browsers via CSS
-selection of these classes:
-
-=over
-
-=item "flashbox"; and
-
-=item "googlevideo", "youtube", or "slideshare" - according to which offsite host
-      a Flash video is embedded from.
-
-=back
-
-Let's illustrate with a crude example. Suppose some Oddmuse Wiki page contains
-this text markup:
-
-  In this compelling reading of his, perhaps, most well-read poetry, Carl Sagan
-  thunders the truth, Vangelis supplies the angel’s harp and music, and YouTube
-  plies the photo-montage seas of "this pale, blue dot": our Earth, from afar.
-
-  [[YouTube:p86BPM1GV8M]]
-
-Then, flashbox transmutes that text markup into HTML markup resembling:
-
-  <p>
-  In this compelling reading of his, perhaps, most well-read poetry, Carl Sagan
-  thunders the truth, Vangelis supplies the angel’s harp and music, and YouTube
-  plies the photo-montage seas of "this pale, blue dot": our Earth, from afar.
-  </p>
-  <p class="flashbox youtube">
-    <object width="420" height="350">
-      <param name="movie"     value="http://www.youtube.com/v/p86BPM1GV8M"/>
-      <param name="pluginurl" value="http://www.macromedia.com/go/getflashplayer"/>
-      <embed type="application/x-shockwave-flash"
-             width="420" height="350"
-             src="http://www.youtube.com/v/p86BPM1GV8M"/>
-    </object>
-  </p>
-
-Then, your CSS stylesheet can style this HTML markup with CSS resembling:
-
-  # This CSS selector selects flashbox-embedded Flash videos.
-  p.flashbox {
-    # These CSS properties horizontally center such videos.
-    margin:  1.500em auto;
-    padding: 1.500em 0.000em 0.500em 0.000em;
-    text-align:  center;
-    text-indent: 0.000em;
-  }
-
-  # This CSS selector selects flashbox-embedded, YouTube-specific Flash videos.
-  p.youtube {
-    # These CSS properties background and border such videos.
-    background: #334466;
-    border:     #112255 0.125em solid;
-  }
-
-Wew! There; that wasn't so gruesomely detailed, was it?
-
-=head1 SEE ALSO
-
-The oddmuse.org "YouTube" page off which this Oddmuse extension was founded, at:
-
-L<http://www.oddmuse.org/cgi-bin/oddmuse/YouTube>
-
-=head1 COPYRIGHT AND LICENSE
-
-The information below applies to everything in this distribution,
-except where noted.
-
-Copyleft 2008 by B.w.Curry <http://www.raiazome.com>.
-
-This file is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This file is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this file; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-=cut

modules/flickrgallery.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('flickrgallery.pl', 'FlickrGallery Module');
 
@@ -65,7 +66,7 @@ $RuleOrder{\&FlickrGalleryRule} = -10;
 
 sub FlickrGalleryRule {
 	# This code is used when Markdown is not available
-	if (/\G^([\n\r]*\<\s*FlickrSet:\s*(\d+)\s*\>\s*)$/mgci) {
+	if (/\G^([\n\r]*\<\s*FlickrSet:\s*(\d+)\s*\>\s*)$/cgim) {
 		my $oldpos = pos;
 		my $oldstr = $_;
 
@@ -78,7 +79,7 @@ sub FlickrGalleryRule {
 		return '';
 	}
 
-	if (/\G^([\n\r]*\<\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\>\s*)$/mgci) {
+	if (/\G^([\n\r]*\<\s*FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\>\s*)$/cgim) {
 		my $oldpos = pos;
 		my $oldstr = $_;
 
@@ -102,13 +103,13 @@ sub MarkdownFlickrGalleryRule {
 		^<FlickrSet:\s*(\d+)\s*\>
 	}{
 		FlickrGallery($1);
-	}xmgei;
+	}egimx;
 
 	$text =~ s{
 		^<FlickrPhoto:\s*(\d+)\s*([a-z0-9]*?)\s*($size)?\s*\>
 	}{
 		GetFlickrPhoto($1,$2,$3);
-	}xmgei;
+	}egimx;
 
 	return $text
 }
@@ -134,7 +135,7 @@ sub FlickrGallery {
 
 	$result = $FlickrHeaderTemplate;
 
-	$result =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
+	$result =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
 
 	# Get list of photos and process them
 	$url = $FlickrBaseUrl . "?method=flickr.photosets.getPhotos&api_key=" .
@@ -152,7 +153,7 @@ sub FlickrGallery {
 
 	my $footer = $FlickrFooterTemplate;
 
-	$footer =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
+	$footer =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
 	$result .= $footer;
 
 	return $result;
@@ -191,7 +192,7 @@ sub FlickrPhoto {
 
 
 	my $output = $FlickrImageTemplate;
-	$output =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/gee;
+	$output =~ s/(\$[a-zA-Z\d]+)/"defined $1 ? $1 : ''"/eeg;
 
 	return $output
 }

modules/footnotes.pl

@@ -1,8 +1,11 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ footnotes.pl                       ]====================
 
+=encoding utf8
+
 =head1 NAME
 
 footnotes - An Oddmuse module for adding footnotes to Oddmuse Wiki pages.
@@ -239,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)?)/gcos) {
+  if (m/\G($FootnotePattern)(?=([ \t]*$FootnotePattern)?)/cgs) {
     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+)$/o) {
+    if ($footnote_text =~ m/^(\d+)-(\d+)$/) {
       my ($footnote_number_first, $footnote_number_last) = ($1, $2);
       # '–', below, is the HTML entity for a Unicode en-dash.
       print $q->a({-href=> '#footnotes' .$footnote_number_first,
@@ -258,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+)$/o) {
+    elsif ($footnote_text =~ m/^(\d+)$/) {
       my $footnote_number = $1;
       print $q->a({-href=> '#footnotes' .$footnote_number,
                    -title=> 'Footnote #'.$footnote_number,
@@ -282,7 +285,7 @@ sub FootnotesRule {
     return '';
   }
   # The "<footnotes>" list of all footnotes at the foot of a page.
-  elsif ($bol && m/\G($FootnotesPattern)/gcios) {
+  elsif ($bol && m/\G($FootnotesPattern)/cgis) {
     Clean(CloseHtmlEnvironments());
     Dirty($1);  # do not cache the prefixing "\G"
 

modules/form_timeout.pl

@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('form_timeout.pl', 'Form Timeout Extension');
 

modules/forms.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
 
 # ====================[ forms.pl                           ]====================
 
@@ -18,9 +19,9 @@ sub FormsRule {
       my $oldpos = pos;
       Clean(CloseHtmlEnvironments());
       Dirty($form);
-      $form =~ s/\%([a-z]+)\%/GetParam($1)/ge;
+      $form =~ s/\%([a-z]+)\%/GetParam($1)/eg;
       $form =~ s/\$([a-z]+)\$/$q->span({-class=>'param'}, GetParam($1))
-        .$q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/ge;
+        .$q->input({-type=>'hidden', -name=>$1, -value=>GetParam($1)})/eg;
       print UnquoteHtml($form);
       pos = $oldpos;
       return AddHtmlEnvironment('p');

modules/fractions.pl

@@ -14,6 +14,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('fractions.pl', 'Fractions');
 

modules/gd_security_image.pl

@@ -7,7 +7,7 @@
 #
 # Codes reused from questionasker.pl for Oddmuse
 # Copyright (C) 2004  Brock Wilcox <awwaiid@thelackthereof.org>
-# Copyright (C) 2006, 2007  Alex Schroeder <alex@gnu.org>
+# 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
@@ -23,10 +23,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('gd_security_image.pl', 'GD Security Image Extension');
 
-our ($q, $Now, %Action, $FullUrl, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, $DataDir, $ModuleDir, @MyInitVariables, %CookieParameters, %InvisibleCookieParameters);
+our ($q, $Now, %Action, $FullUrl, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, $DataDir, $ModuleDir, @MyInitVariables, %CookieParameters, @MyFormChanges);
 
 =head1 DESCRIPTION
 
@@ -239,9 +240,9 @@ sub GdSecurityImageCheck {
   if ($answer ne '' && GdSecurityImageIsValidId($id)) {
     my ($status, $data) = ReadFile(GdSecurityImageGetTicketFile($id));
     if ($status) {
-      my %page = ParseData($data);
+      my $page = ParseData($data);
-      if ($page{generation_time} + $GdSecurityImageDuration > $Now) {
+      if ($page->{generation_time} + $GdSecurityImageDuration > $Now) {
-        if ($answer eq $page{string}) {
+        if ($answer eq $page->{string}) {
           $GdSecurityImageId = '';
           if (!$GdSecurityImageRememberAnswer) {
             SetParam('gd_security_image_id', '');
@@ -324,22 +325,10 @@ sub NewGdSecurityImageDoPost {
   return (OldGdSecurityImageDoPost(@params));
 }
 
-*OldGdSecurityImageGetEditForm = \&GetEditForm;
+push(@MyFormChanges, \&GdSecurityImageAddTo);
-*GetEditForm = \&NewGdSecurityImageGetEditForm;
-
-sub NewGdSecurityImageGetEditForm {
-  return GdSecurityImageAddTo(OldGdSecurityImageGetEditForm(@_), $_[1]);
-}
-
-*OldGdSecurityImageGetCommentForm = \&GetCommentForm;
-*GetCommentForm = \&NewGdSecurityImageGetCommentForm;
-
-sub NewGdSecurityImageGetCommentForm {
-  return GdSecurityImageAddTo(OldGdSecurityImageGetCommentForm(@_));
-}
 
 sub GdSecurityImageAddTo {
-  my ($form, $upload) = @_;
+  my ($form, $type, $upload) = @_;
   if (not $upload
       and not GdSecurityImageException(GetId())
       and not UserIsEditor()) {
@@ -396,7 +385,5 @@ sub GdSecurityImageInitVariables {
   $GdSecurityImagePngToAA = "$ModuleDir/pngtoaa";
 
   $CookieParameters{'gd_security_image_id'} = '';
-  $InvisibleCookieParameters{'gd_security_image_id'} = 1;
   $CookieParameters{'gd_security_image_answer'} = '';
-  $InvisibleCookieParameters{'gd_security_image_answer'} = 1;
 }

modules/git-another.pl

@@ -14,6 +14,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('git-another.pl', 'Another Git Extension');
 

modules/git.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 =head1 NAME
 

modules/google-custom-search.pl

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 our ($q);
 our ($GoogleCustomSearchEngine);

modules/google-plus-one.pl

@@ -18,41 +18,72 @@ use v5.10;
 
 AddModuleDescription('google-plus-one.pl', 'Google Plus One Module');
 
-our ($q, @MyAdminCode, %Action);
+our ($q, $RCName, @MyFooters, @MyAdminCode, %Action, @MyInitVariables, $CommentsPrefix);
 
 my $data_uri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAAYCAMAAABnVuv4AAAAhFBMVEUAAAD////MzMz5+fkWau+zs7Pg4OD39/fh4eHu7u7z8/Pk5OTm5ubX19fx8fHj4+N+fn5jY2Ojo6N/f3/r7Ov29vbq6ero6Oj19fUVau0XafC3zO3q6ulKie2dve89ge1yoexkmeyNsepZk+/T3u4weu4jcu7E1Ox9p+rExMTX4vLi6PBsAh6oAAAAAXRSTlMAQObYZgAAAWtJREFUOMvFldluwjAQRU24LgHTpAsEgglL2Nv//7/OeGLLqlTXD5V6HM/c2NJRMJGilClSGCW8DbwEXgPvA+QqRylKI66kLNiKUZri72X6OQOdKxtn8E+yCTMOjQdBhbvEbNkkA5EBoJKULdc0ltHksv447ZaM7JJMNO1PstLZ9Gw2W9PgSxJXe4V1QZZIxiIGI4AbWs5hso1lFY0BwLXzEcBnWK8qJ9uIDKxlMbjyKnex6SoCcO2CKy7xupxZG57GKSBBbsSmp56btYC1t+l5v9vhNI0QmZyZVC+DPKa4IlkHR8f5gD4hQyzb0AhntvAcuo5U3YHzvrWLCJZFmlZ+pp/Rv9k022a75do0ABWKHCTJ9e0923Bmn6ij92xOrAaA1YpvLPZzCrJO+yxLE2Rm7rnfpfc4UjV+x2TLzEBtAvURvYnIl9UDJU8qcsmSL9myMoNs2VMGWtVZHxT9+N310ErVRYpaCToD9QXtvTL0OWiBLQAAAABJRU5ErkJggg==';
 
-# Two step Google +1 button to protect your privacy: show this at the bottom
+# Make sure journal pages set a global variable which we then use to
-# of every form.
+# hide the +1 button.
 
-*MyOldGetCommentForm=*GetCommentForm;
+*OldGooglePlusPrintJournal = \&PrintJournal;
-*GetCommentForm=*MyNewGetCommentForm;
+*PrintJournal = \&NewGooglePlusPrintJournal;
 
-sub MyNewGetCommentForm {
+my $GooglePlusThisPagePrintedJournal;
-  return MyOldGetCommentForm(@_) . qq{
+
+push(@MyInitVariables, sub {
+  $GooglePlusThisPagePrintedJournal = 0;
+     });
+
+sub NewGooglePlusPrintJournal {
+  $GooglePlusThisPagePrintedJournal = 1;
+  return OldGooglePlusPrintJournal(@_);
+}
+
+# Use a two step Google +1 button to protect your privacy: show this
+# at the bottom of every page but not on comment pages, Recent
+# changes, and pages that printed a journal.
+
+unshift(@MyFooters, \&GooglePlusPrintFooter);
+
+sub GooglePlusPrintFooter {
+  my ($id, $rev, $comment) = @_;
+  if (not $GooglePlusThisPagePrintedJournal
+      and (GetParam('action', 'browse') eq 'plusone'
+	   or (GetParam('action', 'browse') eq 'browse'
+	       and $id
+	       and $id ne $RCName
+	       and (not $CommentsPrefix or $id !~ /^$CommentsPrefix(.*)/)))) {
+    return q{
+<!-- start of Google+ -->
 <script type="text/javascript">
-function loadScript(jssource,thelink) {
+function loadScript(jssource,link_id) {
+   // add javascript
    var jsnode = document.createElement('script');
    jsnode.setAttribute('type','text/javascript');
    jsnode.setAttribute('src',jssource);
    document.getElementsByTagName('head')[0].appendChild(jsnode);
-   document.getElementById(thelink).innerHTML = "";
+   // add button
+   var butn = document.createElement('div');
+   butn.setAttribute('class', 'g-plusone');
+   butn.setAttribute('id', 'my_plusone');
+   var link = document.getElementById(link_id);
+   link.parentNode.insertBefore(butn, link);
+   // hide the link
+   link.innerHTML = "";
  }
  var plus1source = "https://apis.google.com/js/plusone.js";
 </script>
-<a id="plus1" href="javascript:loadScript(plus1source,'plus1')">
+<p id="plus1">
-  <img src="$data_uri" alt="Show Google +1" />
+  <a href="javascript:loadScript(plus1source,'plus1')">
-</a>
+    <img src="/pics/plusone-h24.png" alt="Show Google +1" />
-<!-- <g:plusone></g:plusone> -->
+  </a>
-<div class="g-plusone" id="my_plusone"></div>
+</p>
-<script type="text/javascript">
+<!-- end of Google+ -->
-  document.getElementById("my_plusone").setAttribute("data-size", "medium");
-  document.getElementById("my_plusone").setAttribute("data-href", document.location.href);
-</script>
 };
+  }
 }
 
-# Google +1 list                                                                                         
+# Google +1 list
 
 push(@MyAdminCode, sub {
        my ($id, $menuref, $restref) = @_;
@@ -71,7 +102,7 @@ sub DoPlusOne {
   foreach my $id (AllPagesList()) {
     push(@pages, $id) if $id =~ /^\d\d\d\d-\d\d-\d\d/;
   }
-  splice(@pages, 0, $#pages - 19); # last 20 items                                                       
+  splice(@pages, 0, $#pages - 19); # last 20 items
   print "<ul>";
   foreach my $id (@pages) {
     my $url = ScriptUrl(UrlEncode($id));

modules/google-search.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('google-search.pl', 'Use Google For Searches');
 

modules/gotobar.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 our (%Page, %IndexHash, %AdminPages, $HomePage, $RCName, @MyInitVariables, $LinkPattern, $FreeLinkPattern, $FullUrlPattern, $InterLinkPattern, $UserGotoBar, @UserGotoBarPages);
 
@@ -38,7 +39,7 @@ sub GotobarInit {
     @UserGotoBarPages = ();
     $UserGotoBar = '';
     my $count = 0;
-    while ($Page{text} =~ m/($LinkPattern|\[\[$FreeLinkPattern\]\]|\[\[$FreeLinkPattern\|([^\]]+)\]\]|\[$InterLinkPattern\s+([^\]]+?)\]|\[$FullUrlPattern[|[:space:]]([^\]]+?)\])/og) {
+    while ($Page{text} =~ m/($LinkPattern|\[\[$FreeLinkPattern\]\]|\[\[$FreeLinkPattern\|([^\]]+)\]\]|\[$InterLinkPattern\s+([^\]]+?)\]|\[$FullUrlPattern[|[:space:]]([^\]]+?)\])/g) {
       my $page = $2||$3||$4||$6||$8;
       my $text = $5||$7||$9;
       $UserGotoBar .= ' ' if $UserGotoBar;

modules/gravatar.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2010–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
@@ -13,12 +13,13 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('gravatar.pl', 'Gravatar');
 
 use Digest::MD5 qw(md5_hex);
 
-our ($q, $bol, %CookieParameters, $FullUrlPattern, @MyRules, @MyInitVariables);
+our ($q, $bol, %CookieParameters, $FullUrlPattern, @MyRules, @MyInitVariables, @MyFormChanges);
 
 # Same as in mail.pl
 $CookieParameters{mail} = '';
@@ -28,7 +29,7 @@ my $gravatar_regexp = "\\[\\[gravatar:(?:$FullUrlPattern )?([^\n:]+):([0-9a-f]+)
 push(@MyRules, \&GravatarRule);
 
 sub GravatarRule {
-  if ($bol && m!\G$gravatar_regexp!cog) {
+  if ($bol && m!\G$gravatar_regexp!cg) {
     my $url = $1;
     my $gravatar = "https://secure.gravatar.com/avatar/$3";
     my $name = FreeToNormal($2);
@@ -45,13 +46,12 @@ sub GravatarRule {
   return;
 }
 
-*GravatarOldGetCommentForm = \&GetCommentForm;
+sub GravatarFormAddition {
-*GetCommentForm = \&GravatarNewGetCommentForm;
+  my ($html, $type) = @_;
+
+  # gravatars only make sense for comments
+  return $html unless $type eq 'comment';
 
-sub GravatarNewGetCommentForm {
-  my $html = GravatarOldGetCommentForm(@_);
-  # the implementation in mail.pl takes precedence!
-  return $html if defined &MailNewGetCommentForm;
   my $addition = $q->span({-class=>'mail'},
 			  $q->label({-for=>'mail'}, T('Email: '))
 			  . ' ' . $q->textfield(-name=>'mail', -id=>'mail',
@@ -63,6 +63,12 @@ sub GravatarNewGetCommentForm {
 push(@MyInitVariables, \&AddGravatar);
 
 sub AddGravatar {
+
+  # the implementation in mail.pl takes precedence!
+  if (not grep { $_ == \&MailFormAddition } @MyFormChanges) {
+    push(@MyFormChanges, \&GravatarFormAddition);
+  }
+
   my $aftertext = UnquoteHtml(GetParam('aftertext'));
   my $mail = GetParam('mail');
   $mail =~ s/^[ \t]+//;
@@ -84,6 +90,6 @@ sub AddGravatar {
 
 sub GravatarNewGetSummary {
   my $summary = GravatarOldGetSummary(@_);
-  $summary =~ s/^$gravatar_regexp *//o;
+  $summary =~ s/^$gravatar_regexp *//;
   return $summary;
 }

modules/grep.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('grep.pl');
 
@@ -44,7 +45,7 @@ sub PrintGrep {
   foreach my $id (AllPagesList()) {
     my $text = GetPageContent($id);
     next if (TextIsFile($text)); # skip files
-    while ($text =~ m{($regexp)}ig) {
+    while ($text =~ m{($regexp)}gi) {
       print $q->li(GetPageLink($id) . ': ' . $1);
     }
   }

modules/header-and-footer-templates.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('header-and-footer-templates.pl', 'Comments on HTML Templates');
 

modules/headers.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('headers.pl', 'Header Markup Extension');
 
@@ -40,7 +41,7 @@ $RuleOrder{\&HeadersRule} = 95;
 
 sub HeadersRule {
   my $oldpos = pos;
-  if ($bol && (m/\G((.+?)[ \t]*\n(---+|===+)[ \t]*\n)/gc)) {
+  if ($bol && (m/\G((.+?)[ \t]*\n(---+|===+)[ \t]*\n)/cg)) {
     my $html = CloseHtmlEnvironments() . ($PortraitSupportColorDiv ? '</div>' : '');
     if (substr($3,0,1) eq '=') {
       $html .= $q->h2($2);

modules/headlines.pl

@@ -18,6 +18,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('headlines.pl', 'Headlines Extension');
 
@@ -31,7 +32,7 @@ push(@MyRules, \&HeadlinesRule);
 $HeadlineNumber = 20;
 
 sub HeadlinesRule {
-  if (m/\G(\<headlines(:(\d+))?\>)/gci) {
+  if (m/\G(\<headlines(:(\d+))?\>)/cgi) {
     if (($3) and ($3>0)) {$HeadlineNumber = $3;};
     Clean(CloseHtmlEnvironments());
     Dirty($1);

modules/hibernal.pl

@@ -1,8 +1,12 @@
 #!/usr/bin/env perl
 use strict;
+use v5.10;
+use utf8;
 
 # ====================[ hibernal.pl                        ]====================
 
+=encoding utf8
+
 =head1 NAME
 
 hibernal - An Oddmuse module for improved multi- and single-blogging.
@@ -1208,7 +1212,7 @@ sub GetHibernalArchiveMonth {
   ~e;
   $html_month =~ s~( {1,2})(\d{1,2})\b~
     $1.GetHibernalArchiveMonthDay($post_name_regexp, $year, $month, $2)
-  ~ge;
+  ~eg;
 
   # Float the HTML for each month horizontally past the month preceding it;
   # failure to float months in this manner causes these months to stack

modules/hiddenpages.pl

@@ -25,6 +25,7 @@
 # page cluster.
 
 use strict;
+use v5.10;
 
 AddModuleDescription('hiddenpages.pl', 'Hidden Pages Extension');
 

modules/honeypot.pl

@@ -1,4 +1,5 @@
 use strict;
+use v5.10;
 
 =head1 NAME
 

modules/html-template.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('html-template.pl', 'HTML Templates');
 

modules/html-uploads.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('html-uploads.pl', 'Restricted HTML Upload');
 

modules/htmlcomment.pl

@@ -11,6 +11,7 @@
 # http://www.oddmuse.org/cgi-bin/oddmuse/Html_Comment_Extension
 
 use strict;
+use v5.10;
 
 AddModuleDescription('htmlcomment.pl', 'Html Comment Extension');
 

modules/htmllinks.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('htmllinks.pl', 'HtmlLinks Module');
 

modules/image.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('image.pl', 'Image Extension');
 
@@ -31,7 +32,7 @@ push(@MyRules, \&ImageSupportRule);
 
 sub ImageSupportRule {
   my $result = undef;
-  if (m!\G\[\[image((/[a-z]+)*)( external)?:\s*([^]|]+?)\s*(\|[^]|]+?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*\]\](\{([^}]+)\})?!gc) {
+  if (m!\G\[\[image((/[a-z]+)*)( external)?:\s*([^]|]+?)\s*(\|[^]|]+?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*(\|[^]|]*?)?\s*\]\](\{([^}]+)\})?!cg) {
     my $oldpos = pos;
     my $class = 'image' . $1;
     my $external = $3;

modules/imagify.pl

@@ -13,6 +13,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use v5.10;
 
 use Digest::SHA qw(sha256_hex);
 

modules/index.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('index.pl', 'Index Extension');
 

modules/irc.pl

@@ -17,6 +17,7 @@
 #    Boston, MA 02111-1307 USA
 
 use strict;
+use v5.10;
 
 AddModuleDescription('irc.pl', 'IRC Log Extension');
 
@@ -32,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; ?/gc) {
+  if ($bol && m/\G(?:\[?(\d\d?:\d\d(?:am|pm)?)\]?)?\s*&lt;($IrcNickRegexp)&gt; ?/cg) {
     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