X-Git-Url: https://git.p6c8.net/selfforum.git/blobdiff_plain/f247cc770243a474bbba7845094047e0995b9746..f69abb46fffae25b517a067d1afc532c67fd9ca3:/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 0a50ee8..0c3a469 100644 --- a/selfforum-cgi/shared/Conf/Admin.pm +++ b/selfforum-cgi/shared/Conf/Admin.pm @@ -60,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'), @@ -83,9 +83,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);