modified 'get_all_threads', returns now additionally the dtd resource,

fo_posting.pl adjusted

diff --git a/selfforum-cgi/shared/Posting/_lib.pm b/selfforum-cgi/shared/Posting/_lib.pm
index 3d082ac6fe6ea06ffb69ad9996a6ced0f1983fa8..9ede10553eb9fad8e11ed9e8f4dd5c18ab181f8e 100644 (file)
--- a/selfforum-cgi/shared/Posting/_lib.pm
+++ b/selfforum-cgi/shared/Posting/_lib.pm
@@ -326,12 +326,12 @@ sub delete_messages ($)
 #         $deleted  hold deleted (invisible) messages in result (1) oder not (0)
 #         $sorted   direction of message sort: descending (0) (default) or ascending (1)
 # Return: scalar context: hash reference
 #         $deleted  hold deleted (invisible) messages in result (1) oder not (0)
 #         $sorted   direction of message sort: descending (0) (default) or ascending (1)
 # Return: scalar context: hash reference

-#           list context: list (\%threads, $last_thread, $last_message, \@unids)
+#           list context: list (\%threads, $last_thread, $last_message, $dtd, \@unids)

 #
 sub get_all_threads ($$;$)
 {
   my ($file, $deleted, $sorted) = @_;
 #
 sub get_all_threads ($$;$)
 {
   my ($file, $deleted, $sorted) = @_;

-  my ($last_thread, $last_message, @unids, %threads);
+  my ($last_thread, $last_message, $dtd, @unids, %threads);

   local (*FILE, $/);
 
   open FILE, $file or return undef;
   local (*FILE, $/);
 
   open FILE, $file or return undef;


@@ -340,6 +340,7 @@ sub get_all_threads ($$;$)
 
   if (wantarray)
   {
 
   if (wantarray)
   {

+    ($dtd)          = $xml =~ /<!DOCTYPE\s+\S+\s+SYSTEM\s+"([^"]+)">/;

     ($last_thread)  = map {/(\d+)/} $xml =~ /<Forum.+?lastThread="([^"]+)"[^>]*>/;
     ($last_message) = map {/(\d+)/} $xml =~ /<Forum.+?lastMessage="([^"]+)"[^>]*>/;
   }
     ($last_thread)  = map {/(\d+)/} $xml =~ /<Forum.+?lastThread="([^"]+)"[^>]*>/;
     ($last_message) = map {/(\d+)/} $xml =~ /<Forum.+?lastMessage="([^"]+)"[^>]*>/;
   }


@@ -440,7 +441,7 @@ sub get_all_threads ($$;$)
   }
 
   wantarray ?
   }
 
   wantarray ?

-    (\%threads, $last_thread, $last_message, \@unids)
+    (\%threads, $last_thread, $last_message, $dtd, \@unids)

   : \%threads;
 }
 
   : \%threads;
 }
 

diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl
index 6bcde802bbcb16303dd3bda67ed908679d105066..89e0e243c5f4a216c0fef99ac83892b19c1f97aa 100644 (file)
--- a/selfforum-cgi/user/fo_posting.pl
+++ b/selfforum-cgi/user/fo_posting.pl
@@ -104,7 +104,7 @@ sub check_reply_dupe () {
 
     $flocked = 1;
 
 
     $flocked = 1;
 

-    ($threads, $last_thread, $last_message, my $unids) = get_all_threads (forum_filename, 1, 0);
+    ($threads, $last_thread, $last_message, undef, my $unids) = get_all_threads (forum_filename, 1, 0);

     ($ftid,$fmid) = split /;/,$dparam{$formdata -> {followUp} -> {name}},2;
 
     # Thread existiert nicht
     ($ftid,$fmid) = split /;/,$dparam{$formdata -> {followUp} -> {name}},2;
 
     # Thread existiert nicht