CheckRFC now matches a http-uri including the fragment identifier

[selfforum.git] / selfforum-cgi / user / fo_view.pl

diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index ad74b50afa9e64f3daf84ef496d3512075ec4ec8..fb2ab8c5d5b99a197f0788860b80031d5853b897 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -2,20 +2,22 @@
 
 use strict;
 
-use vars qw($Bin $Shared $Script $t0);
+use vars qw($Bin $Shared $Script);
 
 BEGIN {
-  ($Bin)    = ($0 =~ /^(.*)\/.*$/)? $1 : '.';
+  my $null = $0; $null =~ s/\\/\//g; # for win :-(
+  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';
   $Shared   = "$Bin/../shared";
-  ($Script) = ($0 =~ /^.*\/(.*)$/)? $1 : $0;}
+  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+}
 
 use lib "$Shared";
-#use CGI::Carp qw(fatalsToBrowser);
+use CGI::Carp qw(fatalsToBrowser);
 
 use Conf;
 use Conf::Admin;
-use Template::Forum;
-use Template::Posting;
+use autouse 'Template::Forum'   => qw(print_forum_as_HTML($$$));
+use autouse 'Template::Posting' => qw(print_posting_as_HTML($$$));
 
 use CGI qw(param header);
 
@@ -23,25 +25,23 @@ print header(-type => 'text/html');
 
 my $conf = read_script_conf ($Bin, $Shared, $Script);
 
-$conf -> {wwwRoot} = 'i:/i_selfhtml/htdocs' unless ($ENV{GATEWAY_INTERFACE} =~ /CGI/);
-
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};
 my $show_posting = $show -> {Posting};
 my $cgi = $show -> {assign} -> {cgi};
 my $tree = $show -> {assign} -> {thread};
-my $adminDefault = read_admin_conf ("$Bin/".$conf -> {files} -> {adminDefault});
+my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 
-my $forum_file = $conf -> {wwwRoot}.$conf -> {files} -> {forum};
-my $message_path = $conf -> {wwwRoot}.$conf -> {files} -> {messagePath};
+my $forum_file = $conf -> {files} -> {forum};
+my $message_path = $conf -> {files} -> {messagePath};
 
-#use Lock qw(:ALL);release_file(forum_file);die;
+#use Lock qw(:ALL);release_file($forum_file);die;
 
 my ($tid, $mid) = (param ($cgi -> {thread}), param ($cgi -> {posting}));
 
 if (defined ($tid) and defined ($mid)) {
   print_posting_as_HTML ($message_path,
-                         "$Bin/".$show_posting -> {templateFile},
+                         $show_posting -> {templateFile},
                         {assign       => $show_posting -> {assign},
                          thread       => $tid,
                          posting      => $mid,
@@ -54,11 +54,10 @@ if (defined ($tid) and defined ($mid)) {
 
 else {
   print_forum_as_HTML ($forum_file,
-                       "$Bin/".$show_forum -> {templateFile},
+                       $show_forum -> {templateFile},
                       {assign       => $show_forum -> {assign},
                        adminDefault => $adminDefault,
                        cgi          => $cgi,
                        tree         => $tree
                       });}
-
 # eos
\ No newline at end of file