From 06ca688c86ff96d96fd4346f7f20efb60ab769cc Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 2 Dec 2007 07:02:43 +0000
Subject: * Fix: display 'panic' message * Fix: Warn if requested modul is'nt
 loaded * HTTPD: Show 'Internal Server Error' if requested modul is'nt loaded

---
 bin/xxvd | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/xxvd b/bin/xxvd
index 87291c6..15b84b8 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -280,11 +280,13 @@ sub init {
         # make an object for the module
 	    eval "use $moduleName";
         error $@ if $@;
-        $MODULES->{$moduleName} = $moduleName->new(
+        my $modul = $moduleName->new(
             -config => $Config,
             -dbh    => $DBH,
             -paths  => $PATHS,
         );
+
+        $MODULES->{$moduleName} = $modul if(ref $modul);
         debug sprintf("Load modul %s(%s)",
             $moduleName,
             (ref $MODULES->{$moduleName})
@@ -422,7 +424,9 @@ sub getModule {
     my $name = shift || return error('No requested modul defined!');
 
     my ($modname) = grep(/${name}$/, keys %$MODULES);
-    unless ($modname && $MODULES->{$modname}) {
+    unless ($modname 
+         && $MODULES->{$modname} 
+         && ref $MODULES->{$modname}) {
       panic sprintf("Requested modul '%s' is'nt loaded!",$name);
       return undef;
     }
-- 
cgit v1.2.3