Merge branch 'master' of git.sv.gnu.org:/srv/git/oddmuse

Conflicts:
	wiki.pl

.gitignore

@@ -5,3 +5,4 @@
 /Mac/pkg/
 *.dmg
 *.pkg
+.DS_Store

Makefile

@@ -17,24 +17,22 @@ build:
 	mkdir -p build
 
 build/wiki.pl: wiki.pl
-	sed "s/\\\$$q->a({-href=>'http:\/\/www.oddmuse.org\/'}, 'Oddmuse')/\\\$$q->a({-href=>'http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . &/" < $< > $@
+	perl -lne "s/(\\\$$q->a\({-href=>'http:\/\/www.oddmuse.org\/'}, 'Oddmuse'\))/\\\$$q->a({-href=>'http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@
 
 build/%-utf8.pl: modules/translations/%-utf8.pl
-	sed "s/<a href=\"http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tree\/modules\/translations\/\\(.*\\).pl\">\\(.*\\).pl<\/a>/<a href=\"http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tree\/modules\/translations\/\\1.pl?id=$(VERSION_NO)\">\\1.pl<\/a> (for $(VERSION_NO))/" < $< > $@
-
-# Currently oddtrans introduces encoding errors!
-
-# %-utf8.pl: wiki.pl $(MODULES)
-# 	perl oddtrans -l $@ $^ > $@-new && mv $@-new $@
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
 
 # from: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
 #   to: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27
 
 build/%.pl: modules/%.pl
-	sed "s/<a href=\"http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tree\/modules\/\\(.*\\).pl\">\\(.*\\).pl<\/a>/<a href=\"http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tree\/modules\/\\1.pl?id=$(VERSION_NO)\">\\1.pl<\/a> (for $(VERSION_NO))/" < $< > $@
-
-
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, undef, '$(VERSION_NO)')/; print" < $< > $@
 
+translations: $(TRANSLATIONS)
+	for f in $^; do \
+	  echo updating $$f...; \
+	  perl oddtrans -l $$f wiki.pl $(MODULES) > $$f-new && mv $$f-new $$f; \
+	done
 
 # UNTESTED/OBSOLETE: these targets have not been tested in a long time
 # and are potentially obsolete.

contrib/campaignwiki/README

@@ -0,0 +1,37 @@
+The files in this directory are used to run http://campaignwiki.org/
+
+add-link.pl
+===========
+
+This is used to add links to the Links To Wisdom wiki. This wiki is a
+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.
+
+http://campaignwiki.org/wiki/LinksToWisdom/HomePage
+
+copy.pl
+=======
+
+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.
+
+http://campaignwiki.org/wiki/BlogArchive/HomePage
+
+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.
+
+http://campaignwiki.org/wiki/Monsters/HomePage
+
+submit.pl
+=========
+
+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.
+
+http://campaignwiki.org/wiki/Planet/HomePage

contrib/campaignwiki/add-link.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2011  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2011–2014  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
@@ -15,8 +15,10 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 package OddMuse;
+
 use LWP::UserAgent;
 use HTML::TreeBuilder;
+use JSON::PP;
 use utf8;
 
 # load Oddmuse core
@@ -24,11 +26,14 @@ $RunCGI = 0;
 do "wiki.pl";
 
 # globals
+my $self = "http://campaignwiki.org/add-link";
 my $name = "OSR Links to Wisdom";
 my $wiki = 'LinksToWisdom';
 my $site = "http://campaignwiki.org/wiki/$wiki";
 # my $site = "http://localhost/wiki.pl";
 my $home = "$site/$HomePage";
+# http://www.emacswiki.org/pics/star.png
+my $stardata = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAFVBMVEUAAHkAAACzdRTapx3twwD/9qb////1YCa0AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfXAQYCJAu+WhwbAAAAKnRFWHRDb21tZW50AGJ5IFJhZG9taXIgJ1RoZSBTaGVlcCcgRG9waWVybGFza2kVfTXbAAAAYElEQVQI12NgQAKMMIaYAFTAzRDKCHOEMETCnEFyjIJhYS6OggwMoqGhaS7GRgIMjC6uYc5GikA5YRcXIyWwotBgJUWw7lAXsAyDaIihMlhK1FFA0AjEEAESQgJQu4EYAPAPC2XcokgQAAAAAElFTkSuQmCC';
 
 main();
 
@@ -47,9 +52,62 @@ sub toc {
       $labels{$value} = $label;
     }
   }
+  return \@values, \%labels;
+}
+
+sub top {
+  # start with the homepage
+  my %blog;
+  my $n;
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/[^\/\n\t ]+)/mg) {
+      $n++;
+      # handle blogspot domain munging
+      $item =~ s/blogspot(\.[a-z]+)+/blogspot.com/;
+      $blog{$item}++;
+    }
+  }
+  print $q->p("Total links counted: $n.");
+  my @list = sort { $blog{$b} <=> $blog{$a} } keys %blog;
+  # my $max = scalar @list;
+  # $max = 20 if $max > 20;
+  # @list = @list[0 .. $max -1];
+  @list = map {
+    my $domain = substr($_, index($_, '://') + 3);
+    my $term = quotemeta($domain);
+    # handle blogspot domain munging
+    $term =~ s/blogspot\\\.com/blogspot(\\.[a-z]+)+/;
+    $term = QuoteHtml($term);
+    $q->a({-href => $_}, $domain)
+	. " (" . $q->a({-href => "$self/match/$term"}, $blog{$_}) . ")";
+  } @list;
+  return \@list;
+}
+
+sub match {
+  my $term = shift;
+  # start with the homepage
+  my @list;
+  my $title;
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $line (split /\n/, GetPageContent(FreeToNormal($id))) {
+      if ($line =~ /^\*+\s+([^][\n]*)$/) {
+	$title = $1;
+      } elsif ($line =~ /$term/o) {
+	if ($line =~ /^\*+\s+\[(https?:\S+)\s+([^]]+)\]/) {
+	  push (@list, $q->a({-href => $1}, $2) . " (" . $title . ")");
+	}
+      }
+    }
+  }
+  return \@list;
+}
+
+sub html_toc {
+  my ($values, $labels) = toc();
   return $q->radio_group(-name =>'toc',
-			 -values => \@values,
-			 -labels => \%labels,
+			 -values => $values,
+			 -labels => $labels,
 			 -linebreak=>'true');
 }
 
@@ -57,102 +115,108 @@ sub default {
   print $q->p("Add a link to the " . $q->a({-href=>$home}, $name) . ".");
   print $q->start_multipart_form(-method=>'get', -class=>'submit');
   print $q->p($q->label({-for=>'url'}, T('URL:')) . ' '
-	      . $q->textfield(-name=>'url', -id=>'url', -size=>50));
-  print toc();
-  print $q->submit('go', 'Add!');
-  print $q->end_form();
-  print $q->p("Drag this bookmarklet to your bookmarks bar for easy access:",
+	      . $q->textfield(-name=>'url', -id=>'url', -size=>80));
+  print $q->p({-style=>'font-size: 10pt'},
+	      "(Drag this bookmarklet to your bookmarks bar for easy access:",
 	      $q->a({-href=>q{javascript:location='}
 		   . $q->url()
 		   . qq{?url='+encodeURIComponent(window.location.href)}},
-		    "Submit $name") . ".");
+		    "Submit $name") . ".)");
+  print html_toc();
+  print $q->submit('go', 'Add!');
+  print $q->end_form();
 }
 
-sub check_url {
-  my $toc = GetParam('toc');
-  return default() unless $toc;
-  my $url = shift;
-  if (not GetParam('confirm', 0)) {
-    my $name = get_name($url);
-    print $q->p("Please confirm that you want to add "
-		. GetUrl($url, $name)
-		. " to the section “$toc”.");
-    print $q->start_form(-method=>'get');
-    print $q->p($q->label({-for=>'name', -style=>'display: inline-block; width:30ex'},
-			  T('Use a different link name:')) . ' '
-		. $q->textfield(-style=>'display: inline-block; width:60ex',
-				-name=>'name', -id=>'name', -size=>50, -default=>$name)
-		. $q->br()
-	        . $q->label({-for=>'username', -style=>'display: inline-block; width:30ex'},
-			    T('Your name for the log file:')) . ' '
-	        . $q->textfield(-style=>'display: inline-block; width:60ex',
-				-name=>'username', -id=>'username', -size=>50));
-    my $star = $q->img({-src=>'http://www.emacswiki.org/pics/star.png', -class=>'smiley',
-			-alt=>'star'});
-    print '<p>Optionally: Do you want to rate it?<br />';
-    my $i = 0;
-    foreach my $label ($q->span({-style=>'display: inline-block; width:15ex'}, $star)
-		       . 'I might use this for my next campaign',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 2)
-		       . 'I have used this in a campaign and it worked as intended',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 3)
-		       . 'I have used it in many of my campaigns',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 4)
-		       . 'Everybody should give it a try',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 5)
-		       . 'Everybody should use it, that is how awesome it is!') {
-      $i++;
-      print qq{<label><input type="radio" name="stars" value="$i" $checked/>$label</label><br />};
-    }
-    print '</p>';
-    print $q->hidden('url', $url);
-    print $q->hidden('toc', $toc);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } else {
-    post_addition($q->param('name'), $url, $toc);
+sub confirm {
+  my ($url, $name, $toc) = @_;
+  print $q->p("Please confirm that you want to add "
+	      . GetUrl($url, $name)
+	      . " to the section “$toc”.");
+  print $q->start_form(-method=>'get');
+  print $q->p($q->label({-for=>'name', -style=>'display: inline-block; width: 15em'},
+			T('Use a different link name:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'name', -id=>'name', -size=>50, -default=>$name)
+	      . $q->br()
+	      . $q->label({-for=>'summary', -style=>'display: inline-block; width:15em'},
+			  T('An optional short summary:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'summary', -id=>'summary', -size=>50)
+	      . $q->br()
+	      . $q->label({-for=>'username', -style=>'display: inline-block; width:15em'},
+			  T('Your name for the log file:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'username', -id=>'username', -size=>50));
+  my $star = $q->img({-src=>$stardata, -class=>'smiley', -alt=>'☆'});
+  print '<p>Optionally: Do you want to rate it?<br />';
+  my $i = 0;
+  foreach my $label ($q->span({-style=>'display: inline-block; width:3em'}, $star)
+		     . 'I might use this for my campaign',
+		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 2)
+		     . 'I have used this in a campaign and it worked as intended',
+		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 3)
+		     . 'I have used this in a campaign and it was ' . $q->em('great')) {
+    $i++;
+    print qq{<label><input type="radio" name="stars" value="$i" $checked/>$label</label><br />};
   }
+  print '</p>';
+  print $q->hidden('url', $url);
+  print $q->hidden('toc', $toc);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
 }
 
+# returns unquoted html
 sub get_name {
   my $url = shift;
   my $tree = HTML::TreeBuilder->new_from_content(GetRaw($url));
-  my $h = $tree->look_down('_tag', 'h1');
-  $h = $tree->look_down('_tag', 'title') unless $h;
+  my $h = $tree->look_down('_tag', 'title');
+  $h = $tree->look_down('_tag', 'h1') unless $h;
   $h = $h->as_text if $h;
   return $h;
 }
 
 sub post_addition {
-  my ($name, $url, $toc) = @_;
+  my ($url, $name, $toc, $summary) = @_;
   my $id = FreeToNormal($name);
   my $display = $name;
   utf8::decode($display); # we're dealing with user input
+  utf8::decode($summary); # we're dealing with user input
   print $q->p("Adding ", GetUrl($url, $display), " to “$toc”.");
   # start with the homepage
   my @pages = GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g;
   for my $id (@pages) {
-    return post($id, undef, $name, $url, GetParam('stars', '')) if $id eq $toc;
+    return post($id, undef, $name, $summary, $url, GetParam('stars', '')) if $id eq $toc;
     my $data = GetPageContent(FreeToNormal($id));
     while ($data =~ /(\*+ ([^][\n]*))$/mg) {
-      return post($id, $1, $name, $url, GetParam('stars', '')) if $2 eq $toc;
+      return post($id, $1, $name, $summary, $url, GetParam('stars', '')) if $2 eq $toc;
     }
   }
   print $q->p("Whoops. I was unable to find “$toc” in the wiki. Sorry!");
 }
 
 sub post {
-  my ($id, $toc, $name, $url, $stars) = @_;
+  my ($id, $toc, $name, $summary, $url, $stars) = @_;
   my $data = GetPageContent(FreeToNormal($id));
+  my $re = quotemeta($url);
+  if ($data =~ /$re\s+(.*?)\]/) {
+    my $display = $1;
+    print $q->p($q->strong("Oops, we seem to have a problem!"));
+    print $q->p(GetPageLink(NormalToFree($id)),
+		" already links to the URL you submitted:",
+	        GetUrl($url, $display));
+    return;
+  }
   $stars = ' ' . (':star:' x $stars) if $stars;
+  $summary = ': ' . $summary if $summary;
   if ($toc) {
     $toc =~ /^(\*+)/;
     my $depth = "*$1"; # one more!
     my $regexp = quotemeta($toc);
-    $data =~ s/$regexp/$toc\n$depth \[$url $name\]$stars/;
+    $data =~ s/$regexp/$toc\n$depth \[$url $name\]$summary$stars/;
   } else {
-    $data = "* [$url $name]$stars\n" . $data;
+    $data = "* [$url $name]$summary$stars\n" . $data;
   }
   my $ua = LWP::UserAgent->new;
   my %params = (text => $data,
@@ -173,30 +237,68 @@ sub post {
   }
 }
 
-sub main {
-  $ConfigFile = "$DataDir/config"; # read the global config file
-  $DataDir = "$DataDir/$wiki";     # but link to the local pages
-  Init();                          # read config file (no modules!)
-  $ScriptName = $site;             # undo setting in the config file
-  binmode(STDOUT,':utf8');
-  $q->charset('utf8');
-  if ($q->path_info eq '/source') {
-    seek DATA, 0, 0;
-    print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
-  } else {
-    $UserGotoBar = $q->a({-href=>$q->url . '/source'}, 'Source');
-    print GetHeader('', 'Submit a new link');
-    print $q->start_div({-class=>'content index'});
-    if (not GetParam('url')) {
-      default();
-    } else {
-      check_url(GetParam('url'));
-    }
+sub print_end_of_page {
     print $q->p('Questions? Send mail to Alex Schroeder <'
 		. $q->a({-href=>'mailto:kensanata@gmail.com'},
 			'kensanata@gmail.com') . '>');
     print $q->end_div();
     PrintFooter();
+}
+
+sub main {
+  $ConfigFile = "$DataDir/config"; # read the global config file
+  $DataDir = "$DataDir/$wiki";     # but link to the local pages
+  Init();                          # read config file (no modules!)
+  $ScriptName = $site;             # undo setting in the config file
+  $FullUrl = $site;                #
+  binmode(STDOUT,':utf8');
+  $q->charset('utf8');
+  if ($q->path_info eq '/source') {
+    seek DATA, 0, 0;
+    print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
+  } elsif ($q->path_info eq '/structure') {
+    my ($values, $labels) = toc();
+    my @indented = map {
+      ($labels->{$_} || $_) =~ /^( *)/;
+      [$_, length($1)]
+    } @$values;
+    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
+    binmode(STDOUT,':raw'); # because of encode_json
+    print JSON::PP::encode_json(\@indented);
+  } elsif ($q->path_info eq '/toc') {
+    my ($values, $labels) = toc();
+    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
+    binmode(STDOUT,':raw'); # because of encode_json
+    print JSON::PP::encode_json($values);
+  } elsif ($q->path_info eq '/top') {
+    print GetHeader('', 'Top Blogs');
+    print $q->start_div({-class=>'content top'});
+    print $q->ol($q->li(top()));
+    print_end_of_page();
+  } elsif ($q->path_info =~ '^/match/(.*)') {
+    my $term = $1;
+    print GetHeader('', "Entries Matching '$term'");
+    print $q->start_div({-class=>'content match'});
+    print $q->ol($q->li(match($term)));
+    print_end_of_page();
+  } else {
+    push(@UserGotoBarPages, 'Help');
+    $UserGotoBar = $q->a({-href=>$q->url . '/source'}, 'Source');
+    print GetHeader('', 'Submit a new link');
+    print $q->start_div({-class=>'content index'});
+    my $url = GetParam('url');
+    my $name = UnquoteHtml(GetParam('name', get_name($url)));
+    my $toc = GetParam('toc');
+    my $confirm = GetParam('confirm');
+    my $summary = GetParam('summary');
+    if (not $url or not $toc) {
+      default();
+    } elsif (not $confirm) {
+      confirm($url, $name, $toc);
+    } else {
+      post_addition($url, $name, $toc, $summary);
+    }
+    print_end_of_page();
   }
 }
 

contrib/campaignwiki/copy.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2011  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2011–2014  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
@@ -17,63 +17,62 @@
 package OddMuse;
 use LWP::UserAgent;
 use HTML::TreeBuilder;
+use utf8;
 
 # load Oddmuse core
 $RunCGI = 0;
 do "wiki.pl";
 
-# globals
-my $wiki = 'BlogArchive';
-my $site = "http://campaignwiki.org/wiki/$wiki";
-# my $site = "http://localhost/wiki.pl";
-my $home = "$site/HomePage";
+$default_namespace = 'NameOfYourWiki';
 
 main();
 
 sub default {
-  print $q->p("Copy a blog article to the "
-	      . $q->a({-href=>$home}, $wiki) . ".");
-  print $q->start_multipart_form(-method=>'get', -class=>'submit');
-  print $q->p($q->label({-for=>'url'}, T('URL:')) . ' '
-	      . $q->textfield(-name=>'url', -id=>'url', -size=>50));
+  my ($url, $ns) = @_;
+  print $q->start_multipart_form(-method=>'get', -class=>'copy');
+  print $q->p("This script helps you copy of a blog post to your Campaign Wiki.");
+  print $q->p($q->label({-for=>'url', -style=>'display: inline-block; width: 20ex'}, 'Blog post URL:'),
+	      $q->textfield(-name=>'url', -id=>'url', -size=>50),
+	      $q->br(),
+	      $q->label({-for=>'ns', -style=>'display: inline-block; width: 20ex'}, 'Name of your wiki:'),
+	      $q->textfield(-name=>'ns', -id=>'ns', -size=>50, -default=>$default_namespace));
+  if ($url and not $ns) {
+    print $q->p($q->em('Please provide the name of your wiki. It is mandatory. Use “NameOfYourWiki” if you just want to test something.'));
+  }
   print $q->submit('go', 'Go!');
   print $q->end_form();
   print $q->p("Please make sure you’re only submitting your own articles",
 	      "or articles with an appropriate license.");
-
   print $q->p("Drag this bookmarklet to your bookmarks bar for easy access:",
-	      $q->a({-href=>q{javascript:location='http://campaignwiki.org/copy?url='+encodeURIComponent(window.location.href)}}, $wiki) . ".");
+	      $q->a({-href=>q{javascript:location='http://campaignwiki.org/copy?url='+encodeURIComponent(window.location.href)}}, 'Copy Blog Post') . ".");
 }
 
-sub check_url {
-  my $url = shift;
-  print $q->p("Looking at ", $q->a({-href=>$url}, $url));
-  my ($name, $data) = get_data($url);
-  $name = GetParam('name', $name);
-  if (name_exists($name) and not GetParam('confirm', 0)) {
-    print $q->p("We already have a page with that name: ",
-		$q->a({-href=>$duplicate}, $duplicate));
-    print $q->start_multipart_form(-method=>'get', -class=>'submit');
-    print $q->p($q->label({-for=>'name'}, T('New name:')) . ' '
-		. $q->textfield(-name=>'name', -id=>'name', -size=>50,
-				-default=>$name));
-    print $q->hidden('url', $url);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } elsif (not GetParam('confirm', 0)) {
-    print $q->p("Please confirm that you want to copy this article to the wiki.");
-    print $q->start_multipart_form(-method=>'get', -class=>'submit');
-    print $q->p($q->label({-for=>'name'}, T('Name:')) . ' '
-		. $q->textfield(-name=>'name', -id=>'name', -size=>50,
-				-default=>$name));
-    print $q->hidden('url', $url);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } else {
-    post_addition($name, $data, $url);
-  }
+sub confirm_overwrite {
+  my ($url, $ns, $name) = @_;
+  print $q->p("We already have a page with that name: ", GetPageLink($name));
+  print $q->start_multipart_form(-method=>'get', -class=>'submit');
+  print $q->p($q->label({-for=>'name'}, T('New name:')) . ' '
+	      . $q->textfield(-name=>'name', -id=>'name', -size=>50, -default=>$name));
+  print $q->hidden('url', $url);
+  print $q->hidden('ns', $ns);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
+}
+
+sub confirm_save {
+  my ($url, $ns, $name) = @_;
+  my $ns = GetParam('ns', $default_namespace);
+  print $q->p("Please confirm that you want to copy",
+	      $q->a({-href=>$url}, "this article"), "to", GetPageLink($HomePage, $ns) . ".");
+  print $q->start_multipart_form(-method=>'get', -class=>'submit');
+  print $q->p($q->label({-for=>'name'}, T('Name:')) . ' '
+	      . $q->textfield(-name=>'name', -id=>'name', -size=>50, -default=>$name));
+  print $q->hidden('url', $url);
+  print $q->hidden('ns', $ns);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
 }
 
 sub get_data {
@@ -82,24 +81,32 @@ sub get_data {
   my $h = $tree->look_down('_tag', 'h1');
   $h = $tree->look_down('_tag', 'title') unless $h;
   $h = $h->as_text if $h;
-  my $b = $tree->look_down('_tag', 'body');
-  if ($b = $tree->look_down('_tag', 'div',
-			    'class', qr/post-body/)) {
-    # blogspot
+  my $b;
+  if ($b = $tree->look_down('_tag', 'div', 'class', qr/post-body/)) {
+    # Blogspot
+    $b = html($b);
+  } elsif ($b = $tree->look_down('_tag', 'div', 'class', qr/content/)) {
+    # Oddmuse
     $b = html($b);
   } else {
-    # no idea, just get the text
-    $b = $b->as_text if $b;
+    # default: get it all
+    $b = html($tree->look_down('_tag', 'body'));
   }
+  # common illegal character for page names
+  $h =~ s/:/,/g;
   return ($h, $b);
 }
 
 sub html {
-  my $tree = shift;
+  my ($tree, $p) = @_;
+  # $p indicates whether we need an empty line or not
   my $str;
   for my $element ($tree->content_list()) {
     if (not ref $element) {
       $str .= $element;
+    } elsif ($element->tag() eq 'p') {
+      $str .= ($p == 1 ? "\n\n" : "") . html($element);
+      $p = 1;
     } elsif ($element->tag() eq 'br') {
       $str .= "\n\n";
     } elsif ($element->tag() eq 'span'
@@ -107,6 +114,20 @@ sub html {
       $str .= "[b]" . html($element) . "[/b]";
     } elsif ($element->tag() =~ m/^(b|i|h[1-6])$/) {
       $str .= "[$1]" . html($element) . "[/$1]";
+    } elsif ($element->tag() eq 'a'
+	     and $element->attr('href')) {
+      $str .= "[url=" . $element->attr('href') . "]" . html($element) . "[/url]";
+    } elsif ($element->tag() eq 'img'
+	     and $element->attr('src')) {
+      $str .= "[img]" . $element->attr('src') . "[/img]";
+    } elsif ($element->tag() eq 'pre') {
+      $str .= "\n\n[code]\n" . $element->as_text() . "\n[/code]";
+      $p = 1;
+    } elsif ($element->tag() eq 'div'
+	     and ($element->attr('style') =~ /float: *(left|right)/
+		  or $element->attr('style') =~ /text-align: *(center)/)) {
+      $str .= "\n[$1]" . html($element) . "[/$1]";
+      $p = 1;
     } else {
       $str .= html($element);
     }
@@ -123,25 +144,25 @@ sub name_exists {
 }
 
 sub post_addition {
-  my ($name, $data, $url) = @_;
+  my ($url, $ns, $name, $data) = @_;
   my $id = FreeToNormal($name);
-  print $q->p("Adding ", $q->a({-href=>$url}, $name));
+  print $q->p("Copying ", $q->a({-href=>$url}, "the blog post") . "…");
   my $text = "Based on [$url $name].\n----\n" . $data;
   my $ua = LWP::UserAgent->new;
   my %params = (text => $text,
 		title => $id,
 		summary => $name,
 		username => GetParam('username'),
+		ns => $ns,
 		pwd => GetParam('pwd'));
   $params{$QuestionaskerSecretKey} = 1 if $QuestionaskerSecretKey;
-  my $response = $ua->post($site, \%params);
+  my $response = $ua->post($FullUrl, \%params);
   if ($response->is_error) {
-    print $q->p("The submission failed!");
-    print $q->pre($response->status_line . "\n"
-		  . $response->content);
+    print $q->p("Copying failed!");
+    print $q->p($q->strong($response->status_line));
+    print $response->content;
   } else {
-    print $q->p("See for yourself: ",
-		$q->a({-href=>"$site/$id"}, $name));
+    print $q->p("Your copy: ", GetPageLink($name) . ".");
   }
 }
 
@@ -152,12 +173,22 @@ sub main {
     print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
   } else {
     $UserGotoBar .= $q->a({-href=>$q->url . '/source'}, 'Source');
-    print GetHeader('', 'Submit a new blog article');
+    print GetHeader('', 'Copy a blog article');
     print $q->start_div({-class=>'content index'});
-    if (not GetParam('url')) {
-      default();
+    my $url = GetParam('url');
+    my $ns = GetParam('ns');
+    if (not $url or not $ns) {
+      default($url, $ns);
     } else {
-      check_url(GetParam('url'));
+      my ($name, $data) = get_data($url);
+      $name = GetParam('name', $name);
+      if (name_exists($name) and not GetParam('confirm', 0)) {
+	confirm_overwrite($url, $ns, $name);
+      } elsif (not GetParam('confirm', 0)) {
+	confirm_save($url, $ns, $name);
+      } else {
+	post_addition($url, $ns, $name, $data);
+      }
     }
     print $q->p('Questions? Send mail to Alex Schröder <'
 		. $q->a({-href=>'mailto:kensanata@gmail.com'},

contrib/vc-oddmuse.el

@@ -39,11 +39,15 @@
 		(file-name-directory file)))
 
 (defun vc-oddmuse-state (file)
-  "No idea."
-  'up-to-date)
+  "Return the current version control state of FILE.
+For a list of possible values, see `vc-state'."
+  ;; Avoid downloading the current version from the wiki and comparing
+  ;; the text: Too much traffic!
+  'edited)
 
 (defun vc-oddmuse-working-revision (file)
-  "No idea")
+  "The current revision based on `oddmuse-revisions'."
+  (oddmuse-revision-get oddmuse-wiki oddmuse-page-name))
 
 (defun vc-oddmuse-checkout-model (files)
   "No locking."
@@ -60,52 +64,28 @@
   nil)
 
 (defvar vc-oddmuse-log-command
-  "curl --silent %w\"?action=rc;showedit=1;all=1;from=1;raw=1;match=%r\""
+  (concat "curl --silent %w"
+	  " --form action=rc"
+	  " --form showedit=1"
+	  " --form all=1"
+	  " --form from=1"
+	  " --form raw=1"
+	  " --form match='%r'")
   "Command to use for publishing index pages.
 It must print the page to stdout.
 
-%?  '?' character
-%w  URL of the wiki as provided by `oddmuse-wikis'
-%r  Regular expression, URL encoded, of the pages to limit ourselves to.
-    This uses the free variable `regexp'.")
+See `oddmuse-format-command' for the formatting options.")
 
-(defun vc-oddmuse-print-log (files buffer &optional shortlog
-				   start-revision limit)
+(defun vc-oddmuse-print-log (files buffer &optional shortlog start-revision limit)
   "Load complete recent changes for the files."
-  (let* ((wiki (or oddmuse-wiki
-		   (completing-read "Wiki: " oddmuse-wikis nil t)))
-	 (wiki-data (assoc wiki oddmuse-wikis))
-	 (url (nth 1 wiki-data))
-	 (regexp (concat
-		  "^("  ;; Perl regular expression!
-		  (mapconcat 'file-name-nondirectory files "|")
-		  ")$"))
-	 (command (oddmuse-format-command vc-oddmuse-log-command))
-	 (coding (nth 2 wiki-data))
-	 (coding-system-for-read coding)
-	 (coding-system-for-write coding)
-	 (max-mini-window-height 1))
-    (oddmuse-run "Getting recent changes" command buffer nil))
-  ;; Parse current buffer as RSS 3.0 and display it correctly.
-  (save-excursion
-    (with-current-buffer buffer
-      (let (result)
-	(dolist (item (cdr (split-string (buffer-string) "\n\n")));; skip first item
-	  (let ((data (mapcar (lambda (line)
-				(when (string-match "^\\(.*?\\): \\(.*\\)" line)
-				  (cons (match-string 1 line)
-					(match-string 2 line))))
-			      (split-string item "\n"))))
-	    (setq result (cons data result))))
-	(dolist (item (nreverse result))
-	  (insert "title:      " (cdr (assoc "title" item)) "\n"
-	          "version:    " (cdr (assoc "revision" item)) "\n"
-	          "generator:  " (cdr (assoc "generator" item)) "\n"
-	          "timestamp:  " (cdr (assoc "last-modified" item)) "\n\n"
-		  "    " (or (cdr (assoc "description" item)) ""))
-	  (fill-paragraph)
-	  (insert "\n\n"))
-	(goto-char (point-min))))))
+  ;; Derive `oddmuse-wiki' from the first file
+  (with-oddmuse-file (car files)
+    ;; The wiki expects a Perl regular expression!
+    (let ((regexp (concat "^(" (mapconcat 'file-name-nondirectory files "|") ")$")))
+      (oddmuse-run "Getting recent changes" vc-oddmuse-log-command nil nil buffer)))
+  (with-current-buffer buffer
+    (oddmuse-render-rss3))
+  'limit-unsupported)
 
 (defun vc-oddmuse-log-outgoing ()
   (error "This is not supported."))
@@ -114,74 +94,76 @@ It must print the page to stdout.
   (error "This is not supported."))
 
 (defvar vc-oddmuse-get-revision-command
-  "curl --silent %w\"?action=browse;id=%t;revision=%o;raw=1\""
+  (concat "curl --silent"
+	  " --form action=browse"
+	  " --form id=%t"
+	  " --form revision=%v"
+	  " --form raw=1"
+	  " '%w'")
   "Command to use to get older revisions of a page.
 It must print the page to stdout.
 
 %?  '?' character
 %w  URL of the wiki as provided by `oddmuse-wikis'
 %t  Page title as provided by `oddmuse-page-name'
-%o  Revision to retrieve as provided by `oddmuse-revision'")
+%v  Revision to retrieve as provided by `oddmuse-revision'")
 
-(defvar vc-oddmuse-get-history-command
-  "curl --silent %w\"?action=history;id=%t;raw=1\""
-  "Command to use to get the history of a page.
-It must print the page to stdout.
-
-%?  '?' character
-%w  URL of the wiki as provided by `oddmuse-wikis'
-%t  Page title as provided by `oddmuse-page-name'")
+(defun oddmuse-revision-filename (rev)
+  "Return filename for revision REV.
+This uses `oddmuse-directory', `oddmuse-wiki' and
+`oddmuse-page-name'."
+  (concat oddmuse-directory
+	  "/" oddmuse-wiki
+	  "/" oddmuse-page-name
+	  ".~" rev "~"))
 
 (defun vc-oddmuse-diff (files &optional rev1 rev2 buffer)
   "Report the differences for FILES."
   (setq buffer (or buffer (get-buffer-create "*vc-diff*")))
   (dolist (file files)
-    (setq oddmuse-page-name (file-name-nondirectory file)
-	  oddmuse-wiki (or oddmuse-wiki
-			   (file-name-nondirectory
-			    (directory-file-name
-			     (file-name-directory file)))))
-    (let* ((wiki-data (or (assoc oddmuse-wiki oddmuse-wikis)
-			  (error "Cannot find data for wiki %s" oddmuse-wiki)))
-	   (url (nth 1 wiki-data)))
-      (unless rev1
-	;; Since we don't know the most recent revision we have to fetch
-	;; it from the server every time.
-	(with-temp-buffer
-	  (let ((max-mini-window-height 1))
-	    (oddmuse-run "Determining latest revision"
-			 (oddmuse-format-command vc-oddmuse-get-history-command)
-			 (current-buffer) nil))
-	  (if (re-search-forward "^revision: \\([0-9]+\\)$" nil t)
-	      (setq rev1 (match-string 1))
-	    (error "Cannot determine the latest revision from the page history"))))
+    (with-oddmuse-file file
+      (setq rev1 (or rev1 (oddmuse-get-latest-revision wiki pagename)))
       (dolist (rev (list rev1 rev2))
-	(when (and rev
-		   (not (file-readable-p (concat oddmuse-directory
-						 "/" oddmuse-wiki "/"
-						 oddmuse-page-name
-						 ".~" rev "~"))))
+	(when (and rev (not (file-readable-p (oddmuse-revision-filename rev))))
 	  (let* ((oddmuse-revision rev)
-		 (command (oddmuse-format-command vc-oddmuse-get-revision-command))
-		 (coding (nth 2 wiki-data))
-		 (filename (concat oddmuse-directory "/" oddmuse-wiki "/"
-				   oddmuse-page-name ".~" rev "~"))
-		 (coding-system-for-read coding)
-		 (coding-system-for-write coding))
+		 (command (oddmuse-format-command
+			   vc-oddmuse-get-revision-command))
+		 (filename (oddmuse-revision-filename rev)))
 	    (with-temp-buffer
-	      (let ((max-mini-window-height 1))
-		(oddmuse-run (concat "Downloading revision " rev)
-			     command (current-buffer) nil))
+	      (oddmuse-run
+	       (concat "Downloading revision " rev)
+	       command wiki)
 	      (write-file filename)))))
       (diff-no-select
-       (if rev1
-	   (concat oddmuse-directory "/" oddmuse-wiki "/" oddmuse-page-name ".~" rev1 "~")
-	 file)
-       (if rev2
-	   (concat oddmuse-directory "/" oddmuse-wiki "/" oddmuse-page-name ".~" rev2 "~")
-	 file)
+       (if rev1 (oddmuse-revision-filename rev1) file)
+       (if rev2 (oddmuse-revision-filename rev2) file)
        nil
        (vc-switches 'oddmuse 'diff)
        buffer))))
 
+(defun vc-oddmuse-revert (file &optional contents-done)
+  "Revert FILE back to the wiki revision.
+If optional arg CONTENTS-DONE is non-nil, then nothing needs to
+be done, as the contents of FILE have already been reverted from
+a version backup."
+  (unless contents-done
+    (with-oddmuse-file file
+      (let ((command (oddmuse-format-command vc-oddmuse-get-revision-command)))
+	(with-temp-buffer
+	  (oddmuse-run "Loading" command)
+	  (write-file file))))))
+
+(defun vc-oddmuse-checkin (files rev comment)
+  "Commit changes in FILES to this backend.
+REV is a historical artifact and should be ignored.  COMMENT is
+used as a check-in comment."
+  (dolist (file files)
+    (with-oddmuse-file file
+      (let* ((summary comment)
+	     (command (oddmuse-format-command oddmuse-post-command))
+	     (buf (get-buffer-create " *oddmuse-response*")))
+	(with-temp-buffer
+	  (insert-file-contents file)
+	  (oddmuse-run "Posting" command wiki pagename buf t 302))))))
+
 (provide 'vc-oddmuse)

css/alex-2012.css

@@ -74,6 +74,36 @@ h1 a:visited, h2 a:visited, h3 a:visited {
     color: inherit;
 }
 
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.number {
+    text-decoration: none;
+}
+
 /* stop floating content from flowing over the footer */
 
 hr {
@@ -235,8 +265,8 @@ div.comment h2 {
     margin-top: 5em;
 }
 /* comment pages with username, homepage, and email subscription */
-.comment span { display: block; }
-.comment span label { display: inline-block; width: 10em; }
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
 /* IE sucks */
 .comment input#username,
 .comment input#homepage,

css/emacs.css

@@ -335,7 +335,22 @@ div.month a.local {
 
 /* highlighting */
 
-/* Equivalent to Output::HTML */
+/* highlighting source code */
+
+span.builtin      { color: #483d8b; } /* DarkSlateBlue */
+span.comment      { color: #b22222; } /* Firebrick */
+span.constant     { color: #008b8b; } /* DarkCyan */
+span.function     { color: #0000ff; } /* Blue1 */
+span.keyword      { color: #7f007f; } /* Purple */
+span.string       { color: #8b475d; } /* VioletRed4 */
+span.type         { color: #228b22; } /* ForestGreen */
+span.warning      { color: #ff0000; font-weight: bold; } /* Red1 */
+span.comment span,
+span.string  span { color: inherit; }
+span.comment span.important.constant,
+span.string  span.important.constant { color: #008b8b; }
+
+/* old: Equivalent to Output::HTML */
 
 span.linecomment  { color: green; }
 span.blockcomment { color: green; }

css/oddmuse-2013.css

@@ -28,7 +28,7 @@ body {
     padding:2% 5%;
     margin:0;
     font-family: "Gentium Basic", "Bookman Old Style", "Times New Roman", serif;
-    font-size: 18pt;
+    font-size: 16pt;
 }
 
 div.header h1 {
@@ -129,9 +129,15 @@ dd {
     margin-bottom:1ex;
 }
 
-textarea { width:100%; height:80%; }
+textarea {
+    width:100%;
+    height:80%;
+    font-size: 12pt;
+}
 textarea#summary { height: 3em; }
-
+input {
+    font-size: 12pt;
+}
 div.image span.caption {
     margin: 0 1em;
 }
@@ -191,6 +197,19 @@ hr {
 div.footer hr {
     height:4px;
     margin: 2em 0 1ex 0;
+    clear:both;
+}
+
+div.content > div.comment {
+    border-top: none;
+    padding-top: none;
+    border-left: 1ex solid #bbb;
+    padding-left: 1ex;
+}
+
+div.wrapper > div.comment {
+  border-top: 2px solid #000;
+  padding-top: 2em;
 }
 
 pre {
@@ -199,9 +218,13 @@ pre {
     margin-right: 2em;
     white-space: pre;
     overflow:hidden;
-    font-size: smaller;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
 }
 
-div.footer hr {
-    clear:both;
-}
+tt, pre, code {
+    font-size: 80%;
+};

description

@@ -0,0 +1 @@
+Oddmuse

modules/aawrapperdiv.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/aawrapperdiv.pl">aawrapperdiv.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/WrapperDiv_Module">WrapperDiv Module</a></p>';
+AddModuleDescription('aawrapperdiv.pl', 'WrapperDiv Module');
 
 
 *OldGetHeader = *GetHeader;

modules/accesskeys.pl

@@ -0,0 +1,36 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2014  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/>.
+
+package OddMuse;
+
+AddModuleDescription('accesskeys.pl', 'Links With AccessKeys Extension');
+
+push(@MyRules, \&LinksWithAccessKeys);
+sub LinksWithAccessKeys {
+  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cog) {
+    my ($id, $key) = ($2, $3);
+    Dirty($1);
+    $id = FreeToNormal($id);
+    my ($class, $resolved, $title, $exists) = ResolveId($id);
+    my $text = NormalToFree($id);
+    if ($resolved) { # anchors don't exist as pages, therefore do not use $exists
+      print ScriptLink(UrlEncode($resolved), $text, $class, undef, $title, $key);
+    } else {
+      print "[[" . QuoteHtml($text) . GetEditLink($id, '?') . "]]";
+    }
+    return ''; # this is a dirty rule that depends the definition of other pages
+  }
+  return undef; # the rule didn't match
+}

modules/admin.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/admin.pl">admin.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Admin_Power_Extension">Admin Power Extension</a></p>';
+AddModuleDescription('admin.pl', 'Admin Power Extension');
 
 $Action{delete} = \&AdminPowerDelete;
 $Action{rename} = \&AdminPowerRename;
@@ -62,13 +62,13 @@ sub AdminPowerRename {
   # Regenerate index on next request -- remove this before errors can occur!
   unlink($IndexFile);
   # page file
-  CreatePageDir($PageDir, $new); # It might not exist yet
+  CreateDir($PageDir); # It might not exist yet
   rename($fname, $newfname)
     or ReportError(Tss('Cannot rename %1 to %2', $fname, $newfname) . ": $!", '500 INTERNAL SERVER ERROR');
   # keep directory
   my $kdir = GetKeepDir($id);
   my $newkdir = GetKeepDir($new);
-  CreatePageDir($KeepDir, $new); # It might not exist yet (only the parent directory!)
+  CreateDir($KeepDir); # It might not exist yet (only the parent directory!)
   rename($kdir, $newkdir)
     or ReportError(Tss('Cannot rename %1 to %2', $kdir, $newkdir) . ": $!", '500 INTERNAL SERVER ERROR')
       if -d $kdir;
@@ -76,7 +76,7 @@ sub AdminPowerRename {
   if (defined(&GetRefererFile)) {
     my $rdir = GetRefererFile($id);
     my $newrdir = GetRefererFile($new);
-    CreatePageDir($RefererDir, $new); # It might not exist yet
+    CreateDir($RefererDir); # It might not exist yet
     rename($rdir, $newrdir)
       or ReportError(Tss('Cannot rename %1 to %2', $rdir, $newrdir) . ": $!", '500 INTERNAL SERVER ERROR')
 	if -d $rdir;

modules/adsense.pl

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/adsense.pl">adsense.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/AdSense_Module">AdSense Module</a></p>';
+AddModuleDescription('adsense.pl', 'AdSense Module');
 
 use vars qw($AdSensePageName $AdSensePlace);
 

modules/advanced-uploads.pl

@@ -0,0 +1,35 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+package OddMuse;
+
+AddModuleDescription('advanced-uploads.pl', 'Advanced File Upload Extension');
+
+$HtmlHeaders .= '<script type="text/javascript" src="/js/uploader.js"></script>';
+
+*AdvancedUploadsOldGetTextArea = *GetTextArea;
+*GetTextArea = *AdvancedUploadsNewGetTextArea;
+
+sub AdvancedUploadsNewGetTextArea {
+  my ($name, $text, $rows) = @_;
+  return AdvancedUploadsOldGetTextArea(@_) . $q->br() . ($name =~ 'text|aftertext' ? GetUploadForm() : '');
+}
+
+sub GetUploadForm {
+    return $q->span({-class=>'upload'}, $q->label({-for=>'fileToUpload'}, T('Attach file:')),
+                    $q->filefield(-name=>'fileToUpload', -id=>'fileToUpload', -multiple=>'multiple', -onChange=>'fileSelected()', -size=>20),
+                    $q->span({-id=>'fileSize'}, ''),
+                    $q->button(-name=>'uploadButton', -value=>T('Upload'), -onClick=>'uploadFile()'),
+                    $q->span({-id=>'progressNumber'}));
+}

modules/age.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/age.pl">age.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Age_Indication_Extension">Age Indication Extension</a></p>';
+AddModuleDescription('age.pl', 'Age Indication Extension');
 
 use vars qw(%AgeEffect $AgeParameter);
 

modules/aggregate.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/aggregate.pl">aggregate.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Front_Page_Extension">Front Page Extension</a></p>';
+AddModuleDescription('aggregate.pl', 'Front Page Extension');
 
 push(@MyRules, \&AggregateRule);
 

modules/all.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/all.pl">all.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/All_Action">All Action</a></p>';
+AddModuleDescription('all.pl', 'All Action');
 
 $Action{all} = \&DoPrintAllPages;
 
@@ -28,7 +28,7 @@ sub DoPrintAllPages {
   print GetHeader('', T('Complete Content'))
     . $q->p(Ts('The main page is %s.', $q->a({-href=>'#' . $HomePage}, $HomePage)));
   print $q->p($q->b(Ts('(for %s)', GetParam('lang', 0)))) if GetParam('lang', 0);
-  PrintAllPages(0, 0, undef, AllPagesList());
+  PrintAllPages(0, 0, undef, undef, AllPagesList());
   PrintFooter();
 }
 

modules/anchors.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/anchors.pl">anchors.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Local_Anchor_Extension">Local Anchor Extension</a></p>';
+AddModuleDescription('anchors.pl', 'Local Anchor Extension');
 
 push(@MyRules, \&AnchorsRule);
 

modules/antispam.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/antispam.pl">antispam.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Antispam_Module">Antispam Module</a></p>';
+AddModuleDescription('antispam.pl', 'Antispam Module');
 
 use vars qw($DoMaskEmail $CreateMailtoLinks); 
 

modules/archive.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/archive.pl">archive.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Archive_Extension">Archive Extension</a></p>';
+AddModuleDescription('archive.pl', 'Archive Extension');
 
 *OldArchiveGetHeader = *GetHeader;
 *GetHeader = *NewArchiveGetHeader;

modules/askpage.pl

@@ -0,0 +1,63 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+AddModuleDescription('askpage.pl', 'Ask Page Extension');
+
+use Fcntl qw(:DEFAULT :flock);
+
+use vars qw($AskPage $QuestionPage $NewQuestion);
+# Don't forget to set your $CommentsPattern to include both $AskPage and $QuestionPage
+$AskPage = 'Ask';
+$QuestionPage = 'Question_';
+$NewQuestion = 'Write your question here:';
+
+sub IncrementInFile {
+  my $filename = shift;
+  sysopen my $fh, $filename, O_RDWR|O_CREAT or die "can't open $filename: $!";
+  flock $fh, LOCK_EX or die "can't flock $filename: $!";
+  my $num = <$fh> || 1;
+  seek $fh, 0, 0 or die "can't rewind $filename: $!";
+  truncate $fh, 0 or die "can't truncate $filename: $!";
+  (print $fh $num+1, "\n") or die "can't write $filename: $!";
+  close $fh or die "can't close $filename: $!";
+  return $num;
+}
+
+*OldAskPageDoPost=*DoPost;
+*DoPost=*NewAskPageDoPost;
+sub NewAskPageDoPost {
+  my $id = FreeToNormal(shift);
+  if ($id eq $AskPage and not GetParam('text', undef)) { # comment, not a regular edit
+    my $currentQuestion = IncrementInFile("$DataDir/curquestion");
+    $currentQuestion =~ s/[\s\n]//g;
+    return OldAskPageDoPost($QuestionPage . $currentQuestion, @_); # hack page name
+  }
+  OldAskPageDoPost($id, @_); # keep original functionality for regular edits
+}
+
+*OldAskPageGetCommentForm=*GetCommentForm;
+*GetCommentForm=*NewAskPageGetCommentForm;
+sub NewAskPageGetCommentForm {
+  my ($id, $rev, $comment) = @_;
+  $NewComment = $NewQuestion if $id eq $AskPage;
+  OldAskPageGetCommentForm(@_);
+}
+
+*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];
+}

modules/atom.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2006, 2008  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2004, 2006, 2008, 2014  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
@@ -17,7 +17,7 @@ use XML::Atom::Entry;
 use XML::Atom::Link;
 use XML::Atom::Person;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/atom.pl">atom.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Atom_Extension">Atom Extension</a></p>';
+AddModuleDescription('atom.pl', 'Atom Extension');
 
 push(@MyInitVariables, \&AtomInit);
 
@@ -140,11 +140,11 @@ sub DoAtomSave {
   my $title = $entry->title();
   my $author = $entry->author();
   SetParam('username', $author->name) if $author; # Used in Save()
-  my $id = FreeToNormal($title) if ValidIdOrDie($title);
+  my $id = FreeToNormal($title);
+  UserCanEditOrDie($id);
   $oldid = $id unless $oldid;
   ValidIdOrDie($oldid);
   my $summary = $entry->summary();
-  ReportError(Ts('Editing not allowed for %s.', $id), '403 FORBIDDEN') unless UserCanEdit($id, 1);
   # Lock before getting old page to prevent races
   RequestLockOrError();		# fatal
   OpenPage($oldid);

modules/autolock.pl

@@ -25,7 +25,7 @@ directory of your Oddmuse Wiki.
 =cut
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/autolock.pl">autolock.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Autolock_Extension">Autolock Extension</a></p>';
+AddModuleDescription('autolock.pl', 'Autolock Extension');
 
 # ....................{ CONFIGURATION                      }....................
 

modules/backlinkage.pl

@@ -20,7 +20,7 @@
 # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
 
 use MLDBM qw( DB_File Storable );
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/backlinkage.pl">backlinkage.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Inline_Backlinks">Inline Backlinks</a></p>';
+AddModuleDescription('backlinkage.pl', 'Inline Backlinks');
 
 my $debug=1;             # Set Text Output Verbosity when compiling
 my $backfile = $DataDir . '/backlinks.db';  # Where data lives

modules/backlinks.pl

@@ -10,7 +10,7 @@
 # For user doc, see: 
 # http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/backlinks.pl">backlinks.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension">Backlinks Extension</a></p>';
+AddModuleDescription('backlinks.pl', 'Backlinks Extension');
 
 *OldGetSearchLink = *GetSearchLink;
 *GetSearchLink = *NewGetSearchLink;

modules/balanced-page-directories.pl

@@ -15,14 +15,20 @@
 
 =head1 Balanced Page Directories
 
-By default, Oddmuse disperses page data files into 27 directories
-based on the first character of the page name. The directories are "A"
-to "Z", and "other". If you use your wiki as a blog, all the pages
-starting with a date end up in "other". If your page names start with
-letters other than "A" to "Z", all the pages end up in "other". If you
-are using comment pages, all your comment pages end in "C". This can
-turn into a problem if you reach ten thousand pages and more in a
-single directory.
+B<WARNING: This module is deprecated.> Oddmuse no longer disperses
+page data files into 27 directories based on the first character of
+the page name. The directories used to be "A" to "Z", and "other". If
+you uses your wiki as a blog, all the pages starting with a date ended
+up in "other". If your page names started with letters other than "A"
+to "Z", all the pages ended up in "other". If you were using comment
+pages, all your comment pages ended in "C". This module was intended
+to create more subdirectories and spread them more evenly. This is no
+longer necessary, as the typical filesystem's performance no longer
+degrades with tens of thousands of files in a directory. I'm assuming
+most Oddmuse hosts to use some form of GNU/Linux with ext3 or ext4
+with dir_index option.
+
+The remaining info for this module is all deprecated.
 
 =over
 
@@ -67,7 +73,7 @@ wiki is locked and migration is started.
 
 =cut
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/balanced-page-directories.pl">balanced-page-directories.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Balanced_Page_Directories_Extension">Balanced Page Directories Extension</a>';
+AddModuleDescription('balanced-page-directories.pl', 'Balanced Page Directories Extension');
 
 use Digest::MD5 qw(md5_hex);
 use File::Find qw(finddepth);

modules/ban-contributors.pl

@@ -25,7 +25,7 @@ the IP or hostname will be added to the C<BannedHosts> page for you.
 
 =cut
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/ban-contributors.pl">ban-contributors.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Ban_Contributors_Extension">Ban Contributors Extension</a></p>';
+AddModuleDescription('ban-contributors.pl', 'Ban Contributors Extension');
 
 push(@MyAdminCode, \&BanMenu);
 
@@ -150,7 +150,7 @@ sub NewBanContributorsWriteRcLog {
 		  $q->submit(T('Ban!'))),
 	    $q->end_form();
     };
-    print $q->p(T("Consider banning the hostname or 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(@_);

modules/ban-quick-editors.pl

@@ -15,7 +15,7 @@
 # This file must load before logbannedcontent.pl such that quick
 # editors will be logged.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/ban-quick-editors.pl">ban-quick-editors.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Banning_Quick_Editors">Banning Quick Editors</a></p>';
+AddModuleDescription('ban-quick-editors.pl', 'Banning Quick Editors');
 
 *BanQuickOldUserIsBanned = *UserIsBanned;
 *UserIsBanned = *BanQuickNewUserIsBanned;
@@ -25,7 +25,7 @@ sub BanQuickNewUserIsBanned {
   if (not $rule
       and $SurgeProtection # need surge protection
       and GetParam('title')) {
-    my $name = GetParam('username', $ENV{'REMOTE_ADDR'});
+    my $name = GetParam('username', GetRemoteHost());
     my @entries = @{$RecentVisitors{$name}};
     # $entry[0] is $Now after AddRecentVisitor
     my $ts = $entries[1];

modules/banned-regexps.pl

@@ -14,7 +14,7 @@
 
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/banned-regexps.pl">banned-regexps.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Banning_Regular_Expressions">Banning Regular Expressions</a></p>';
+AddModuleDescription('banned-regexps.pl', 'Banning Regular Expressions');
 
 =h1 Compatibility
 

modules/bbcode.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/bbcode.pl">bbcode.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/bbCode_Extension">bbCode Extension</a></p>';
+AddModuleDescription('bbcode.pl', 'bbCode Extension');
 
 push(@MyRules, \&bbCodeRule);
 
@@ -122,15 +122,15 @@ sub bbCodeRule {
   # smiley
   elsif (/\G(:-?[()])/cg) {
     if (substr($1,-1) eq ')') {
-      # '☺' 0009786 00263a WHITE SMILING FACE, So, 0, ON, N,
-      return '&#x263a;'; }
+      # 😊 1F60A SMILING FACE WITH SMILING EYES
+      return '&#x1F60A;'; }
     else {
-      # '☹' 0009785 002639 WHITE FROWNING FACE, So, 0, ON, N,
-      return '&#x2639;'; }}
+      # 😟 1F61F WORRIED FACE
+      return '&#x1F61F;'; }}
   elsif (/\G:(?:smile|happy):/cg) {
-    return '&#x263a;'; }
+    return '&#x1F60A;'; }
   elsif (/\G:(?:sad|frown):/cg) {
-    return '&#x2639;'; }
+    return '&#x1F61F;'; }
   # no match
   return undef;
 }

modules/beautify.pl

@@ -17,7 +17,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/beautify.pl">beautify.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Source_Code_Beautification_Extension">Source Code Beautification Extension</a></p>';
+AddModuleDescription('beautify.pl', 'Source Code Beautification Extension');
 
 use Beautifier::Core;
 use Output::HTML;

modules/big-brother.pl

@@ -15,7 +15,7 @@
 
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/big-brother.pl">big-brother.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Big_Brother_Extension">Big Brother Extension</a></p>';
+AddModuleDescription('big-brother.pl', 'Big Brother Extension');
 
 use vars qw($VisitorTime);
 

modules/blockquote.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/blockquote.pl">blockquote.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_Text_Formatting_Rules">Comments on Text Formatting Rules</a></p>';
+AddModuleDescription('blockquote.pl', 'Comments on Text Formatting Rules');
 
 push(@MyRules, \&BlockQuoteRule);
 

modules/cal3.pl

@@ -22,7 +22,7 @@
 # is useless. This extension will not work under Windows/IIS unless cal
 # is installed.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/cal3.pl">cal3.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Cal3_Extension">Cal3 Extension</a></p>';
+AddModuleDescription('cal3.pl', 'Cal3 Extension');
 
 *OldCalendarGetHeader = *GetHeader;
 *GetHeader = *NewCalendarGetHeader;

modules/calendar.pl

@@ -17,7 +17,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/calendar.pl">calendar.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Calendar_Extension">Calendar Extension</a></p>';
+AddModuleDescription('calendar.pl', 'Calendar Extension');
 
 use vars qw($CalendarOnEveryPage $CalAsTable $CalStartMonday);
 
@@ -104,7 +104,7 @@ sub DoCollect {
     # Now save information required for saving the cache of the current page.
     local (%Page, $OpenPageName);
     print $q->start_div({-class=>'content journal collection'});
-    PrintAllPages(1, 1, undef, @pages);
+    PrintAllPages(1, 1, undef, undef, @pages);
     print $q->end_div();
   }
   $CollectingJournal = 0;

modules/canonical.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/canonical.pl">canonical.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Canonical_Names">Canonical Names</a></p>';
+AddModuleDescription('canonical.pl', 'Canonical Names');
 
 use utf8;
 

modules/checkbox.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/checkbox.pl">checkbox.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Checklist_Extension">Checklist Extension</a></p>';
+AddModuleDescription('checkbox.pl', 'Checklist Extension');
 
 # [[ : To do]]
 # [[X: Done]]

modules/clustermap.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/clustermap.pl">clustermap.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/ClusterMap_Module">ClusterMap Module</a></p>';
+AddModuleDescription('clustermap.pl', 'ClusterMap Module');
 
 use vars qw($ClusterMapPage $ClusterMapTOC $FilterUnclusteredRegExp @ClusterMapAdminPages);
 
@@ -40,8 +40,8 @@ $PrintTOCAnchor = 0;
 
 %ClusterMap = ();
 
-*OldDoRc = *DoRc;
-*DoRc = *ClusterMapDoRc;
+*OldPrintRcHtml = *PrintRcHtml;
+*PrintRcHtml = *ClusterMapPrintRcHtml;
 
 push(@MyAdminCode, \&ClusterMapAdminRule);
 
@@ -178,7 +178,7 @@ sub CreateClusterMap {
 	}
 }
 
-sub ClusterMapDoRc {
+sub ClusterMapPrintRcHtml {
 	my ( @options ) = @_;
 	my $page = "";
 	my $cluster = GetParam(rcclusteronly);
@@ -195,7 +195,7 @@ sub ClusterMapDoRc {
 		print "</ul>";
 	}
 	
-	OldDoRc(@options);
+	OldPrintRcHtml(@options);
 }
 
 sub PrintUnclusteredMap {

modules/comment-div-wrapper.pl

@@ -0,0 +1,55 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2014  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/>.
+
+package OddMuse;
+
+AddModuleDescription('comment-div-wrapper.pl', 'Comment Div Wrapper Extension');
+
+my $CommentDiv = 0;
+push(@MyRules, \&CommentDivWrapper);
+$RuleOrder{\&CommentDivWrapper} = -50;
+
+sub CommentDivWrapper {
+  if (substr($OpenPageName, 0, length($CommentsPrefix)) eq $CommentsPrefix) {
+    if (pos == 0 and not $CommentDiv) {
+      $CommentDiv = 1;
+      return $q->start_div({-class=>'userComment'});
+    }
+  }
+  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'})
+	  . AddHtmlEnvironment('p');
+      return $html;
+    }
+  }
+  return undef;
+}
+
+# close final div
+*OldCommentDivApplyRules = *ApplyRules;
+*ApplyRules = *NewCommentDivApplyRules;
+
+sub NewCommentDivApplyRules {
+  my ($blocks, $flags) = OldCommentDivApplyRules(@_);
+  if ($CommentDiv) {
+    print $q->end_div();
+    $blocks .= $FS . $q->end_div();
+    $flags .= $FS . 0;
+    $CommentDiv = 0;
+  }
+  return ($blocks, $flags);
+}

modules/commentcount.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/commentcount.pl">commentcount.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comment_Count_Extension">Comment Count Extension</a></p>';
+AddModuleDescription('commentcount.pl', 'Comment Count Extension');
 
 *OldCommentcountAddComment = *AddComment;
 *AddComment = *NewCommentcountAddComment;

modules/compilation.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/compilation.pl">compilation.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Compilation_Extension">Compilation Extension</a></p>';
+AddModuleDescription('compilation.pl', 'Compilation Extension');
 
 $Action{compilation} = \&DoCompilation;
 
@@ -49,7 +49,7 @@ sub PrintCompilation {
     local %Page;
     local $OpenPageName='';
     print '<div class="compilation">';
-    PrintAllPages(1, 1, undef, @pages);
+    PrintAllPages(1, 1, undef, undef, @pages);
     print '</div>';
   }
   return @pages;

modules/config.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/config.pl">config.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Plans">Plans</a></p>';
+AddModuleDescription('config.pl', 'Plans');
 
 $Action{config} = \&DoConfig;
 $Action{clone} = \&DoClone;
@@ -37,7 +37,7 @@ sub DoConfig {
 		     $SurgeProtection $SurgeProtectionTime $SurgeProtectionViews
 		     $DeletedPage $RCName @RcDays $RcDefault $KeepDays
 		     $KeepMajor $SummaryHours $SummaryDefaultLength $ShowEdits
-		     $UseLookup $RecentTop $RecentLink $PageCluster
+		     $RecentTop $RecentLink $PageCluster
 		     $InterWikiMoniker $SiteDescription $RssImageUrl $RssRights
 		     $RssExclude $RssCacheHours $RssStyleSheet $UploadAllowed
 		     @UploadTypes $EmbedWiki $FooterNote $EditNote $TopLinkBar

modules/context.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/context.pl">context.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Calendar_Extension">Calendar Extension</a></p>';
+AddModuleDescription('context.pl', 'Calendar Extension');
 
 push (@MyInitVariables, \&ContextMenuItem);
 

modules/creationdate.pl

@@ -23,7 +23,7 @@
 #
 # Of course, you can customize this to store more information
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/creationdate.pl">creationdate.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/CreationDate_Module">CreationDate Module</a></p>';
+AddModuleDescription('creationdate.pl', 'CreationDate Module');
 
 *CreationDateOldOpenPage = *OpenPage;
 *OpenPage = CreationDateOpenPage;

modules/creole.pl

@@ -14,7 +14,7 @@ directory for your Oddmuse Wiki.
 =cut
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/creole.pl">creole.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Creole_Markup_Extension">Creole Markup Extension</a></p>';
+AddModuleDescription('creole.pl', 'Creole Markup Extension');
 
 # ....................{ CONFIGURATION                      }....................
 
@@ -242,6 +242,7 @@ sub CreoleRule {
              -class=> 'image outside'},
             $q->img({-src=> UnquoteHtml($1),
                      -alt=> UnquoteHtml($3),
+                     -title=> UnquoteHtml($3),
                      -class=> 'url outside'})));
   }
   # image link: [[link|{{pic}}]] and [[link|{{pic|text}}]]
@@ -252,6 +253,7 @@ sub CreoleRule {
       ScriptLink(UrlEncode(FreeToNormal($2)),
                  $q->img({-src=> GetDownloadLink(FreeToNormal($3), 2),
                           -alt=> UnquoteHtml($text),
+                          -title=> UnquoteHtml($text),
                           -class=> 'upload'}), 'image')), $text);
   }
   # image link: [[link|{{url}}]] and [[link|{{url|text}}]]
@@ -262,6 +264,7 @@ sub CreoleRule {
       ScriptLink(UrlEncode(FreeToNormal($2)),
                  $q->img({-src=> UnquoteHtml($3),
                           -alt=> UnquoteHtml($text),
+                          -title=> UnquoteHtml($text),
                           -class=> 'url outside'}), 'image')), $text);
   }
   # image link: [[url|{{pic}}]] and [[url|{{pic|text}}]]
@@ -272,6 +275,7 @@ sub CreoleRule {
       $q->a({-href=> UnquoteHtml($2), -class=> 'image outside'},
             $q->img({-src=> GetDownloadLink(FreeToNormal($3), 2),
                      -alt=> UnquoteHtml($text),
+                     -title=> UnquoteHtml($text),
                      -class=> 'upload'}))), $text);
   }
   # image link: [[url|{{url}}]] and [[url|{{url|text}}]]
@@ -281,6 +285,7 @@ sub CreoleRule {
       $q->a({-href=> UnquoteHtml($1), -class=> 'image outside'},
             $q->img({-src=> UnquoteHtml($2),
                      -alt=> UnquoteHtml($4),
+                     -title=> UnquoteHtml($4),
                      -class=> 'url outside'})));
   }
   # link: [[url]] and [[url|text]]
@@ -456,21 +461,16 @@ sub CreoleListAndNewLineRule {
   my $is_in_list_item  = InElement('li');
 
   # # numbered list
-  if (($bol             and m/\G[ \t]*(#)[ \t]*/cg) or
-      ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(#+)[ \t]*/cg)) {
+  # * bullet list (nestable; needs space when nested to disambiguate from bold)
+  if (($bol             and m/\G[ \t]*([#*])[ \t]*/cg) or
+      ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(#+)[ \t]*/cg) or 
+      ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(\*+)[ \t]+/cg)) {
     # Note: the first line of this return statement is --not-- equivalent to:
     # "return CloseHtmlEnvironmentUntil('li')", as that line does not permit
     # modules overriding the CloseHtmlEnvironments() function to "have a say."
     return ($is_in_list_item ? CloseHtmlEnvironmentUntil('li') : CloseHtmlEnvironments())
-      .OpenHtmlEnvironment('ol', length($1))
-      .AddHtmlEnvironment ('li');
-  }
-  # * bullet list (nestable; needs space when nested to disambiguate from bold)
-  elsif (($bol             and m/\G[ \t]*(\*)[ \t]*/cg) or
-         ($is_in_list_item and m/\G[ \t]*\n+[ \t]*(\*+)[ \t]+/cg)) {
-    return ($is_in_list_item ? CloseHtmlEnvironmentUntil('li') : CloseHtmlEnvironments())
-      .OpenHtmlEnvironment('ul', length($1))
-      .AddHtmlEnvironment ('li');
+      .OpenHtmlEnvironment(substr($1, 0, 1) eq '#' ? 'ol' : 'ul', length($1), '', 'ol|ul')
+      .AddHtmlEnvironment('li');
   }
   # - bullet list (not nestable; always needs space)
   elsif ($CreoleDashStyleUnorderedLists and (

modules/creoleaddition.pl

@@ -22,7 +22,7 @@ creoleaddition is simply installable; simply:
 =cut
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/creoleaddition.pl">creoleaddition.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Creole_Addition_Markup_Extension">Creole Addition Markup Extension</a></p>';
+AddModuleDescription('creoleaddition.pl', 'Creole Addition Markup Extension');
 
 # ....................{ CONFIGURATION                      }....................
 

modules/crossbar.pl

@@ -33,7 +33,7 @@ crossbar is easily installable; move this file into the B<wiki/modules/>
 directory for your Oddmuse Wiki.
 
 =cut
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/crossbar.pl">crossbar.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Crossbar_Extension">Crossbar Extension</a></p>';
+AddModuleDescription('crossbar.pl', 'Crossbar Extension');
 
 # ....................{ CONFIGURATION                      }....................
 use vars qw($CrossbarPageName

modules/crumbs.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/crumbs.pl">crumbs.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/List_Parent_Pages_Extension">List Parent Pages Extension</a></p>';
+AddModuleDescription('crumbs.pl', 'List Parent Pages Extension');
 
 push(@MyRules, \&CrumbsRule);
 $RuleOrder{\&CrumbsRule} = -10; # run before default rules!

modules/css-install.pl

@@ -15,7 +15,7 @@ automatically.
 
 =cut
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/css-install.pl">css-install.pl</a></p>';
+AddModuleDescription('css-install.pl');
 
 =head1 CONFIGURATION
 

modules/csv.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/csv.pl">csv.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_Long_Table_Markup_Extension">Comments on Long Table Markup Extension</a></p>';
+AddModuleDescription('csv.pl', 'Comments on Long Table Markup Extension');
 
 push(@MyRules, \&CsvRule);
 

modules/dates.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/dates.pl">dates.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Dates_Extension">Dates Extension</a></p>';
+AddModuleDescription('dates.pl', 'Dates Extension');
 
 push(@MyAdminCode, \&DatesMenu);
 

modules/debug.pl

@@ -15,6 +15,8 @@
 
 package OddMuse;
 
+AddModuleDescription('debug.pl');
+
 @Debugging = (\&DebugInterLinks);
 
 sub DebugInterLinks {

modules/delete-all.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/delete-all.pl">delete-all.pl</a></p>';
+AddModuleDescription('delete-all.pl');
 
 use vars qw($DeletedAge);
 

modules/despam.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/despam.pl">despam.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Despam_Extension">Despam Extension</a></p>';
+AddModuleDescription('despam.pl', 'Despam Extension');
 
 push(@MyAdminCode, \&DespamMenu);
 

modules/diff.pl

@@ -0,0 +1,84 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2014  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/>.
+
+package OddMuse;
+
+AddModuleDescription('diff.pl', 'Diff Action Extension');
+
+push(@MyRules, \&DiffActionRule);
+$Action{pagediff} = \&DoDiffAction;
+
+sub DiffActionRule {
+  return PrintDiffActionChooser($3) if (m/\G(&lt;diff( (.*))&gt;)/cgi);
+  return undef; # the rule didn't match
+}
+
+sub DoDiffAction {
+  print GetHeader('', T('Page diff'), '');
+  my $page1 = GetParam('page1');
+  my $page2 = GetParam('page2');
+  my $pattern = GetParam('pattern');
+  $pattern ||= '.*';
+  print PrintDiffActionChooser($pattern);
+  ValidIdOrDie($page1);
+  ValidIdOrDie($page2);
+  my $diff = DoUnifiedDiff("1\n \n" . GetPageContent($page1), "2\n \n" . GetPageContent($page2)); # add extra lines, otherwise diff between identical files will print nothing # TODO fix this, otherwise one day this will fail...
+  $diff = QuoteHtml($diff);
+  $diff =~ tr/\r//d; # TODO is this required? # probably not
+  for (split /\n/, $diff) {
+    s/(^.)//;
+    my $type = $1;
+    if ($type eq '+') {
+      print '<span class="diffactionnew">' . $type;
+    } elsif ($type eq '-') {
+      print '<span class="diffactionold">' . $type;
+    }
+    ApplyRules($_);
+    print '</span>' if $type =~ /[+-]/;
+    print '<br/>';
+  }
+  PrintFooter();
+}
+
+sub PrintDiffActionChooser {
+  my $pattern = shift;
+  $pattern ||= '.*';
+  my @chosenPages = ();
+  for (@IndexList) {
+    push @chosenPages, $_ if m/$pattern/;
+  }
+  return  GetFormStart(undef, 'get', 'pagediff')
+      . GetHiddenValue('action', 'pagediff')
+      . GetHiddenValue('pattern', $pattern)
+      . $q->popup_menu(-name=>'page1', -values=>\@chosenPages) . ' '
+      . $q->popup_menu(-name=>'page2', -values=>\@chosenPages) . ' '
+      . $q->submit(-name=>'', -value=>T('Diff'))
+      . $q->end_form();
+}
+
+sub DoUnifiedDiff { # copied from DoDiff
+  CreateDir($TempDir);
+  my $oldName = "$TempDir/old";
+  my $newName = "$TempDir/new";
+  RequestLockDir('diff') or return '';
+  WriteStringToFile($oldName, $_[0]);
+  WriteStringToFile($newName, $_[1]);
+  my $diff_out = `diff -U 99999 -- \Q$oldName\E \Q$newName\E | tail -n +7`; # should be +4, but we always add extra line # TODO that workaround is ugly, fix it!
+  utf8::decode($diff_out); # needs decoding
+  $diff_out =~ s/\n\K\\ No newline.*\n//g; # Get rid of common complaint.
+  ReleaseLockDir('diff');
+  # No need to unlink temp files--next diff will just overwrite.
+  return $diff_out;
+}

modules/div-foo.pl

@@ -0,0 +1,35 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+package OddMuse;
+
+AddModuleDescription('div-foo.pl', 'Div Foo Extension');
+
+push(@MyRules, \&DivFooRule);
+
+sub DivFooRule {
+  if (m/\G\&lt;([\w ]+)\&gt;\s*\n/cg) {
+    return CloseHtmlEnvironment('p') . AddHtmlEnvironment('div', qq{class="$1"});
+  }
+  if (m/\G\&lt;([\w ]+)\&gt;/cg) {
+    return AddHtmlEnvironment('span', qq{class="$1"});
+  }
+  if (m/\G\&lt;\/\/\&gt;/cg) {
+    return CloseHtmlEnvironment('div') . (InElement('div') ? '' : AddHtmlEnvironment('p'));
+  }
+  if (m/\G\&lt;\/\&gt;/cg) {
+    return CloseHtmlEnvironment('span');
+  }
+  return undef;
+}

modules/dojo.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/dojo.pl">dojo.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Using_Dojo_Instead_Of_Wiki_Markup">Using Dojo Instead Of Wiki Markup</a></p>';
+AddModuleDescription('dojo.pl', 'Using Dojo Instead Of Wiki Markup');
 
 use vars qw(@DojoPlugins $DojoTheme);
 

modules/doubleclick.pl

@@ -21,7 +21,7 @@
 # edit a page by double-clicking on it. The user must have
 # JavaScript enabled for this to work.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/doubleclick.pl">doubleclick.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Doubleclick_Extension">Doubleclick Extension</a></p>';
+AddModuleDescription('doubleclick.pl', 'Doubleclick Extension');
 
 *OldDoubleclickGetHeader = *GetHeader;
 *GetHeader = NewDoubleclickGetHeader;

modules/download.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/download.pl">download.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Download_Extension">Download Extension</a></p>';
+AddModuleDescription('download.pl', 'Download Extension');
 
 push( @MyRules, \&DownloadSupportRule );
 

modules/drafts.pl

@@ -15,6 +15,8 @@
 use File::Glob ':glob';
 use vars qw($DraftDir);
 
+AddModuleDescription('drafts.pl');
+
 $DraftDir = $DataDir."/draft"; # directory for drafts
 
 push(@MyInitVariables, \&DraftInit);

modules/duckduckgo-search.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/duckduckgo-search.pl">duckduckgo-search.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Use_DuckDuckGo_For_Searches">Use DuckDuckGo For Searches</a></p>';
+AddModuleDescription('duckduckgo-search.pl', 'Use DuckDuckGo For Searches');
 
 use vars qw($DuckDuckGoSearchDomain);
 

modules/dynamic-comments.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/dynamic-comments.pl">dynamic-comments.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Dynamic_Comments_Extension">Dynamic Comments Extension</a></p>';
+AddModuleDescription('dynamic-comments.pl', 'Dynamic Comments Extension');
 
 push(@MyInitVariables, \&DynamicCommentsAddScript);
 

modules/dynlogo.pl

@@ -27,7 +27,7 @@
 #  $LogoUrl = GetDynLogoUrl();
 #
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/dynlogo.pl">dynlogo.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Dynamic_Logo">Dynamic Logo</a></p>';
+AddModuleDescription('dynlogo.pl', 'Dynamic Logo');
 
 use vars qw($DynLogoDirectory $DynLogoDefault %DynLogoMap);
 

modules/edit-assist.pl

@@ -15,7 +15,7 @@
 #    Boston, MA 02111-1307 USA
 
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/edit-assist.pl">edit-assist.pl</a></p>';
+AddModuleDescription('edit-assist.pl');
 
 push (@MyInitVariables,
       sub {

modules/edit-cluster.pl

@@ -1,3 +1,5 @@
+AddModuleDescription('edit-cluster.pl');
+
 $EditCluster = 'EditCluster';
 
 sub GetRc {
@@ -88,7 +90,7 @@ sub EditClusterNewRcHeader {
   } else {
     print $q->h2((GetParam('days', $RcDefault) != 1)
 		 ? Ts('Updates in the last %s days', GetParam('days', $RcDefault))
-		 : Ts('Updates in the last %s day', GetParam('days', $RcDefault)))
+		 : Ts('Updates in the last day'))
   }
   my $action;
   my ($idOnly, $userOnly, $hostOnly, $clusterOnly, $filterOnly, $match, $lang) =

modules/emailquote.pl

@@ -10,7 +10,7 @@
 # For user doc, see: 
 # http://www.oddmuse.org/cgi-bin/oddmuse/Email_Quote_Extension
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/emailquote.pl">emailquote.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Email_Quote_Extension">Email Quote Extension</a></p>';
+AddModuleDescription('emailquote.pl', 'Email Quote Extension');
 
 push(@MyRules, \&EmailQuoteRule);
 

modules/emoji.pl

@@ -0,0 +1,66 @@
+# Copyright (C) 2014  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/>.
+
+AddModuleDescription('emoji.pl', 'Smilies');
+
+push(@MyRules, \&EmojiRule);
+# this must come before tex.pl because of \o/ turning into ø/
+$RuleOrder{\&EmojiRule} = 150;
+
+# Some relevant links
+# https://en.wikipedia.org/wiki/List_of_emoticons
+
+sub EmojiRule {
+  if (m/\G:-?D/cg) {
+    # 😀 1F600 GRINNING FACE
+    return '&#x1F600;';
+  } elsif (/\G:[-o]?\)/cg) {
+    # 😊 1F60A SMILING FACE WITH SMILING EYES
+    return '&#x1F60A;';
+  } elsif (/\G\s+:3/cg) {
+    # 😸  1F638 GRINNING CAT FACE WITH SMILING EYES
+    return ' &#x1f638;';
+  } elsif (/\G:-?\(/cg) {
+    # 😟 1F61F WORRIED FACE
+    return '&#x1F61F;';
+  } elsif (/\G;-?\)/cg) {
+    # 😉 1F609 WINKING FACE
+    return '&#x1F609;';
+  } elsif (/\G:'\(/cg) {
+    # 😢 1F622 CRYING FACE
+    return '&#x1F622;';
+  } elsif (/\G&gt;:-?\(/cg) {
+    # 😠 1F620 ANGRY FACE
+    return '&#x1F620;';
+  } elsif (/\G:-?[Ppb]/cg) {
+    # 😝 1F61D FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
+    return '&#x1F61D;';
+  } elsif (/\G&lt;3/cg) {
+    # ❤ 2764 HEAVY BLACK HEART
+    return '&#x2764;';
+  } elsif (/\G\^_*\^/cg) {
+    # 😄 1F604 SMILING FACE WITH OPEN MOUTH AND SMILING EYES
+    return '&#x1F604;';
+  } elsif (/\G\b[Oo]_[Oo]\b/cg) {
+    # 😲 1F632 ASTONISHED FACE
+    return '&#x1F632;';
+  } elsif (/\G\\o\//cg) {
+    # 🙌 1F64C PERSON RAISING BOTH HANDS IN CELEBRATION
+    return '&#x1F64C;';
+  } elsif (/\G\\m\//cg) {
+    # ✊  270A RAISED FIST
+    return '&#x270A;';
+  }
+  return undef;
+}

modules/enclosure.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/enclosure.pl">enclosure.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Podcasting">Podcasting</a></p>';
+AddModuleDescription('enclosure.pl', 'Podcasting');
 
 use vars qw(@Enclosures);
 

modules/faq.pl

@@ -23,7 +23,7 @@
 # Additionally, lines starting with Q: and A: are rendered using 
 # the css classes div.question and div.answer.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/faq.pl">faq.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/FAQ_Extension">FAQ Extension</a></p>';
+AddModuleDescription('faq.pl', 'FAQ Extension');
 
 $FaqHeaderText = "Questions on this page:" unless $FaqHeaderText;
 $FaqQuestionText = "Question: " unless $FaqQuestionText;

modules/fckeditor.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA,
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/fckeditor.pl">fckeditor.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Using_FCKeditor_In_Addition_To_Wiki_Markup">Using FCKeditor In Addition To Wiki Markup</a></p>';
+AddModuleDescription('fckeditor.pl', 'Using FCKeditor In Addition To Wiki Markup');
 
 use vars qw($FCKeditorHeight);
 

modules/fieldlist.pl

@@ -10,7 +10,7 @@
 # For user doc, see: 
 # http://www.oddmuse.org/cgi-bin/oddmuse/Field_List_Extension
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/fieldlist.pl">fieldlist.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Field_List_Extension">Field List Extension</a></p>';
+AddModuleDescription('fieldlist.pl', 'Field List Extension');
 
 push(@MyRules, \&FieldListRules);
 

modules/find.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/find.pl">find.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Find_Extension">Find Extension</a></p>';
+AddModuleDescription('find.pl', 'Find Extension');
 
 $Action{find} = \&DoFind;
 

modules/fix-encoding.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/fix-encoding.pl">fix-encoding.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Fix_Encoding">Fix Encoding</a></p>';
+AddModuleDescription('fix-encoding.pl', 'Fix Encoding');
 
 $Action{'fix-encoding'} = \&FixEncoding;
 

modules/flashbox.pl

@@ -15,7 +15,7 @@ directory of your Oddmuse Wiki.
 =cut
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/flashbox.pl">flashbox.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Flashbox_Extension">Flashbox Extension</a></p>';
+AddModuleDescription('flashbox.pl', 'Flashbox Extension');
 
 # ....................{ CONFIGURATION                      }....................
 

modules/flickrgallery.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/flickrgallery.pl">flickrgallery.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/FlickrGallery_Module">FlickrGallery Module</a></p>';
+AddModuleDescription('flickrgallery.pl', 'FlickrGallery Module');
 
 # NOTE: This API key for Flickr is NOT to be used in any other products
 # INCLUDING derivative works.  The rest of the code can be used as licensed

modules/footnotes.pl

@@ -13,7 +13,7 @@ directory for your Oddmuse Wiki.
 =cut
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/footnotes.pl">footnotes.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Footnotes_Extension">Footnotes Extension</a></p>';
+AddModuleDescription('footnotes.pl', 'Footnotes Extension');
 
 # ....................{ CONFIGURATION                      }....................
 

modules/form_timeout.pl

@@ -0,0 +1,106 @@
+# form_timeout.pl - a form timeout based anti-spam module for Oddmuse
+#
+# Copyright (C) 2014 Aki Goto <tyatsumi@gmail.com>
+#
+# Original code is in PHP from http://textcaptcha.com/really
+# by Rob Tuley <hello@rob.cx>. Used with permission.
+#
+# 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/>.
+
+AddModuleDescription('form_timeout.pl');
+
+=head1 DESCRIPTION
+
+This is an anti-spam module for Oddmuse using form timeout method.
+Edit permission is timed out in specified duration (default is 30 minutes)
+after viewing the edit form. When edit content is posted directly by a spam bot
+without viewing the edit form, edit will be denied.
+
+=head1 CONFIGURATION
+
+$FormTimeoutSalt
+Mandatory. Token hash salt. Specify arbitrary string.
+Default = undef.
+
+$FormTimeoutTimeout
+The form timeout in seconds.
+Default = 60 * 30 (30 minutes).
+
+=cut
+
+use vars qw($FormTimeoutSalt $FormTimeoutTimeout);
+use Digest::MD5 qw(md5_hex);
+
+$FormTimeoutSalt = undef;
+$FormTimeoutTimeout = 60 * 30; # 30 minutes
+
+push(@MyInitVariables, \&FormTimeoutInitVariables);
+
+sub FormTimeoutInitVariables {
+  if (!defined($FormTimeoutSalt)) {
+    ReportError(T('Set $FormTimeoutSalt.'), '500 INTERNAL SERVER ERROR');
+  }
+}
+
+sub FormTimeoutGetHash {
+  my ($when) = @_;
+  return md5_hex($FormTimeoutSalt . $when);
+}
+
+sub FormTimeoutGetToken {
+  return $Now . '#' . FormTimeoutGetHash($Now);
+}
+
+sub FormTimeoutGetTime {
+  my ($token) = @_;
+  my ($when, $hash) = split /#/, $token;
+  my $valid_hash = FormTimeoutGetHash($when);
+  if ($hash ne $valid_hash) {
+    return '';
+  }
+  return $when;
+}
+
+sub FormTimeoutCheck {
+  my $token = GetParam('form_timeout_token', '');
+  my $when = FormTimeoutGetTime($token);
+  if ($when eq '' || $when < $Now - $FormTimeoutTimeout) {
+    return 0;
+  }
+  return 1;
+}
+
+*OldFormTimeoutGetFormStart = *GetFormStart;
+*GetFormStart = *NewFormTimeoutGetFormStart;
+
+sub NewFormTimeoutGetFormStart {
+  my ($ignore, $method, $class) = @_;
+  my $form = OldFormTimeoutGetFormStart($ignore, $method, $class);
+  my $token = FormTimeoutGetToken();
+  $form .= $q->input({-type=>'hidden', -name=>'form_timeout_token',
+                      -value=>$token});
+  return $form;
+}
+
+*OldFormTimeoutDoEdit = *DoEdit;
+*DoEdit = *NewFormTimeoutDoEdit;
+
+sub NewFormTimeoutDoEdit {
+  my ($id, $newText, $preview) = @_;
+  if (!FormTimeoutCheck()) {
+    ReportError(T('Form Timeout'), '403 FORBIDDEN', undef,
+    $q->p(Ts('Editing not allowed: %s is read-only.', NormalToFree($id))));
+  }
+  OldFormTimeoutDoEdit($id, $newText, $preview);
+}

modules/forms.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # ====================[ forms.pl                           ]====================
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/forms.pl">forms.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Form_Extension">Form Extension</a></p>';
+AddModuleDescription('forms.pl', 'Form Extension');
 
 # ....................{ MARKUP                             }....................
 push(@MyRules, \&FormsRule);

modules/fractions.pl

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/fractions.pl">fractions.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Fractions">Fractions</a></p>';
+AddModuleDescription('fractions.pl', 'Fractions');
 
 push(@MyRules, \&FractionsRule);
 

modules/gd_security_image.pl

@@ -0,0 +1,398 @@
+# GdSecurityImage - a CAPTCHA module for Oddmuse using GD::SecurityImage module
+#
+# Copyright (C) 2014 Aki Goto <tyatsumi@gmail.com>
+#
+# Codes reused from MwfCaptcha.pm in mwForum - Web-based discussion forum
+# Copyright (c) 1999-2014 Markus Wichitill
+#
+# Codes reused from questionasker.pl for Oddmuse
+# Copyright (C) 2004  Brock Wilcox <awwaiid@thelackthereof.org>
+# Copyright (C) 2006, 2007  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/>.
+
+AddModuleDescription('gd_security_image.pl');
+
+=head1 DESCRIPTION
+
+This is a CAPTCHA module for Oddmuse using GD::SecurityImage module.
+
+=head1 CONFIGURATION
+
+$GdSecurityImageFont
+Mandatory.
+Set a TTF font file used for generating CAPTCHA images.
+Example: '/usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf'.
+
+$GdSecurityImageRememberAnswer
+If 1, once CAPTCHA is answered, the result is cached on cookies
+and you need not to re-answer CAPTCHAs for some duration specified
+by $GdSecurityImageDuration.
+If 0, CAPTCHA is requested everytime you try to submit forms.
+Default = 1.
+
+$GdSecurityImageDuration
+The duration a CAPTCHA ticket is valid in seconds.
+Default = 60 * 10 (10 minutes).
+
+$GdSecurityImageRequiredList
+The page name for exceptions, if defined. Every page linked to via
+WikiWord or [[free link]] is considered to be a page which needs
+questions asked. All other pages do not require questions asked. If
+not set, then all pages need questions asked.
+
+%GdSecurityImageProtectedForms
+Forms using one of the specified classes are protected.
+Default:  ('comment' => 1, 'edit upload' => 1, 'edit text' => 1,).
+
+$GdSecurityImageDataDir
+When using with Namespaces Extension, specify original root data directory
+to concentrate GdSecurityImage data files in it.
+Default: $DataDir.
+
+$GdSecurityImageWidth
+Default: 250.
+
+$GdSecurityImageHeight
+Default: 60.
+
+$GdSecurityImagePtsize
+Default: 16.
+
+$GdSecurityImageScramble
+Default: 1.
+
+$GdSecurityImageChars
+Default: [qw(A B C D E F G H I J K L M O P R S T U V W X Y)].
+
+=head1 API
+
+You can use this module in other modules by using following APIs.
+
+GdSecurityImageGetHtml
+returns CAPTCHA HTML form element for embedding in HTML form clause.
+
+GdSecurityImageCheck
+returns whether CAPTCHA is answered correctly or not.
+
+=head1 DATA STRUCTURE
+
+Image data and ticket data are stored in $DataDir/gd_security_image directory.
+Old data are deleted partially whenever CAPTCHA form is accessed.
+You can delete this directory totally harmlessly, although it forces users to
+re-answer CAPTCHA.
+
+=cut
+
+use vars qw($GdSecurityImageFont $GdSecurityImageRememberAnswer
+  $GdSecurityImageDuration $GdSecurityImageRequiredList
+  %GdSecurityImageProtectedForms $GdSecurityImageDataDir
+  $GdSecurityImageWidth $GdSecurityImageHeight
+  $GdSecurityImagePtsize $GdSecurityImageScramble $GdSecurityImageChars
+  $GdSecurityImageAA);
+use vars qw($GdSecurityImageDir $GdSecurityImageId $GdSecurityImagePngToAA);
+
+use Digest::MD5;
+use File::Glob ':glob';
+
+$GdSecurityImageRequiredList = '';
+
+$Action{gd_security_image} = \&GdSecurityImageDoImage;
+
+push(@MyInitVariables, \&GdSecurityImageInitVariables);
+
+sub GdSecurityImageGetImageFile {
+  my ($id) = @_;
+  return "$GdSecurityImageDir/$id.png";
+}
+
+sub GdSecurityImageGetTicketFile {
+  my ($id) = @_;
+  return "$GdSecurityImageDir/$id.ticket";
+}
+
+sub GdSecurityImageGenerate {
+  # Load modules
+  my $gd = eval { require GD };
+  eval { require Image::Magick }
+    or ReportError(T('GD or Image::Magick modules not available.'), '500 INTERNAL SERVER ERROR') if !$gd;
+  eval { require GD::SecurityImage }
+    or ReportError(T('GD::SecurityImage module not available.'));
+
+  # Generate captcha image
+  GD::SecurityImage->import($gd ? () : (use_magick => 1));
+  my $img = GD::SecurityImage->new(
+          width => $GdSecurityImageWidth,
+          height => $GdSecurityImageHeight,
+          font => $GdSecurityImageFont,
+          ptsize => $GdSecurityImagePtsize,
+          scramble => $GdSecurityImageScramble,
+          rnd_data => $GdSecurityImageChars,
+          bgcolor => '#000000',
+  );
+  $img->random();
+  my $newCaptchaStr = $img->random_str();
+  $img->create('ttf', int(rand(2)) ? 'default' : 'ec', '#ffffff', '#ffffff');
+  $img->particle(3000);
+
+  ### experimental ###
+  #my $raw = $img->raw;
+  #my $w2 = $GdSecurityImageWidth * 2 / 3;
+  #my $h2 = $GdSecurityImageHeight * 2 / 3;
+  #my $raw2 = GD::Image->new($w2, $h2);
+  #$raw2->copyResampled($raw, 0, 0, 0, 0, $w2, $h2, $raw->getBounds);
+  #my $png = $raw2->png;
+
+  # Store captcha image
+  my ($imgData) = $img->out(force => 'png');
+  my $ticketId = Digest::MD5::md5_hex(rand());
+  CreateDir($GdSecurityImageDir);
+  my $file = GdSecurityImageGetImageFile($ticketId);
+  open my $fh, ">:raw", $file
+    or ReportError(Ts('Image storing failed. (%s)', $!), '500 INTERNAL SERVER ERROR');
+  print $fh $imgData;
+  #print $fh $png; ### experimental ###
+  close $fh;
+
+  # Insert captcha ticket
+  my %page = ();
+  $page{id} = $ticketId;
+  $page{generation_time} = $Now;
+  $page{string} = $newCaptchaStr;
+  CreateDir($GdSecurityImageDir);
+  WriteStringToFile(GdSecurityImageGetTicketFile($ticketId), EncodePage(%page));
+
+  return $ticketId;
+}
+
+sub GdSecurityImageIsValidId {
+  my ($id) = @_;
+  return $id =~ /^[0-9a-f]+$/;
+}
+
+sub GdSecurityImageReadImageFile {
+  my $file = shift;
+  utf8::encode($file); # filenames are bytes!
+  if (open(IN, '<:raw', $file)) {
+    local $/ = undef;   # Read complete files
+    my $data=<IN>;
+    close IN;
+    return (1, $data);
+  }
+  return (0, '');
+}
+
+sub GdSecurityImageDoImage {
+  my $id = GetParam('gd_security_image_id', '');
+
+  if (!GdSecurityImageIsValidId($id)) {
+    ReportError(T('Bad gd_security_image_id.'), '400 BAD REQUEST');
+  }
+
+  my ($status, $data) = GdSecurityImageReadImageFile(GdSecurityImageGetImageFile($id));
+
+  binmode(STDOUT, ":raw");
+  print $q->header(-type=>'image/png');
+  print $data;
+
+  unlink(GdSecurityImageGetImageFile($id));
+}
+
+sub GdSecurityImageCleanup {
+  my ($id) = @_;
+  if (!GdSecurityImageIsValidId($id)) {
+    return;
+  }
+  my @files = (bsd_glob("$GdSecurityImageDir/*.png"), bsd_glob("$GdSecurityImageDir/*.ticket"));
+  foreach my $file (@files) {
+    if ($Now - (stat $file)[9] > $GdSecurityImageDuration) {
+      unlink($file);
+    }
+  }
+}
+
+sub GdSecurityImageCheck {
+  if (defined($GdSecurityImageId)) {
+    return $GdSecurityImageId eq '';
+  }
+
+  my $id = GetParam('gd_security_image_id', '');
+  my $answer = GetParam('gd_security_image_answer', '');
+
+  GdSecurityImageCleanup($id);
+
+  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}) {
+          $GdSecurityImageId = '';
+          if (!$GdSecurityImageRememberAnswer) {
+            SetParam('gd_security_image_id', '');
+            SetParam('gd_security_image_answer', '');
+          }
+          return 1;
+        }
+      }
+    }
+  }
+
+  if (GdSecurityImageIsValidId($id)) {
+    unlink(GdSecurityImageGetTicketFile($id));
+  }
+
+  $GdSecurityImageId = GdSecurityImageGenerate();
+  return 0;
+}
+
+sub GdSecurityImageGetHtml {
+  if (GdSecurityImageCheck()) {
+    return '';
+  }
+
+  my $form = '';
+
+  SetParam('gd_security_image_answer', '');
+
+  $form .= $q->start_div({-class=>'gd_security_image'});
+
+  $form .= $q->start_div();
+  $form .= T('Please type the six characters from the anti-spam image');
+  $form .= $q->end_div();
+
+  $form .= $q->start_div();
+  $form .= $q->input({-type=>'hidden', -name=>'gd_security_image_id', -value=>$GdSecurityImageId});
+  $form .= $q->textfield(-name=>'gd_security_image_answer', -id=>'gd_security_image_answer');
+  $form .= $q->submit(-name=>'Submit', -value=>T('Submit'));
+  $form .= $q->end_div();
+
+  $form .= $q->start_div();
+  $form .= $q->img({-src=>"$FullUrl?action=gd_security_image&gd_security_image_id=$GdSecurityImageId", -alt=>T('CAPTCHA'), -width=>$GdSecurityImageWidth, -height=>$GdSecurityImageHeight});
+  $form .= $q->end_div();
+
+  if ($GdSecurityImageAA) {
+    $form .= $q->start_div({class=>'aa_captcha'});
+    $form .= $q->start_pre();
+    my $png_file = GdSecurityImageGetImageFile($GdSecurityImageId);
+    $form .= `$GdSecurityImagePngToAA $png_file`;
+    $form .= $q->end_pre();
+    $form .= $q->end_div();
+  }
+
+  $form .= $q->end_div();
+
+  return $form;
+}
+
+*OldGdSecurityImageDoPost = *DoPost;
+*DoPost = *NewGdSecurityImageDoPost;
+
+sub NewGdSecurityImageDoPost {
+  my(@params) = @_;
+  my $id = FreeToNormal(GetParam('title', undef));
+  my $preview = GetParam('Preview', undef); # case matters!
+  unless (UserIsEditor()
+          or $preview
+          or GdSecurityImageCheck()
+          or GdSecurityImageException($id)) {
+    print GetHeader('', T('Edit Denied'), undef, undef, '403 FORBIDDEN');
+    print $q->p(T('You did not answer correctly.'));
+    print GetFormStart(), GdSecurityImageGetHtml(),
+      (map { $q->input({-type=>'hidden', -name=>$_, -value=>UnquoteHtml(GetParam($_))}) }
+       qw(title text oldtime summary recent_edit aftertext)), $q->end_form;
+    PrintFooter();
+    # logging to the error log file of the server
+    # warn "Q: '$QuestionaskerQuestions[$question_num][0]', A: '$answer'\n";
+    return;
+  }
+  return (OldGdSecurityImageDoPost(@params));
+}
+
+*OldGdSecurityImageGetEditForm = *GetEditForm;
+*GetEditForm = *NewGdSecurityImageGetEditForm;
+
+sub NewGdSecurityImageGetEditForm {
+  return GdSecurityImageAddTo(OldGdSecurityImageGetEditForm(@_));
+}
+
+*OldGdSecurityImageGetCommentForm = *GetCommentForm;
+*GetCommentForm = *NewGdSecurityImageGetCommentForm;
+
+sub NewGdSecurityImageGetCommentForm {
+  return GdSecurityImageAddTo(OldGdSecurityImageGetCommentForm(@_));
+}
+
+sub GdSecurityImageAddTo {
+  my $form = shift;
+  if (not $upload
+      and not GdSecurityImageException(GetId())
+      and not UserIsEditor()) {
+    my $question = GdSecurityImageGetHtml();
+    $form =~ s/(.*)<p>(.*?)<label for="username">/$1$question<p>$2<label for="username">/;
+  }
+  return $form;
+}
+
+sub GdSecurityImageException {
+  my $id = shift;
+  return 0 unless $GdSecurityImageRequiredList and $id;
+  my $data = GetPageContent($GdSecurityImageRequiredList);
+  if ($WikiLinks) {
+    while ($data =~ /$LinkPattern/g) {
+      return 0 if FreeToNormal($1) eq $id;
+    }
+  }
+  if ($FreeLinks) {
+    while ($data =~ /\[\[$FreeLinkPattern\]\]/g) {
+      return 0 if FreeToNormal($1) eq $id;
+    }
+  }
+  return 1;
+}
+
+sub GdSecurityImageInitVariables {
+  ReportError(T('$GdSecurityImageFont is not set.'), '500 INTERNAL SERVER ERROR') unless defined $GdSecurityImageFont;
+  $GdSecurityImageRememberAnswer = 1 unless defined $GdSecurityImageRememberAnswer;
+  $GdSecurityImageDuration = 60 * 10 unless defined $GdSecurityImageDuration;
+
+  $GdSecurityImageRequiredList = FreeToNormal($GdSecurityImageRequiredList);
+
+  # Forms using one of the following classes are protected.
+  %GdSecurityImageProtectedForms = ('comment' => 1,
+                              'edit upload' => 1,
+                              'edit text' => 1,)
+    unless defined %GdSecurityImageProtectedForms;
+
+  $GdSecurityImageDataDir = $DataDir unless defined $GdSecurityImageDataDir;
+
+  $GdSecurityImageWidth = 240 unless defined $GdSecurityImageWidth;
+  $GdSecurityImageHeight = 75 unless defined $GdSecurityImageHeight;
+  $GdSecurityImagePtsize = 16.75 unless defined $GdSecurityImagePtsize;
+  $GdSecurityImageScramble = 1 unless defined $GdSecurityImageScramble;
+  $GdSecurityImageChars = [qw(A B C D E F G H I J K L M O P R S T U V W X Y)] unless defined $GdSecurityImageChars;
+
+  $GdSecurityImageAA = 0 unless defined $GdSecurityImageAA;
+
+  $GdSecurityImageDir = "$GdSecurityImageDataDir/gd_security_image";
+
+  $GdSecurityImageId = undef;
+
+  $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

@@ -0,0 +1,72 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2011  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/>.
+
+package OddMuse;
+
+AddModuleDescription('git-another.pl', 'Another Git Extension');
+
+use Cwd;
+use Capture::Tiny ':all';
+use vars qw($GitBinary $GitMail);
+
+$GitBinary = 'git';
+$GitMail = 'unknown@oddmuse.org';
+
+sub GitCommit {
+  my ($message, $author) = @_;
+  my $oldDir = cwd;
+  chdir("$DataDir/page");
+  capture {
+    system($GitBinary, qw(add -A));
+    system($GitBinary, qw(commit -q -m), $message, "--author=$author <$GitMail>");
+  };
+  chdir($oldDir);
+}
+
+sub GitInitRepository {
+  return if -d "$DataDir/page/.git";
+  capture {
+    system($GitBinary, qw(init -q --), "$DataDir/page");
+  };
+  GitCommit('Initial import', 'Oddmuse');
+}
+
+sub RenderHtmlCacheWithoutPrinting { # requires an open page
+  $FootnoteNumber = 0;
+  my $blocks, $flags;
+  capture {
+    ($blocks, $flags) = ApplyRules(QuoteHtml($Page{text}), 1, 1, $Page{revision}, 'p');
+  };
+  if ($Page{blocks} ne $blocks and $Page{flags} ne $flags) {
+    $Page{blocks} = $blocks;
+    $Page{flags}  = $flags;
+    SavePage();
+  }
+}
+
+*GitOldSave = *Save;
+*Save = *GitNewSave;
+
+sub GitNewSave {
+  GitInitRepository();
+  GitCommit('No description available', 'Oddmuse'); # commit any changes before this edit
+  GitOldSave(@_);
+  RenderHtmlCacheWithoutPrinting();
+  my $message = $Page{summary};
+  $message =~ s/^\s+$//;
+  $message ||= T('No summary provided');
+  my $author = $Page{username} || T('Anonymous');
+  GitCommit($message, $author); # commit this edit
+}

modules/git.pl

@@ -31,7 +31,7 @@ Set these variables in the B<config> file within your data directory.
 
 =head2 $GitBinary
 
-Default: C</usr/bin/git>
+Default: C<git>
 
 The fully qualified name for the binary to run. Your PATH will not be searched.
 
@@ -48,31 +48,56 @@ Default: C<unknown@oddmuse.org>
 
 The email address used to identify users in git.
 
+=head2 $GitDebug
+
+Default: 0
+
+If set, we capture the output of the git command and store it in
+$GitResult. This is useful when writing tests.
+
+=head2 $GitResult
+
+If $GitDebug is set, this variable holds STDOUT of the git command.
+
 =cut
 
-use vars qw($GitBinary $GitRepo $GitMail);
+use Cwd;
+use File::Temp ();
+use vars qw($GitBinary $GitRepo $GitMail $GitPageFile $GitDebug $GitResult);
 
-$GitBinary = '/usr/bin/git';
+AddModuleDescription('git.pl', 'Git Extension');
+
+$GitBinary = 'git';
 $GitMail = 'unknown@oddmuse.org';
+$GitPageFile = 0;
 
 push(@MyInitVariables, \&GitInitVariables);
 
 sub GitRun {
-  my $result = '';
-  local *STDOUT;
-  open(STDOUT, '>', \$result) or die "Can't open memory file: $!";
-  system($GitBinary, @_) == 0
-    or ReportError("git failed: $!",
-		   "500 INTERNAL SERVER ERROR",
-		   undef,
-		   $q->p($q->tt(join(' ', $GitBinary, map {
-		     if (index($_, ' ') == -1) {
-		      $_;
-		     } else {
-		       "'$_'";
-		     }
-		   } @_))),
-		   $q->pre($result));
+  my $oldDir = cwd;
+  my $exitStatus;
+  # warn join(' ', $GitBinary, @_) . "\n";
+
+  chdir($GitRepo);
+  if ($GitDebug) {
+    # capture the output of the git comand in a temporary file
+    my $fh = File::Temp->new();
+    open(my $oldout, ">&STDOUT") or die "Can't dup STDOUT: $!";
+    open(STDOUT, '>', $fh) or die "Can't redirect STDOUT: $!";
+    # run git in the work directory
+    $exitStatus = system($GitBinary, @_);
+    # read the temporary file with the output
+    close($fh);
+    open(STDOUT, ">&", $oldout) or die "Can't dup \$oldout: $!";
+    open(F, '<', $fh) or die "Can't open temp file for reading: $!";
+    local $/ = undef; # Read complete files
+    $GitResult = <F>;
+    close(F);
+  } else {
+    $exitStatus = system($GitBinary, @_);
+  }
+  chdir($oldDir);
+  return $exitStatus;
 }
 
 sub GitInitVariables {
@@ -80,39 +105,50 @@ sub GitInitVariables {
 }
 
 sub GitInitRepository {
-  if (not -d "$GitRepo/.git") {
-    CreateDir($GitRepo);
-    chdir($GitRepo); # important for all the git commands that follow!
-    GitRun('init', '--quiet');
-    foreach my $id (AllPagesList()) {
-      OpenPage($id);
-      WriteStringToFile("$GitRepo/$id", $Page{text});
-      GitRun('add', $id);
-    }
-    GitRun('commit', '--quiet', '-m', 'initial import',
-	   "--author=Oddmuse <$GitMail>");
-  } else {
-    chdir($GitRepo); # important for all the git commands that follow!
+  return if -d "$GitRepo/.git";
+  my $exception = shift;
+  CreateDir($GitRepo);
+  GitRun(qw(init --quiet));
+  # Add legacy pages: If you installed this extension for an older
+  # wiki, all the existing pages need to be added. We do this for all
+  # the pages except for the one we just saved. That page will get a
+  # better author and log message.
+  foreach my $id (AllPagesList()) {
+    next if $id eq $exception;
+    OpenPage($id);
+    WriteStringToFile("$GitRepo/$id", $GitPageFile ? EncodePage(%Page) : $Page{text});
+    GitRun(qw(add --), $id);
   }
+  GitRun(qw(commit --quiet -m), 'initial import', "--author=Oddmuse <$GitMail>");
 }
 
 *GitOldSave = *Save;
 *Save = *GitNewSave;
 
 sub GitNewSave {
+
+  # Save is called within lock, with opened page. That's why we cannot
+  # call GitInitRepository right away, because it opens all the legacy
+  # pages to save them, too. We need to save first.
   GitOldSave(@_);
-  GitInitRepository();
-  my ($id) = @_;
-  WriteStringToFile("$GitRepo/$id", $Page{text});
-  if ($Page{revision} == 1) {
-    GitRun('add', $id);
-  }
+
+  # We also need to save all the data from the open page.
   my $message = $Page{summary};
   $message =~ s/^\s+$//;
   $message ||= T('no summary available');
   my $author = $Page{username} || T('Anonymous');
-  GitRun('commit', '--quiet', '-m', $message,
-	 "--author=$author <$GitMail>", $id);
+  my $data = $GitPageFile ? EncodePage(%Page) : $Page{text};
+  my $id = shift;
+  # GitInitRepository will try to add and commit all the pages already
+  # in the wiki. These are assumed to be legacy pages. The page we
+  # just saved, however, should not be committed as a legacy page
+  # because legacy pages are committed with a default author and log
+  # message!
+  GitInitRepository($id);
+  WriteStringToFile("$GitRepo/$id", $data);
+  GitRun(qw(add --), $id);
+  GitRun(qw(commit --quiet -m), $message,
+	 "--author=$author <$GitMail>", '--', $id);
 }
 
 *GitOldDeletePage = *DeletePage;
@@ -123,11 +159,11 @@ sub GitNewDeletePage {
   return $error if $error;
   GitInitRepository();
   my ($id) = @_;
-  GitRun('rm', '--quiet', '--ignore-unmatch', $id);
+  GitRun(qw(rm --quiet --ignore-unmatch --), $id);
   my $message = T('page was marked for deletion');
   my $author = T('Oddmuse');
-  GitRun('commit', '--quiet', '-m', $message,
-	 "--author=$author <$GitMail>", $id);
+  GitRun(qw(commit --quiet -m), $message,
+	 "--author=$author <$GitMail>", '--', $id);
   return ''; # no error
 }
 
@@ -140,8 +176,7 @@ sub DoGitCleanup {
   print GetHeader('', 'Git', '');
   print $q->start_div({-class=>'content git'});
   RequestLockOrError();
-  print $q->p(T('Main lock obtained.')), '<p>',
-    T('Cleaning up git repository');
+  print $q->p(T('Main lock obtained.')), '<p>', T('Cleaning up git repository');
   GitCleanup();
   ReleaseLock();
   print $q->p(T('Main lock released.')), $q->end_div();
@@ -150,7 +185,7 @@ sub DoGitCleanup {
 
 sub GitCleanup {
   if (-d $GitRepo) {
-    print $q->p("Git cleanup starting");
+    print $q->p('Git cleanup starting');
     AllPagesList();
     # delete all the files including all the files starting with a dot
     opendir(DIR, $GitRepo) or ReportError("cannot open directory $GitRepo: $!");
@@ -163,20 +198,20 @@ sub GitCleanup {
     }
     closedir DIR;
     # write all the files again, just to be sure
-    print $q->p("Rewriting all the files, just to be sure");
+    print $q->p('Rewriting all the files, just to be sure');
     foreach my $id (@IndexList) {
       OpenPage($id);
-      WriteStringToFile("$GitRepo/$id", $Page{text});
+      WriteStringToFile("$GitRepo/$id", $GitPageFile ? EncodePage(%Page) : $Page{text});
     }
     # run git!
-    chdir($GitRepo); # important for all the git commands that follow!
     # add any new files
-    print $q->p("Adding new files, if any");
-    GitRun('add', '.');
+    print $q->p('Adding new files, if any');
+    GitRun(qw(add -A));
     # commit the new state
-    print $q->p("Committing changes, if any");
-    # try to protect against mysterious crashes
-    print $q->pre(`$GitBinary commit --quiet -a -m 'maintenance job' --author=Oddmuse <$GitMail>` . ' ');
-    print $q->p("Git done");
+    print $q->p('Committing changes, if any');
+    my $exitStatus = GitRun(qw(commit --quiet -m), 'maintenance job',
+			    "--author=Oddmuse <$GitMail>");
+    print $q->p('git commit finished with ' . $exitStatus . ' exit status.');
+    print $q->p('Git done');
   }
 }

modules/google-custom-search.pl

@@ -20,7 +20,7 @@ use vars qw($GoogleCustomSearchEngine);
 
 $GoogleCustomSearchEngine = 'http://www.google.com/cse?cx=004774160799092323420:6-ff2s0o6yi&q=';
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/google-custom-search.pl">google-custom-search.pl</a></p>';
+AddModuleDescription('google-custom-search.pl');
 
 # disable search form
 sub GetSearchForm {}

modules/google-search.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/google-search.pl">google-search.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Use_Google_For_Searches">Use Google For Searches</a></p>';
+AddModuleDescription('google-search.pl', 'Use Google For Searches');
 
 use vars qw($GoogleSearchDomain $GoogleSearchExclusive);
 

modules/gotobar.pl

@@ -1,22 +1,18 @@
-# Copyright (C) 2006  Alex Schroeder <alex@emacswiki.org>
+# Copyright (C) 2006-2014  Alex Schroeder <alex@gnu.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place, Suite 330
-#    Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/gotobar.pl">gotobar.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Gotobar_Extension">Gotobar Extension</a></p>';
+AddModuleDescription('gotobar.pl', 'Gotobar Extension');
 
 use vars qw($GotobarName);
 
@@ -32,18 +28,20 @@ sub GotobarInit {
   $AdminPages{$GotobarName} = 1;
   if ($IndexHash{$GotobarName}) {
     OpenPage($GotobarName);
-    return if $DeletedPage && $Page{text} =~ /^\s*$DeletedPage\b/o;
+    return if PageMarkedForDeletion();
     # Don't use @UserGotoBarPages because this messes up the order of
     # links for unsuspecting users.
     @UserGotoBarPages = ();
     $UserGotoBar = '';
     my $count = 0;
-    while ($Page{text} =~ m/($LinkPattern|\[\[$FreeLinkPattern\]\]|\[\[$FreeLinkPattern\|([^\]]+)\]\]|\[$InterLinkPattern\s+([^\]]+?)\])/og) {
-      my $page = $2||$3||$4||$6;
-      my $text = $5||$7;
+    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;
       if ($6) {
 	$UserGotoBar .= GetInterLink($page, $text);
+      } elsif ($8) {
+	$UserGotoBar .= GetUrl($page, $text);
       } else {
 	$UserGotoBar .= GetPageLink($page, $text);
 	# The first local page is the homepage, the second local page
@@ -58,4 +56,3 @@ sub GotobarInit {
     }
   }
 }
-

modules/gravatar.pl

@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/gravatar.pl">gravatar.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Gravatar">Gravatar</a></p>';
+AddModuleDescription('gravatar.pl', 'Gravatar');
 
 use Digest::MD5 qw(md5_hex);
 
@@ -26,7 +26,7 @@ push(@MyRules, \&GravatarRule);
 sub GravatarRule {
   if ($bol && m!\G$gravatar_regexp!cog) {
     my $url = $1;
-    my $gravatar = "http://www.gravatar.com/avatar/$3";
+    my $gravatar = "https://secure.gravatar.com/avatar/$3";
     my $name = FreeToNormal($2);
     $url = ScriptUrl($name) unless $url;
     return $q->span({-class=>"portrait gravatar"},

modules/grep.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/grep.pl">grep.pl</a></p>';
+AddModuleDescription('grep.pl');
 
 push(@MyRules, \&GrepRule);
 

modules/header-and-footer-templates.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/header-and-footer-templates.pl">header-and-footer-templates.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_HTML_Templates">Comments on HTML Templates</a></p>';
+AddModuleDescription('header-and-footer-templates.pl', 'Comments on HTML Templates');
 
 use vars qw($HtmlTemplateDir);
 use HTML::Template;

modules/headers.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/headers.pl">headers.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Header_Markup_Extension">Header Markup Extension</a></p>';
+AddModuleDescription('headers.pl', 'Header Markup Extension');
 
 # After toc.pl but before usemod.pl
 push(@MyRules, \&HeadersRule);

modules/headlines.pl

@@ -19,7 +19,7 @@
 
 use vars qw($HeadlineNumber);
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/headlines.pl">headlines.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Headlines_Extension">Headlines Extension</a></p>';
+AddModuleDescription('headlines.pl', 'Headlines Extension');
 
 push(@MyRules, \&HeadlinesRule);
 

modules/hibernal.pl

@@ -45,7 +45,7 @@ for posts having such a subtitle.
 #     "David_Curry".
 package OddMuse;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/hibernal.pl">hibernal.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Hibernal_Extension">Hibernal Extension</a></p>';
+AddModuleDescription('hibernal.pl', 'Hibernal Extension');
 
 # ....................{ CONFIGURATION                      }....................
 

modules/hiddenpages.pl

@@ -23,7 +23,7 @@
 # on a pattern matching the page id or to a membership to a certain
 # page cluster.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/hiddenpages.pl">hiddenpages.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Hidden_Pages_Extension">Hidden Pages Extension</a></p>';
+AddModuleDescription('hiddenpages.pl', 'Hidden Pages Extension');
 
 use vars qw($HiddenCluster $HideEditorPages $HideAdminPages
 $HideRegExEditor $HideRegExAdmin);

modules/honeypot.pl

@@ -22,7 +22,7 @@ automatically.
 
 =cut
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/honeypot.pl">honeypot.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_Monitor_Extension">Comments on Monitor Extension</a></p>';
+AddModuleDescription('honeypot.pl', 'Comments on Monitor Extension');
 
 =head1 CONFIGURATION
 

modules/html-template.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/html-template.pl">html-template.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/HTML_Templates">HTML Templates</a></p>';
+AddModuleDescription('html-template.pl', 'HTML Templates');
 
 # The entire mechanism of how pages are built is now upside down.
 # Instead of writing code that assembles pages, we load templates,

modules/html-uploads.pl

@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/html-uploads.pl">html-uploads.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Restricted_HTML_Upload">Restricted HTML Upload</a></p>';
+AddModuleDescription('html-uploads.pl', 'Restricted HTML Upload');
 
 $Action{download} = \&HtmlUploadsDoDownload;
 

modules/htmlcomment.pl

@@ -10,7 +10,7 @@
 # For user doc, see: 
 # http://www.oddmuse.org/cgi-bin/oddmuse/Html_Comment_Extension
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/htmlcomment.pl">htmlcomment.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Html_Comment_Extension">Html Comment Extension</a></p>';
+AddModuleDescription('htmlcomment.pl', 'Html Comment Extension');
 
 push(@MyRules, \&HtmlCommentRules);