now, if main file is master locked, fo_view.pl won't show any single message

diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl
index e010f3781ae1c45203d68ba619201b27739568bf..6cd424d223eafa7a149ef97a8c303e72345c87b7 100644 (file)
--- a/selfforum-cgi/user/fo_view.pl
+++ b/selfforum-cgi/user/fo_view.pl
@@ -19,22 +19,22 @@ use vars qw(
 );
 
 BEGIN {
 );
 
 BEGIN {

-#  my $null = $0; $null =~ s/\\/\//g; # for win :-(
-#  $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
-#  $Shared  = "$Bin/../shared";
-#  $Config  = "$Bin/config";
-#  $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;
-
-  my $null = $0;
+  my $null = $0; $null =~ s/\\/\//g; # for win :-(

   $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';
   $Bin     = ($null =~ /^(.*)\/.*$/)? $1 : '.';

-  $Config  = "$Bin/../../cgi-config/forum";
-  $Shared  = "$Bin/../../cgi-shared";
+  $Shared  = "$Bin/../shared";
+  $Config  = "$Bin/config";

   $Script  = ($null =~ /^.*\/(.*)$/)? $1 : $null;
   $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
 #
 }
 
 # setting umask, remove or comment it, if you don't need
 #

-umask 000;
+umask 006;

 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);
 
 use lib "$Shared";
 use CGI::Carp qw(fatalsToBrowser);


@@ -68,46 +68,63 @@ 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};

-my $show_posting = $show -> {Posting};
-my $cgi = $show -> {assign} -> {cgi};
-my $tree = $show -> {assign} -> {thread};
-my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});

 
 my $forum_file = $conf -> {files} -> {forum};
 
 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,
-    $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}
-    }
+
+# check on closed forum
+#
+my $main = new Lock($forum_file);
+if ($main -> masterlocked) {
+
+  my $template = new Template $show_forum -> {templateFile};
+
+  $template -> printscrap (
+    $show_forum -> {assign} -> {errorDoc},
+    { $show_forum -> {assign} -> {errorText} => $template -> insert ($show_forum -> {assign} -> {'notAvailable'}) }

   );
 }
 
 else {
   );
 }
 
 else {

-  print_forum_as_HTML (
-    $forum_file,
-    $show_forum -> {templateFile},
-    { assign       => $show_forum -> {assign},
-      adminDefault => $adminDefault,
-      cgi          => $cgi,
-      tree         => $tree
-    }
-  );
+  my $cgi = $show -> {assign} -> {cgi};
+  my $tree = $show -> {assign} -> {thread};
+  my $adminDefault = read_admin_conf ($conf -> {files} -> {adminDefault});
+
+  my ($tid, $mid) = (param ($cgi -> {thread}), param ($cgi -> {posting}));
+
+  if (defined ($tid) and defined ($mid)) {
+    my $show_posting = $show -> {Posting};
+
+    print_posting_as_HTML (
+      $conf -> {files} -> {messagePath},
+      $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,
+      $show_forum -> {templateFile},
+      { assign       => $show_forum -> {assign},
+        adminDefault => $adminDefault,
+        cgi          => $cgi,
+        tree         => $tree
+      }
+    );
+  }

 }
 
 }
 

+

 #
 #
 ### end of fo_view.pl ##########################################################
\ No newline at end of file
 #
 #
 ### end of fo_view.pl ##########################################################
\ No newline at end of file