X-Git-Url: https://git.p6c8.net/selfforum.git/blobdiff_plain/ba659b53059e637777865e646f0f2a6fb7f2988e..75f82718d85387517290bb1a5918980aa656bb1f:/selfforum-cgi/shared/Conf/Admin.pm?ds=sidebyside

diff --git a/selfforum-cgi/shared/Conf/Admin.pm b/selfforum-cgi/shared/Conf/Admin.pm
index cf4fa13..09bb103 100644
--- a/selfforum-cgi/shared/Conf/Admin.pm
+++ b/selfforum-cgi/shared/Conf/Admin.pm
@@ -2,7 +2,7 @@
 
 # ====================================================
 # Autor: n.d.p. / 2001-01-05
-# lm   : n.d.p. / 2001-02-02
+# lm   : n.d.p. / 2001-02-25
 # ====================================================
 # Funktion:
 #      Einlesen der Admindefaultkonfiguration
@@ -12,7 +12,7 @@ use strict;
 
 package Conf::Admin;
 
-use vars qw(@ISA @EXPORT);
+use vars qw(@EXPORT);
 
 use Lock qw(:READ);
 
@@ -22,8 +22,7 @@ use XML::DOM;
 # Funktionsexport
 # ====================================================
 
-require Exporter;
-@ISA    = qw(Exporter);
+use base qw(Exporter);
 @EXPORT = qw(read_admin_conf);
 
 ################################
@@ -61,8 +60,8 @@ sub read_admin_conf ($) {
                       countMessages => $thread_view -> getAttribute ('countMessages'),
                       sortThreads   => $thread_view -> getAttribute ('sortThreads'),
                       sortMessages  => $thread_view -> getAttribute ('sortMessages'),
-                      showThread    => (($how_name eq 'showAll')?undef:
-                                       (($how_name eq 'showNone')?1:
+                      showThread    => (($how_name eq 'ShowAll')?undef:
+                                       (($how_name eq 'ShowNone')?1:
                                        ($show_how -> getFirstChild -> getData))),
                       showPreview   => $message_view -> getAttribute ('previewON'),
                       showNA        => $flags -> getAttribute ('showNA'),
@@ -70,6 +69,12 @@ sub read_admin_conf ($) {
                       quoting       => $quoting -> getAttribute ('quotingON'),
                       quoteChars    => $char?$char -> getFirstChild -> getData:undef};
 
+      my $voting = $forum -> getElementsByTagName ('Voting', 0) -> item (0);
+      $conf {Voting} = {
+        voteLock => $voting -> getAttribute ('voteLock'),
+        Limit    => $voting -> getAttribute ('Limit')
+      };
+
       # Severance
       $conf {Severance} = &get_severance ($forum -> getElementsByTagName ('Severance', 0) -> item (0));
 
@@ -84,9 +89,9 @@ sub read_admin_conf ($) {
                            voting     => $messaging -> getAttribute ('callAdminVoting'),
                            archiving  => $messaging -> getAttribute ('callAdminArchiving'),
                            byUser     => $messaging -> getAttribute ('callUserAnswer'),
-                           callByName => [map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('Name', 0)],
-                           callByMail => [map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('Email', 0)],
-                           callByIP   => [map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('IpAddress', 0)]};
+                           callByName => [$call_by_user?map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('Name', 0):()],
+                           callByMail => [$call_by_user?map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('Email', 0):()],
+                           callByIP   => [$call_by_user?map {$_ -> getFirstChild -> getData} $call_by_user -> getElementsByTagName ('IpAddress', 0):()]};
 
       # Instant
       my $instant    = $forum   -> getElementsByTagName ('InstantJob', 0) -> item (0);