mason diversion etc.

diff --git a/AwayMsg.pm b/AwayMsg.pm
index acfb0ce848d64d2876085ec7245458583bc8d227..72c594695e69c9bd1ad84bc2f4e2c4d13d6de7ae 100644 (file)
--- a/AwayMsg.pm
+++ b/AwayMsg.pm
@@ -31,14 +31,7 @@ sub hquote ($) {
 }
 
 sub db_connect () {
-    my $dbf;
-    foreach my $d (@INC) {
-       $dbf = "$d/data/away.db";
-       if (stat $dbf) {
-           chdir($d) or die $!;
-           last;
-       }
-    }
+    my $dbf = "$ENV{'NJAWAYMSG'}/data/away.db";
     $dbh = DBI->connect("dbi:SQLite:$dbf",'','',
                         { AutoCommit=>0,
                           RaiseError=>1, ShowErrorStatement=>1

diff --git a/mason/autohandler b/mason/autohandler
index 22b062a0b3683f5dffbac68595d3c9c0e3306cde..469f4820f8691a23470c9e0c3ed5b62930fa4c31 100644 (file)
--- a/mason/autohandler
+++ b/mason/autohandler
@@ -1,8 +1,24 @@
 <%once>
 use CGI::Auth::Flexible;
+
+sub do_redirect_mason ($$$$) {
+    my ($c, $ar, $new_url, $cookie) = @_;
+    $m->auto_send_headers(0);
+    CGI::Auth::Flexible::do_redirect_cgi($c,$ar,$new_url,$cookie);
+}
+
 my $verifier = CGI::Auth::Flexible->new_verifier(
-   dir => "/home/ian/things/Nj-awaymsg/nj-awaymsg.git/data",
-   CGI::Auth::Flexible->mason_params();
-   );
-my $authreq = $verifier->new_mason_request(\%ARGS);
+    dir => "$ENV{'NJAWAYMSG'}/data",
+#    do_redirect => \&do_redirect_mason,
+    handle_divert => sub { $m->auto_send_headers(0); return 0; },
+#    print => sub { my ($c,$ar,@t) = @_; $m->print(@t); },
+    encrypted_only => 0,
+    );
+</%once>
+<%perl>
+my $cgi = $m->cgi_object();
+my $ar = $verifier->new_request($cgi);
+if ($ar->check_ok()) {
+   $m->call_next();   
+}
 </%perl>

diff --git a/run-mason.cgi b/run-mason.cgi
index 3f42cc5f323bcbe1ffe71ca3ea922e742d0aac21..91916cc0c507c05e3f801d1d8f00d08d59000799 100755 (executable)
--- a/run-mason.cgi
+++ b/run-mason.cgi
@@ -15,8 +15,6 @@ unshift @INC, $perllib;
 my $pathsofar = $comp_root;
 die "$pathsofar $!" unless stat $pathsofar;
 
-system 'printenv |sort >&2';
-
 my $path_info = $ENV{'PATH_INFO'};
 $path_info='' if !defined $path_info;