added version check (and fixed *grr*)

[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..e59d16efd8d8293b862de5005f80967183453dbe 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -1,63 +1,108 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+
+################################################################################
+#                                                                              #
+# 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 strict;
-
-use vars qw($Bin $Shared $Script $t0);
+use vars qw(
+  $Bin
+  $Shared
+  $Script
+  $Config
+  $VERSION
+);
 
 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;
+#  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
+#  $Config  = "$Bin/../../daten/forum/config";
+#  $Shared  = "$Bin/../../cgi-shared";
+#  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+}
+
+# setting umask, remove or comment it, if you don't need
+#
+umask 006;
 
 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 CGI qw(param header);
+use CGI qw(
+  param
+  header
+);
 
-print header(-type => 'text/html');
+# Version check
+#
+$VERSION = do { my @r =(q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
-my $conf = read_script_conf ($Bin, $Shared, $Script);
+print header(
+  -type    => 'text/html',
+  -expires => '+10m'
+);
 
-$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};
 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 $forum_file = $conf -> {wwwRoot}.$conf -> {files} -> {forum};
-my $message_path = $conf -> {wwwRoot}.$conf -> {files} -> {messagePath};
+my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
 
-#use Lock qw(:ALL);release_file(forum_file);die;
+my $forum_file = $conf -> {files} -> {forum};
+my $message_path = $conf -> {files} -> {messagePath};
 
 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
-                        });}
+  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,
+      cachepath    => $conf -> {files} -> {cachePath}
+    }
+  );
+}
 
 else {
-  print_forum_as_HTML ($forum_file,
-                       "$Bin/".$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