common.xml replaced by common.xml-default (save configuration on 'cvs update').

[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 5d7d529945dd2021db22fd0dc1355205b73cb296..5773ddd4d31d2657e80ead1bfcb14dc49ac982e6 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -10,7 +10,7 @@ BEGIN {
   ($Script) = ($0 =~ /^.*\/(.*)$/)? $1 : $0;}
 
 use lib "$Shared";
-#use CGI::Carp qw(fatalsToBrowser);
+use CGI::Carp qw(fatalsToBrowser);
 
 use Conf;
 use Conf::Admin;
@@ -23,17 +23,17 @@ print header(-type => 'text/html');
 
 my $conf = read_script_conf ($Bin, $Shared, $Script);
 
-$conf -> {wwwRoot} = 'i:/i_selfhtml/htdocs' unless ($ENV{GATEWAY_INTERFACE} =~ /CGI/);
+#$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;
 
@@ -41,23 +41,23 @@ 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},
-                        {assign   => $show_posting -> {assign},
-                         thread   => $tid,
-                         posting  => $mid,
-                         messages => $show_posting -> {messages},
-                         form     => $show_posting -> {form},
-                         cgi      => $cgi,
-                         tree     => $tree
+                         $show_posting -> {templateFile},
+                        {assign       => $show_posting -> {assign},
+                         thread       => $tid,
+                         posting      => $mid,
+                         adminDefault => $adminDefault,
+                         messages     => $show_posting -> {messages},
+                         form         => $show_posting -> {form},
+                         cgi          => $cgi,
+                         tree         => $tree
                         });}
 
 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