_lib.pm: style changes

[selfforum.git] / selfforum-cgi / shared / Posting / _lib.pm

diff --git a/selfforum-cgi/shared/Posting/_lib.pm b/selfforum-cgi/shared/Posting/_lib.pm
index 3d082ac6fe6ea06ffb69ad9996a6ced0f1983fa8..05a0285c2a2cef36a1590a88086f519d09341a99 100644 (file)
--- a/selfforum-cgi/shared/Posting/_lib.pm
+++ b/selfforum-cgi/shared/Posting/_lib.pm
@@ -5,7 +5,7 @@ package Posting::_lib;
 # File:        shared/Posting/_lib.pm                                          #
 #                                                                              #
 # Authors:     André Malo <nd@o3media.de>, 2001-03-03                          #
 # File:        shared/Posting/_lib.pm                                          #
 #                                                                              #
 # Authors:     André Malo <nd@o3media.de>, 2001-03-03                          #

-#              Frank Schoenmann <fs@tower.de>, 2001-03-02                      #
+#              Frank Schoenmann <fs@tower.de>, 2001-03-13                      #

 #                                                                              #
 # Description: Message access interface, time format routines                  #
 #                                                                              #
 #                                                                              #
 # Description: Message access interface, time format routines                  #
 #                                                                              #


@@ -273,7 +273,7 @@ sub sort_thread ($$) {
   \@smsg;
 }
 
   \@smsg;
 }
 

-### delete_messages () ##########################################################
+### delete_messages () #########################################################

 #
 # Filter out deleted messages
 #
 #
 # Filter out deleted messages
 #


@@ -318,7 +318,7 @@ sub delete_messages ($)
   return;
 }
 
   return;
 }
 

-### get_all_threads () ##########################################################
+### get_all_threads () #########################################################

 #
 # Read and Parse the main file (without any XML-module, they are too slow)
 #
 #
 # Read and Parse the main file (without any XML-module, they are too slow)
 #


@@ -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="([^"]+)"[^>]*>/;
   }


@@ -439,9 +440,9 @@ sub get_all_threads ($$;$)
     $threads{$tid} = $smsg if (@$smsg);
   }
 
     $threads{$tid} = $smsg if (@$smsg);
   }
 

-  wantarray ?
-    (\%threads, $last_thread, $last_message, \@unids)
-  : \%threads;
+  wantarray
+    ? (\%threads, $last_thread, $last_message, $dtd, \@unids)
+    : \%threads;

 }
 
 ###########################
 }
 
 ###########################


@@ -571,4 +572,4 @@ sub long_hr_time ($) {
 # ====================================================
 
 # making require happy
 # ====================================================
 
 # making require happy

-1;
\ No newline at end of file
+1;