* Fix typo

* NEWS: Reformated output on edited timers

4 files changed, 35 insertions, 25 deletions

diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index 349b7b2..38d4e38 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -136,11 +136,12 @@ sub module {
                             my $autotimer = getDataById($timer->{AutotimerId}, 'AUTOTIMER', 'Id');
                             my $title = sprintf(gettext("Autotimer('%s') found: %s"),
                                                     $autotimer->{Search}, $timer->{File});
-                            my $description = sprintf(gettext("On: %s to %s\nDescription: %s"),
+                            my $description = sprintf(gettext("On: %s to %s"),
                                 $timer->{NextStartTime},
-                                fmttime($timer->{Stop}),
-                                $desc && $desc->{description} ? $desc->{description} : ''
-                                );
+                                fmttime($timer->{Stop}));
+                            $description .= "\r\n";
+                            $description .= sprintf(gettext("Description: %s"), $desc->{description} )
+                              if($desc && $desc->{description});
 
                             main::getModule('REPORT')->news($title, $description, "display", $timer->{eventid}, "interesting");
                         }
diff --git a/lib/XXV/MODULES/REPORT.pm b/lib/XXV/MODULES/REPORT.pm
index d1cc0ec..3c0030e 100644
--- a/lib/XXV/MODULES/REPORT.pm
+++ b/lib/XXV/MODULES/REPORT.pm
@@ -245,7 +245,7 @@ sub request {
     # cmd=request&data=rss&ver=2 or
     # cmd=request&data=mail
     # ...
-    my $typ = shift || return error ('No Typ!' );
+    my $typ = shift || return $console->err(gettext("Sorry, but none type requested!"));
     my $params = shift || {};
 
     my ($mod) = grep(/${typ}$/i, keys %{$obj->{NEWSMODS}});
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index a927830..5c9275e 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -152,11 +152,12 @@ sub module {
                             return if($timer->{AutotimerId});
                             my $desc = getDataById($timer->{eventid}, 'EPG', 'eventid') if($timer->{eventid});
                             my $title = sprintf(gettext("New timer found: %s"),$timer->{File});
-                            my $description = sprintf(gettext("On: %s to %s\nDescription: %s"),
+                            my $description = sprintf(gettext("On: %s to %s"),
                                 $timer->{NextStartTime},
-                                fmttime($timer->{Stop}),
-                                $desc && $desc->{description} ? $desc->{description} : ''
-                                );
+                                fmttime($timer->{Stop}));
+                            $description .= "\r\n";
+                            $description .= sprintf(gettext("Description: %s"), $desc->{description} )
+                              if($desc && $desc->{description});
 
                             main::getModule('REPORT')->news($title, $description, "display", $timer->{eventid}, $event->{Level});
                         }
@@ -195,11 +196,12 @@ sub module {
                             my $timer  = getDataById($args->{TimerId}, 'TIMERS', 'Id');
                             my $title = sprintf(gettext("Timer deleted: %s"),$timer->{File});
                             my $desc = getDataById($timer->{eventid}, 'EPG', 'eventid') if($timer->{eventid});
-                            my $description = sprintf(gettext("On: %s to %s\nDescription: %s"),
+                            my $description = sprintf(gettext("On: %s to %s"),
                                 $timer->{NextStartTime},
-                                fmttime($timer->{Stop}),
-                                $desc && $desc->{description} ? $desc->{description} : ''
-                                );
+                                fmttime($timer->{Stop}));
+                            $description .= "\r\n";
+                            $description .= sprintf(gettext("Description: %s"), $desc->{description} )
+                              if($desc && $desc->{description});
 
                             main::getModule('REPORT')->news($title, $description, "display", $timer->{eventid}, $event->{Level});
                         }
@@ -225,18 +227,25 @@ sub module {
                 },
                 Match => {
                     TimerId => qr/modt\s+(\d+)\s(on|off)/s,
-                    Type    => qr/modt\s+\d+\s+(on|off)/s,
+                    #Type    => qr/modt\s+\d+\s+(on|off)/s,
                 },
                 Actions => [
                     q|sub{  my $args = shift;
                             my $event = shift;
                             my $timer  = getDataById($args->{TimerId}, 'TIMERS', 'Id');
-                            my $title = sprintf(gettext("Timer toggled: %s to %s"),$timer->{File},$args->{Type});
-                            my $description = sprintf(gettext("Description: %s\nOn: %s to %s"),
-                                $timer->{Summary},
+                            my $title;
+                            if($timer->{Status} & 1) {
+                              $title = sprintf(gettext("Timer activated: %s"),$timer->{File});
+                            } else {
+                              $title = sprintf(gettext("Timer deactivated: %s"),$timer->{File});
+                            }
+                            my $desc = getDataById($timer->{eventid}, 'EPG', 'eventid') if($timer->{eventid});
+                            my $description = sprintf(gettext("On: %s to %s"),
                                 $timer->{NextStartTime},
-                                fmttime($timer->{Stop})
-                                );
+                                fmttime($timer->{Stop}));
+                            $description .= "\r\n";
+                            $description .= sprintf(gettext("Description: %s"), $desc->{description} )
+                              if($desc && $desc->{description});
 
                             main::getModule('REPORT')->news($title, $description, "display", $timer->{eventid}, $event->{Level});
                         }
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm
index c10322c..c0e1053 100644
--- a/lib/XXV/OUTPUT/Html.pm
+++ b/lib/XXV/OUTPUT/Html.pm
@@ -72,10 +72,10 @@ sub new {
         || return error('No handle defined!');
 
     $self->{paths} = $attr{'-paths'}
-        || return error('No Paths defined!');
+        || return error('No paths defined!');
 
     $self->{dbh} = $attr{'-dbh'}
-        || return error('No DBH defined!');
+        || return error('No dbh defined!');
 
     $self->{htmdir} = $attr{'-htmdir'}
         || return error('No htmdir given!');
@@ -84,16 +84,16 @@ sub new {
         || return error('No htmdef given!');
 
     $self->{cgi} = $attr{'-cgi'}
-        || return error('No TemplateDir given!');
+        || return error('No cgi given!');
 
     $self->{mime} = $attr{'-mime'}
-        || return error('No Mimehash given!');
+        || return error('No mime given!');
 
     $self->{browser} = $attr{'-browser'}
-        || return error('No Mimehash given!');
+        || return error('No browser given!');
 
     $self->{start} = $attr{'-start'}
-        || return error('No StartPage given!');
+        || return error('No start page given!');
 
     $self->{debug} = $attr{'-debug'}
         || 0;