fixed some bugs

[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 c6b21cd51e1d3b00d1330922212a0a3f1366e3c7..7470dc7be958e0833faec25c6aad530e4d1841df 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -1,13 +1,36 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
-use strict;
+################################################################################
+#                                                                              #
+# File:        user/fo_view.pl                                                 #
+#                                                                              #
+# Authors:     André Malo <nd@o3media.de>, 2001-04-01                          #
+#                                                                              #
+# Description: display the forum main file or a single posting                 #
+#                                                                              #
+################################################################################
 
-use vars qw($Bin $Shared $Script $t0);
+use strict;
+use vars qw(
+  $Bin
+  $Shared
+  $Script
+  $Config
+);
 
 BEGIN {
-  ($Bin)    = ($0 =~ /^(.*)\/.*$/)? $1 : '.';
-  $Shared   = "$Bin/../shared";
-  ($Script) = ($0 =~ /^.*\/(.*)$/)? $1 : $0;}
+  my $null = $0; $null =~ s/\\/\//g; # for win :-(
+  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
+  $Shared  = "$Bin/../shared";
+  $Config  = "$Bin/config";
+  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+
+#  my $null = $0; #$null =~ s/\\/\//g; # for win :-(
+#  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
+#  $Config  = "$Bin/../../../cgi-config/devforum";
+#  $Shared  = "$Bin/../../../cgi-shared";
+#  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+}
 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
@@ -21,9 +44,7 @@ use CGI qw(param header);
 
 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 $conf = read_script_conf ($Config, $Shared, $Script);
 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};
@@ -35,29 +56,38 @@ my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 my $forum_file = $conf -> {files} -> {forum};
 my $message_path = $conf -> {files} -> {messagePath};
 
-#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,
-                         $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
-                        });}
+  print_posting_as_HTML (
+    $message_path,
+    $show_posting -> {templateFile},
+    { assign       => $show_posting -> {assign},
+      thread       => $tid,
+      posting      => $mid,
+      adminDefault => $adminDefault,
+      messages     => $conf -> {template} -> {messages},
+      form         => $show_posting -> {form},
+      cgi          => $cgi,
+      tree         => $tree,
+      firsttime    => 1,
+      cachefile    => $conf -> {files} -> {cacheFile}
+    }
+  );
+}
 
 else {
-  print_forum_as_HTML ($forum_file,
-                       $show_forum -> {templateFile},
-                      {assign       => $show_forum -> {assign},
-                       adminDefault => $adminDefault,
-                       cgi          => $cgi,
-                       tree         => $tree
-                      });}
-# eos
\ No newline at end of file
+  print_forum_as_HTML (
+    $forum_file,
+    $show_forum -> {templateFile},
+    { assign       => $show_forum -> {assign},
+      adminDefault => $adminDefault,
+      cgi          => $cgi,
+      tree         => $tree
+    }
+  );
+}
+
+#
+#
+### end of fo_view.pl ##########################################################
\ No newline at end of file