_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 562f37a5ec87f94c6c0b3ac406e47a9f4c24f226..05a0285c2a2cef36a1590a88086f519d09341a99 100644 (file)
--- a/selfforum-cgi/shared/Posting/_lib.pm
+++ b/selfforum-cgi/shared/Posting/_lib.pm
@@ -1,18 +1,18 @@
-# Posting/_lib.pm
+package Posting::_lib;

 
 

-# ====================================================
-# Autor: n.d.p. / 2001-01-07
-# lm   : n.d.p. / 2001-02-25
-# ====================================================
-# Funktion:
-#    * Schnittstellen fuer den Zugriff auf Messages
-#    * Zeitdarstellung
-# ====================================================
+################################################################################
+#                                                                              #
+# File:        shared/Posting/_lib.pm                                          #
+#                                                                              #
+# Authors:     André Malo <nd@o3media.de>, 2001-03-03                          #
+#              Frank Schoenmann <fs@tower.de>, 2001-03-13                      #
+#                                                                              #
+# Description: Message access interface, time format routines                  #
+#                                                                              #
+################################################################################

 
 use strict;
 
 
 use strict;
 

-package Posting::_lib;
-

 use vars qw(@EXPORT_OK);
 use base qw(Exporter);
 
 use vars qw(@EXPORT_OK);
 use base qw(Exporter);
 


@@ -21,26 +21,27 @@ use Encode::Plain; $Encode::Plain::utf8 = 1;
 use XML::DOM;
 
 # ====================================================
 use XML::DOM;
 
 # ====================================================

-# Funktionsexport
+# Export

 # ====================================================
 
 # ====================================================
 

-@EXPORT_OK = qw(get_message_header get_message_body get_message_node parse_single_thread
+@EXPORT_OK = qw(get_message_header get_message_body get_message_node get_body_node parse_single_thread

                 hr_time short_hr_time long_hr_time
                 hr_time short_hr_time long_hr_time

-                get_all_threads
-                create_forum_xml_string
+                get_all_threads create_forum_xml_string

                 save_file);
 
 # ====================================================
                 save_file);
 
 # ====================================================

-# Zugriff uebers DOM
+# Access via XML::DOM

 # ====================================================
 
 # ====================================================
 

-###########################
-# sub get_message_header
+### get_message_header () ######################################################

 #
 #

-# Messageheader auslesen
-###########################
-
-sub get_message_header ($) {
+# Read message header, return as a hash
+#
+# Params: $node  XML message node
+# Return: Hash reference (name, category, subject, email, home, image, time)
+#
+sub get_message_header ($)
+{

   my $node = shift;
   my %conf;
 
   my $node = shift;
   my %conf;
 


@@ -54,59 +55,89 @@ sub get_message_header ($) {
     my $subject = $header -> getElementsByTagName ('Subject', 0) -> item (0);
     my $date    = $header -> getElementsByTagName ('Date', 0) -> item (0);
 
     my $subject = $header -> getElementsByTagName ('Subject', 0) -> item (0);
     my $date    = $header -> getElementsByTagName ('Date', 0) -> item (0);
 

-    %conf = (name     => ($name    -> hasChildNodes)?$name    -> getFirstChild -> getData:undef,
-             category => ($cat     -> hasChildNodes)?$cat     -> getFirstChild -> getData:undef,
-             subject  => ($subject -> hasChildNodes)?$subject -> getFirstChild -> getData:undef,
-             email    => (defined ($email) and $email -> hasChildNodes)?$email -> getFirstChild -> getData:undef,
-             home     => (defined ($home)  and $home  -> hasChildNodes)?$home  -> getFirstChild -> getData:undef,
-             image    => (defined ($image) and $image -> hasChildNodes)?$image -> getFirstChild -> getData:undef,
-             time     => $date -> getAttribute ('longSec'));
+  %conf = (
+    name     => ($name    -> hasChildNodes)?$name    -> getFirstChild -> getData:undef,
+    category => ($cat     -> hasChildNodes)?$cat     -> getFirstChild -> getData:undef,
+    subject  => ($subject -> hasChildNodes)?$subject -> getFirstChild -> getData:undef,
+    email    => (defined ($email) and $email -> hasChildNodes)?$email -> getFirstChild -> getData:undef,
+    home     => (defined ($home)  and $home  -> hasChildNodes)?$home  -> getFirstChild -> getData:undef,
+    image    => (defined ($image) and $image -> hasChildNodes)?$image -> getFirstChild -> getData:undef,
+    time     => $date -> getAttribute ('longSec')
+  );
+

   \%conf;
 }
 
   \%conf;
 }
 

-###########################
-# sub get_message_header
+### get_body_node () ########################################################

 #
 #

-# Messagebody auslesen
-###########################
-
-sub get_message_body ($$)
+# Search a specific message body in a XML tree
+#
+# Params: $xml  XML::DOM::Document Object (Document Node)
+#         $mid  Message ID
+# Return: MessageContent XML node (or -none-)
+#
+sub get_body_node ($$)

 {
   my ($xml, $mid) = @_;
 {
   my ($xml, $mid) = @_;

-  my $body;

 
 

-  foreach ($xml -> getElementsByTagName ('ContentList', 1) -> item (0) -> getElementsByTagName ('MessageContent', 0))
+  for ($xml->getElementsByTagName ('ContentList', 1)->item (0)->getElementsByTagName ('MessageContent', 0))

   {
   {

-    if ($_ -> getAttribute ('mid') eq $mid)
-    {
-      $body = ($_ -> hasChildNodes)?$_ -> getFirstChild -> getData:'';
-      last;
-    }
+    return $_ if ($_ -> getAttribute ('mid') eq $mid);

   }
 
   }
 

-  \$body;
+  return;

 }
 
 }
 

-###########################
-# sub get_message_header
+### get_message_body () ########################################################

 #
 #

-# Messagenode bestimmen
-###########################
+# Read message body
+#
+# Params: $xml  XML::DOM::Document Object (Document Node)
+#         $mid  Message ID
+# Return: Scalar reference
+#
+sub get_message_body ($$)
+{
+  my $cnode = get_body_node ($_[0], $_[1]);
+  my $body;

 
 

-sub get_message_node ($$$) {
-  my ($xml,$tid,$mid) = @_;
-  my ($mnode,$tnode);
+  $body = ($cnode -> hasChildNodes)?$cnode -> getFirstChild -> getData:'' if $cnode;

 
 

-  for ( $xml -> getElementsByTagName ('Thread')) {
-    if ($_ -> getAttribute ('id') eq $tid) {
+  \$body;
+}
+
+### get_message_node () ########################################################
+#
+# Search a specific message in a XML tree
+#
+# Params: $xml  XML::DOM::Document Object (Document Node)
+#         $tid  Thread ID
+#         $mid  Message ID
+# Return: Message XML node, Thread XML node (or -none-)
+#
+sub get_message_node ($$$)
+{
+  my ($xml, $tid, $mid) = @_;
+  my ($mnode, $tnode);
+
+  for ($xml->getElementsByTagName ('Thread'))
+  {
+    if ($_->getAttribute ('id') eq $tid)
+    {

       $tnode = $_;
       $tnode = $_;

-      for ($tnode -> getElementsByTagName ('Message')) {
-        if ($_ -> getAttribute ('id') eq $mid) {
+      for ($tnode -> getElementsByTagName ('Message'))
+      {
+        if ($_ -> getAttribute ('id') eq $mid)
+        {

           $mnode = $_;
           $mnode = $_;

-          last;}}
-      last;}}
+          last;
+        }
+      }
+      last;
+    }
+  }

 
 

-  wantarray?($mnode, $tnode):$mnode;
+  wantarray ? ($mnode, $tnode) : $mnode;

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


@@ -242,59 +273,77 @@ sub sort_thread ($$) {
   \@smsg;
 }
 
   \@smsg;
 }
 

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

 #
 #

-# geoeschte Nachrichten
-# herausfiltern
-###########################
-
-sub delete_messages ($) {
+# Filter out deleted messages
+#
+# Params: $smsg  Reference of array of references of hashs
+# Return: -none-
+#
+sub delete_messages ($)
+{

   my $smsg = shift;
 
   my ($z, $oldlevel, @path) = (0,0,0);
 
   my $smsg = shift;
 
   my ($z, $oldlevel, @path) = (0,0,0);
 

-  for (@$smsg) {
-    if ($_ -> {deleted}) {
-      my $n = $_ -> {answers}+1;
-      for (@path) {$smsg -> [$_] -> {answers} -= $n;}
-      splice @$smsg,$z,$n;}
-
-    else {
-      if ($_ -> {level} > $oldlevel) {
+  for (@$smsg)
+  {
+    if ($_ -> {'deleted'})
+    {
+      my $n = $_ -> {'answers'} + 1;
+      $smsg -> [$_] -> {'answers'} -= $n for (@path);
+      splice @$smsg,$z,$n;
+    }
+    else
+    {
+      if ($_ -> {'level'} > $oldlevel)
+      {

         push @path,$z;
         push @path,$z;

-        $oldlevel = $_ -> {level};}
-
-      elsif ($_ -> {level} < $oldlevel) {
-        splice @path,$_ -> {level}-$oldlevel;
-        $oldlevel = $_ -> {level};}
-
-      else { $path[-1] = $z; }
-
-      $z++;}}
+        $oldlevel = $_ -> {'level'};
+      }
+      elsif ($_ -> {'level'} < $oldlevel)
+      {
+        splice @path,$_ -> {'level'} - $oldlevel;
+        $oldlevel = $_ -> {'level'};
+      }
+      else
+      {
+        $path[-1] = $z;
+      }
+
+      $z++;
+    }
+  }

 
   return;
 }
 
 
   return;
 }
 

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

 #
 #

-# Hauptdatei laden und
-# parsen
-###########################
-
-sub get_all_threads ($$;$) {
+# Read and Parse the main file (without any XML-module, they are too slow)
+#
+# Params: $file     /path/to/filename of the main file
+#         $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, $dtd, \@unids)
+#
+sub get_all_threads ($$;$)
+{

   my ($file, $deleted, $sorted) = @_;
   my ($file, $deleted, $sorted) = @_;

-  my ($last_thread, $last_message, @unids, %threads);
-  local *FILE;
+  my ($last_thread, $last_message, $dtd, @unids, %threads);
+  local (*FILE, $/);

 
   open FILE, $file or return undef;
   my $xml = join '', <FILE>;
   close(FILE) or return undef;
 
 
   open FILE, $file or return undef;
   my $xml = join '', <FILE>;
   close(FILE) or return undef;
 

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

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

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

 
   my $reg_msg = qr~(?:</Message>
                      |<Message\s+id="m(\d+)"\s+unid="([^"]*)"(?:\s+invisible="([^"]*)")?(?:\s+archive="([^"]*)")?[^>]*>\s*
 
   my $reg_msg = qr~(?:</Message>
                      |<Message\s+id="m(\d+)"\s+unid="([^"]*)"(?:\s+invisible="([^"]*)")?(?:\s+archive="([^"]*)")?[^>]*>\s*


@@ -305,91 +354,95 @@ sub get_all_threads ($$;$) {
                         <Date\s+longSec="(\d+)"[^>]*>\s*
                       </Header>\s*(?:(<)/Message>|(?=(<)Message\s*)))~sx;
 
                         <Date\s+longSec="(\d+)"[^>]*>\s*
                       </Header>\s*(?:(<)/Message>|(?=(<)Message\s*)))~sx;
 

-  while ($xml =~ /<Thread id="t(\d+)">([^<]*(?:<(?!\/Thread>)[^<]*)*)<\/Thread>/g) {
-
+  while ($xml =~ /<Thread id="t(\d+)">([^<]*(?:<(?!\/Thread>)[^<]*)*)<\/Thread>/g)
+  {

     my ($tid, $thread) = ($1, $2);
     my ($level, $cmno, @msg, @stack) = (0);
 
     my ($tid, $thread) = ($1, $2);
     my ($level, $cmno, @msg, @stack) = (0);
 

-    while ($thread =~ m;$reg_msg;g) {
-
-      if (defined($10)) {
+    while ($thread =~ m;$reg_msg;g)
+    {
+      if (defined($10))
+      {

         push @stack,$cmno if (defined $cmno);
         push @stack,$cmno if (defined $cmno);

-        push @msg, {};
-
-        if (defined $cmno) {
+        push @msg, {mid     => $1,
+                    unid    => $2,
+                    deleted => $3,
+                    archive => $4,
+                    name    => $5,
+                    cat     => $6,
+                    subject => $7,
+                    time    => $8,
+                    level   => $level++,
+                    unids   => [],
+                    kids    => [],
+                    answers => 0};
+
+        if (defined $cmno)
+        {

           push @{$msg[$cmno] -> {kids}}  => $#msg;
           push @{$msg[$cmno] -> {kids}}  => $#msg;

-          push @{$msg[$cmno] -> {unids}} => $2;}
-        else {
-          push @unids => $2;}
+          push @{$msg[$cmno] -> {unids}} => $2;
+        }
+        else
+        {
+          push @unids => $2;
+        }

 
 

-        for (@stack) {$msg[$_] -> {answers}++}
+        $msg[$_] -> {answers}++ for (@stack);

 
         $cmno=$#msg;
 
 
         $cmno=$#msg;
 

-       ($msg[-1] -> {mid},
-        $msg[-1] -> {unid},
-        $msg[-1] -> {name},
-        $msg[-1] -> {cat},
-        $msg[-1] -> {subject},
-        $msg[-1] -> {time})     = ($1, $2, $5, $6, $7, $8);
-
-        $msg[-1] -> {deleted} = $3;
-        $msg[-1] -> {archive} = $4;
-
-        $msg[-1] -> {name} =~ s/&amp;/&/g;
-        $msg[-1] -> {cat} =~ s/&amp;/&/g;
+        $msg[-1] -> {name}    =~ s/&amp;/&/g;
+        $msg[-1] -> {cat}     =~ s/&amp;/&/g;

         $msg[-1] -> {subject} =~ s/&amp;/&/g;
 
         $msg[-1] -> {subject} =~ s/&amp;/&/g;
 

-        $msg[-1] -> {unids} = [];
-        $msg[-1] -> {kids} = [];
-        $msg[-1] -> {answers} = 0;
-        $msg[-1] -> {level} = $level++;}
-
-      elsif (defined ($9)) {
-        push @msg, {};
-
-        if (defined $cmno) {
+      }
+      elsif (defined ($9))
+      {
+        push @msg, {mid     => $1,
+                    unid    => $2,
+                    deleted => $3,
+                    archive => $4,
+                    name    => $5,
+                    cat     => $6,
+                    subject => $7,
+                    time    => $8,
+                    level   => $level,
+                    unids   => [],
+                    kids    => [],
+                    answers => 0};
+
+        if (defined $cmno)
+        {

           push @{$msg[$cmno] -> {kids}}  => $#msg;
           push @{$msg[$cmno] -> {unids}} => $2;
           push @{$msg[$cmno] -> {kids}}  => $#msg;
           push @{$msg[$cmno] -> {unids}} => $2;

-          $msg[$cmno] -> {answers}++;}
-        else {
-          push @unids => $2;}
-
-        for (@stack) {$msg[$_] -> {answers}++}
+          $msg[$cmno] -> {answers}++;
+        }
+        else
+        {
+          push @unids => $2;
+        }

 
 

-       ($msg[-1] -> {mid},
-        $msg[-1] -> {unid},
-        $msg[-1] -> {name},
-        $msg[-1] -> {cat},
-        $msg[-1] -> {subject},
-        $msg[-1] -> {time})     = ($1, $2, $5, $6, $7, $8);
+        $msg[$_] -> {answers}++ for (@stack);

 
 

-        $msg[-1] -> {deleted} = $3;
-        $msg[-1] -> {archive} = $4;
-
-        $msg[-1] -> {name} =~ s/&amp;/&/g;
-        $msg[-1] -> {cat} =~ s/&amp;/&/g;
+        $msg[-1] -> {name}    =~ s/&amp;/&/g;
+        $msg[-1] -> {cat}     =~ s/&amp;/&/g;

         $msg[-1] -> {subject} =~ s/&amp;/&/g;
         $msg[-1] -> {subject} =~ s/&amp;/&/g;

+      }
+      else
+      {
+        $cmno = pop @stack; $level--;
+      }
+    }

 
 

-        $msg[-1] -> {level} = $level;
-        $msg[-1] -> {unids} = [];
-        $msg[-1] -> {kids} = [];
-        $msg[-1] -> {answers} = 0;}
-
-      else {
-        $cmno = pop @stack; $level--;}}
-
-  # ============
-  # Sortieren und bei Bedarf
-  # geloeschte Messages entfernen
-
-    my $smsg = sort_thread (\@msg, $sorted);
-    delete_messages ($smsg) unless ($deleted);
+    my $smsg = sort_thread (\@msg, $sorted);    # sort messages
+    delete_messages ($smsg) unless ($deleted);  # remove invisible messages

 
     $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;

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


@@ -444,21 +497,26 @@ sub create_forum_xml_string ($$) {
   \$xml;
 }
 
   \$xml;
 }
 

-###########################
-# sub save_file
+### save_file () ###############################################################

 #
 #

-# Datei speichern
-###########################
-
-sub save_file ($$) {
-  my ($filename,$content) = @_;
+# Save a file
+#
+# Params: $filename  Filename
+#         $content   File content as scalar reference
+# Return: Status (1 - ok, 0 - error)
+#
+sub save_file ($$)
+{
+  my ($filename, $content) = @_;

   local *FILE;
 
   local *FILE;
 

-  open FILE,">$filename.temp" or return;
+  open FILE, ">$filename.temp" or return;

 
 

-  unless (print FILE $$content) {
+  unless (print FILE $$content)
+  {

     close FILE;
     close FILE;

-    return;};
+    return;
+  }

 
   close FILE or return;
 
 
   close FILE or return;
 


@@ -485,8 +543,8 @@ sub save_file ($$) {
 ###########################
 
 sub hr_time ($) {
 ###########################
 
 sub hr_time ($) {

-  my @month = qw(Januar Februar M\303\244rz April Mail Juni Juli August September Oktober November Dezember);
-                               # ^^^^^^^^ - UTF8 #
+  my @month = (qw(Januar Februar), "M\303\244rz", qw(April Mail Juni Juli August September Oktober November Dezember));
+                                   # ^^^^^^^^ - UTF8 #

 
   my (undef, $min, $hour, $day, $mon, $year) = localtime ($_[0]);
 
 
   my (undef, $min, $hour, $day, $mon, $year) = localtime ($_[0]);
 


@@ -500,8 +558,8 @@ sub short_hr_time ($) {
 }
 
 sub long_hr_time ($) {
 }
 
 sub long_hr_time ($) {

-  my @month = qw(Januar Februar M\303\244rz April Mail Juni Juli August September Oktober November Dezember);
-                               # ^^^^^^^^ - UTF8 #
+  my @month = (qw(Januar Februar), "M\303\244rz", qw(April Mail Juni Juli August September Oktober November Dezember));
+                                   # ^^^^^^^^ - UTF8 #

 
   my @wday  = qw(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag);
   my ($sek, $min, $hour, $day, $mon, $year, $wday) = localtime ($_[0]);
 
   my @wday  = qw(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag);
   my ($sek, $min, $hour, $day, $mon, $year, $wday) = localtime ($_[0]);


@@ -515,7 +573,3 @@ sub long_hr_time ($) {
 
 # making require happy
 1;
 
 # making require happy
 1;

-
-# ====================================================
-# end of Posting::_lib
-# ====================================================
\ No newline at end of file