now the (new) purge method of the lock file is called after removing a thread file

[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 766fc10a3d78cf65b6393c99f4ef681c4d3b1a9c..c185dd31dcafea6e8a69353c650f432a452fa30b 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -4,22 +4,38 @@
 #                                                                              #
 # File:        user/fo_view.pl                                                 #
 #                                                                              #
 #                                                                              #
 # File:        user/fo_view.pl                                                 #
 #                                                                              #

-# Authors:     André Malo <nd@o3media.de>, 2001-04-01                          #
+# Authors:     André Malo <nd@o3media.de>                                      #

 #                                                                              #
 # Description: display the forum main file or a single posting                 #
 #                                                                              #
 ################################################################################
 
 use strict;
 #                                                                              #
 # Description: display the forum main file or a single posting                 #
 #                                                                              #
 ################################################################################
 
 use strict;

-use vars qw($Bin $Shared $Script);
+use vars qw(
+  $Bin
+  $Shared
+  $Script
+  $Config
+);

 
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(
 
 BEGIN {
   my $null = $0; $null =~ s/\\/\//g; # for win :-(

-  ($Bin)    = ($null =~ /^(.*)\/.*$/)? $1 : '.';
-  $Shared   = "$Bin/../shared";
-  ($Script) = ($null =~ /^.*\/(.*)$/)? $1 : $null;
+  $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 lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
 


@@ -28,11 +44,27 @@ use Conf::Admin;
 use Template::Forum;
 use Template::Posting;
 
 use Template::Forum;
 use Template::Posting;
 

-use CGI qw(param header);
+use CGI qw(
+  param
+  header
+);

 
 

-print header(-type => 'text/html');
+################################################################################
+#
+# Version check
+#
+# last modified:
+#    $Date$ (GMT)
+# by $Author$
+#
+sub VERSION {(q$Revision$ =~ /([\d.]+)\s*$/)[0] or '0.0'}

 
 

-my $conf = read_script_conf ($Bin, $Shared, $Script);
+print header(
+  -type    => 'text/html',
+  -expires => '+10m'
+);
+
+my $conf = read_script_conf ($Config, $Shared, $Script);

 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};
 
 my $show = $conf -> {show};
 my $show_forum = $show -> {Forum};


@@ -54,10 +86,12 @@ if (defined ($tid) and defined ($mid)) {
       thread       => $tid,
       posting      => $mid,
       adminDefault => $adminDefault,
       thread       => $tid,
       posting      => $mid,
       adminDefault => $adminDefault,

-      messages     => $show_posting -> {messages},
+      messages     => $conf -> {template} -> {messages},

       form         => $show_posting -> {form},
       cgi          => $cgi,
       form         => $show_posting -> {form},
       cgi          => $cgi,

-      tree         => $tree
+      tree         => $tree,
+      firsttime    => 1,
+      cachepath    => $conf -> {files} -> {cachePath}

     }
   );
 }
     }
   );
 }