-
-HERE
-
-
-My::Web->footer();
diff --git a/Contact.pm b/Contact.pm
new file mode 100644
index 0000000..2bc4d68
--- /dev/null
+++ b/Contact.pm
@@ -0,0 +1,68 @@
+# $Id$
+# Contact page Perl template.
+# Copyright (C) 2003-2005 Jan Kratochvil
+#
+# 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; exactly version 2 of June 1991 is required
+#
+# 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
+
+
+package Contact;
+require 5.6.0; # at least 'use warnings;' but we need some 5.6.0+ modules anyway
+use vars qw($VERSION $CVS_ID);
+$VERSION=do { my @r=(q$Revision$=~/\d+/g); sprintf "%d.".("%03d"x$#r),@r; };
+$CVS_ID=q$Id$;
+use strict;
+use warnings;
+
+use My::Web;
+Wrequire 'resume::ResumeJanKratochvil';
+use Carp qw(confess cluck);
+
+
+sub handler
+{
+my $W=My::Web->init(
+ "title"=>"Contact",
+ "section"=>"Contact",
+ "css_push"=>"./Contact.css",
+ );
+My::Web->heading();
+
+
+print <<"HERE";
+
+HERE
+my @contact=resume::ResumeJanKratochvil->Contact();
+my %keys=map(($_=>1),qw(Name eMail Projects OpenPGP));
+while (@contact) {
+ my $key=shift @contact;
+ my $val=shift @contact;
+ next if !$keys{$key};
+ delete $keys{$key};
+ print <<"HERE";
+
+
$key
+ $val
+
+HERE
+ }
+cluck join(" ","Not found keys:",keys(%keys)) if keys(%keys);
+print <<"HERE";
+
+
+HERE
+
+
+exit;
+}
+1;
diff --git a/Index.html.pl b/Index.pm
old mode 100755
new mode 100644
similarity index 67%
rename from Index.html.pl
rename to Index.pm
index 888d663..6a82f5b
--- a/Index.html.pl
+++ b/Index.pm
@@ -1,8 +1,6 @@
-#! /usr/bin/perl
-#
# $Id$
# Main page Perl template.
-# Copyright (C) 2003 Jan Kratochvil
+# Copyright (C) 2003-2005 Jan Kratochvil
#
# 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
@@ -25,14 +23,16 @@ our $CVS_ID=q$Id$;
use strict;
use warnings;
-BEGIN{ open F,"Makefile"; our $top_dir=pop @{[split /\s/,(grep /^top_srcdir/,)[0]]}; eval "use lib '$top_dir'"; close F; }
use My::Web;
-use Apache::Constants qw(MOVED);
+use Apache2::Const qw(HTTP_MOVED_PERMANENTLY);
+
+our $HTML_TEST="download";
+our $HTML_TEST_RC=HTTP_MOVED_PERMANENTLY;
-my $W=My::Web->init(
- "__PACKAGE__"=>__PACKAGE__,
- "header_only"=>1,
- );
-$W->{"r"}->status(MOVED);
-$W->{"r"}->header_out("Location"=>"http://".&{$W->{"web_hostname_sub"}}."/project/");
+sub handler
+{
+my $W=My::Web->init();
+My::Web->http_moved("./project/",HTTP_MOVED_PERMANENTLY);
+}
+1;
diff --git a/Mailman.pl b/Mailman.pm
old mode 100755
new mode 100644
similarity index 73%
rename from Mailman.pl
rename to Mailman.pm
index acd5c3d..cf5979c
--- a/Mailman.pl
+++ b/Mailman.pm
@@ -1,8 +1,6 @@
-#! /usr/bin/perl
-#
# $Id$
# Mailman page Perl template.
-# Copyright (C) 2003 Jan Kratochvil
+# Copyright (C) 2003-2005 Jan Kratochvil
#
# 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
@@ -26,15 +24,17 @@ $CVS_ID=q$Id$;
use strict;
use warnings;
-BEGIN{ open F,"Makefile"; our $top_dir=pop @{[split /\s/,(grep /^top_srcdir/,)[0]]}; eval "use lib '$top_dir'"; close F; }
use My::Web;
-require CGI;
use URI::Escape;
require LWP::Simple;
+our $HTML_TEST=0; # TODO: Provide some real URLs for download/translation.
+our $HTML_TEST_QUERY_STRING="list=html_test";
+
+sub handler
+{
my $W=My::Web->init(
- "__PACKAGE__"=>__PACKAGE__,
"title"=>"Mailman Interface",
"no_job"=>1,
"args_check"=>{
@@ -44,17 +44,22 @@ my $W=My::Web->init(
"list"=>['^[-\w]+$'],
"back"=>'',
},
+ "http_safe"=>0, # LWP downloads.
+ # Mailman does not produce valid XHTML.
+ "content_type"=>"text/html",
);
My::Web->heading();
for my $list (@{$W->{"args"}{"list"}}) {
print "
List $list
\n";
- my $url_base=&{$W->{"mailman_url_sub"}}()."/subscribe/$list";
- my $t=LWP::Simple::get("$url_base?"
- .join('&',
- "list=$list",
- map({ $_."=".uri_escape($W->{"args"}{$_}); } qw(email pw pw-conf))));
+ my $url_base=$W->{"mailman_url"}."/subscribe/$list";
+ my $url=URI->new($url_base);
+ $url->query_form(
+ "list"=>$list,
+ map(($_=>$W->{"args"}{$_}),qw(email pw pw-conf)),
+ );
+ my $t=LWP::Simple::get($url);
$t=($t=~m#^.*]*>(.*?)