summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2007-12-02 07:02:43 +0000
committerAndreas Brachold <vdr07@deltab.de>2007-12-02 07:02:43 +0000
commit06ca688c86ff96d96fd4346f7f20efb60ab769cc (patch)
tree29dd440524c05f2d75faf9fea79bb430ca8f1f18 /bin
parent1fa6b8846c9dee8bf249bcb12f425d4c712a412f (diff)
downloadxxv-06ca688c86ff96d96fd4346f7f20efb60ab769cc.tar.gz
xxv-06ca688c86ff96d96fd4346f7f20efb60ab769cc.tar.bz2
* Fix: display 'panic' message
* Fix: Warn if requested modul is'nt loaded * HTTPD: Show 'Internal Server Error' if requested modul is'nt loaded
Diffstat (limited to 'bin')
-rwxr-xr-xbin/xxvd8
1 files changed, 6 insertions, 2 deletions
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;
}