From 0a0d50f174caf486dbb416ca87c4daabec48f594 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 5 Nov 2007 14:44:56 +0000
Subject: * Warn if none usable modules found * Fix: Use of uninitialized value
 in sprintf at AUTOTIMER.pm line 1316.

---
 bin/xxvd                     | 10 +++++++++-
 lib/XXV/MODULES/AUTOTIMER.pm |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bin/xxvd b/bin/xxvd
index 65781af..b1ff9bc 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -272,6 +272,9 @@ sub init {
 # ------------------
     my $modules = shift || return error('No modul path defined!');
     my @mods = glob($modules.'/*.pm');
+    unless(scalar @mods) {
+      panic(sprintf("None usable modules found at '%s'",$modules));
+    }
 
     foreach my $module (reverse @mods) {
         my $moduleName = 'XXV::MODULES::'.(split('\.',(split('/', $module))[-1]))[0];
@@ -420,9 +423,13 @@ sub getModules {
 # ------------------
 sub getModule {
 # ------------------
-    my $name = shift || return error('No database parameter defined!');
+    my $name = shift || return error('No requested modul defined!');
 
     my ($modname) = grep(/${name}$/, keys %$MODULES);
+    unless ($modname) {
+      error(sprintf "Requested modul '%s' is'nt loaded!",$name);
+      return undef;
+    }
 
     return $MODULES->{$modname};
 }
@@ -525,6 +532,7 @@ sub docu {
     my $name  = shift || 0;
 
     my $HTTPD = getModule("HTTPD");
+    return unless($HTTPD);
     my $htmlRootDir = sprintf('%s/%s', $HTTPD->{paths}->{HTMLDIR}, $HTTPD->{HtmlRoot});
 
     # create Template object
diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index d0eb276..edeec62 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -1313,7 +1313,11 @@ sub _placeholder {
                 $title =~ s/%([\w_-]+)%/$at_details{lc($1)}/sieg;
 				$file = $title;
         } else { # Classic mode DIR~TITLE~SUBTILE
-			$file = sprintf('%s~%s~%s', $at->{Dir}, $data->{Title},$data->{Subtitle});
+          if($data->{Subtitle}) {
+            $file = sprintf('%s~%s~%s', $at->{Dir}, $data->{Title},$data->{Subtitle});
+          } else {
+            $file = sprintf('%s~%s', $at->{Dir}, $data->{Title});
+          }
         }
 	  } elsif($data->{Subtitle}) {
 		  $file = sprintf('%s~%s', $data->{Title},$data->{Subtitle});
-- 
cgit v1.2.3