* Skins: Rename flag to diagnose from debug to verbose

* Remove unused Data::Dumper
* Hide 'select language' if run with --utf8, avoid losing encoding by reconfigure
* UTF8: Add mysql_enable_utf8

14 files changed, 13 insertions, 43 deletions

diff --git a/lib/MediaLibParser.pm b/lib/MediaLibParser.pm
index f78ca6f..a41f6a2 100644
--- a/lib/MediaLibParser.pm
+++ b/lib/MediaLibParser.pm
@@ -4,7 +4,6 @@ use strict;
 

 use LWP::UserAgent;

 use HTML::TreeBuilder;

-use Data::Dumper;

 

 our ( @ISA, @EXPORT, $VERSION );

 @ISA = qw(Exporter);

@@ -307,4 +306,4 @@ sub result_search {
     return ($ret, $resultcount);

 

 }

-1;
\ No newline at end of file
+1;
diff --git a/lib/MediaLibParser/DVDPalace.pm b/lib/MediaLibParser/DVDPalace.pm
index 80ecb65..29bf5e5 100644
--- a/lib/MediaLibParser/DVDPalace.pm
+++ b/lib/MediaLibParser/DVDPalace.pm
@@ -6,7 +6,6 @@ use FindBin qw($RealBin);
 use lib sprintf("%s", $RealBin);

 use lib sprintf("%s/../lib", $RealBin);

 

-use Data::Dumper;

 use MediaLibParser;

 

 our ( @ISA, @EXPORT, $VERSION );

@@ -327,4 +326,4 @@ sub result_search_map {
               };

     return $map;

 }

-1;
\ No newline at end of file
+1;
diff --git a/lib/MediaLibParser/IMDb.pm b/lib/MediaLibParser/IMDb.pm
index fd1e43f..60c02d0 100644
--- a/lib/MediaLibParser/IMDb.pm
+++ b/lib/MediaLibParser/IMDb.pm
@@ -6,7 +6,6 @@ use FindBin qw($RealBin);
 use lib sprintf("%s", $RealBin);

 use lib sprintf("%s/../lib", $RealBin);

 

-use Data::Dumper;

 use MediaLibParser;

 

 our ( @ISA, @EXPORT, $VERSION );

@@ -71,4 +70,4 @@ sub actor_search_map {
         }

               };

 }

-1;
\ No newline at end of file
+1;
diff --git a/lib/Tools.pm b/lib/Tools.pm
index 44823cc..f7d1864 100644
--- a/lib/Tools.pm
+++ b/lib/Tools.pm
@@ -7,7 +7,6 @@ use lib sprintf("%s", $RealBin);
 use lib sprintf("%s/../lib", $RealBin);
 use Locale::gettext qw/!gettext/;
 use utf8;
-#use encoding 'utf8';
 use Encode;
 
 use Data::Dumper;
diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index e9aeff9..ab25359 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -538,14 +538,6 @@ sub _autotimerLookup {
                 }
             }
             if($error) {
-#error('Event : ###############################################################');
-#dumper($event);
-#error('Autotimer : ###########################################################');
-#dumper($a);
-#error('Timer : ###############################################################');
-#my $tdata = getDataByTable('TIMERS');
-#dumper($tdata);
-
                 $console->err(sprintf(gettext("Could not save timer for '%s' : %s"), $event->{file}, $error))
                   if(ref $console && $autotimerid);
             } else {
diff --git a/lib/XXV/MODULES/EPG.pm b/lib/XXV/MODULES/EPG.pm
index 9c3cb71..64f633f 100644
--- a/lib/XXV/MODULES/EPG.pm
+++ b/lib/XXV/MODULES/EPG.pm
@@ -1214,7 +1214,6 @@ ORDER BY
     starttime
 LIMIT 1
 |;
-#dumper($sql);
     my $sth = $obj->{dbh}->prepare($sql);
     $sth->execute($zeit, $channel)
         or return con_err($console, sprintf("Couldn't execute query: %s.",$sth->errstr));
diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm
index 90e26f5..589e6ac 100644
--- a/lib/XXV/MODULES/HTTPD.pm
+++ b/lib/XXV/MODULES/HTTPD.pm
@@ -397,8 +397,6 @@ sub parseRequest {
     			$data->{ContentType} = $1;
     		} elsif($line =~ /Content-Length: (\S+)/i) {
     			$data->{ContentLength} = $1;
-    		} else {
-          #dumper($line);
     		}
         $self->{STATUS}->{'readbytes'} += length($line);
       }
@@ -408,7 +406,6 @@ sub parseRequest {
   if($data->{Method}) {
     if($data->{Method} eq 'GET' 
       or $data->{Method} eq 'HEAD') {
-      #dumper($data);
       return $data;
     } elsif($data->{Method} eq 'POST') {
       if(int($data->{ContentLength})>0) {
@@ -418,7 +415,6 @@ sub parseRequest {
           if($bytes && $data->{ContentLength} == $bytes);
         $self->{STATUS}->{'readbytes'} += $bytes;
       }
-      #dumper($data);
       return $data;
     } else {
       lg sprintf("Unsupported HTTP Method : %s",$data->{Method});
diff --git a/lib/XXV/MODULES/MEDIALIB.pm b/lib/XXV/MODULES/MEDIALIB.pm
index c3c48c0..e38bb6f 100644
--- a/lib/XXV/MODULES/MEDIALIB.pm
+++ b/lib/XXV/MODULES/MEDIALIB.pm
@@ -3,7 +3,6 @@ package XXV::MODULES::MEDIALIB;
 use strict;
 
 use Tools;
-use Data::Dumper;
 use File::Path;
 
 # This module method must exist for XXV
@@ -316,7 +315,6 @@ sub researchMedia {
 
     if(ref $params eq 'HASH') {
         
-        #print Dumper( $params );
         my $medias;
         if ( $params->{source} eq 'dvdpalace' ) {
             
@@ -383,7 +381,6 @@ sub importMedia {
     my $id   = shift || 0;
     my $params  = shift || {};
 
-    #print Dumper($id, $params);
     $id = delete $params->{id} if defined $params->{id};
     my $range = delete $params->{range} if defined $params->{range};
 
@@ -402,7 +399,6 @@ sub importMedia {
         
         $params->{id} = $id;
         
-        #print Dumper('$params', $params);
         if ( $params->{genres} ) {
             my $gen_hash_1 = $obj->_get_videogenres_as_hash;
             my $gen_hash_2 = {
@@ -416,11 +412,8 @@ sub importMedia {
                 
                 # noch mit Genres auffuellen so wie sie auftauchen.
             };
-            #print Dumper('$gen_hash_1', $gen_hash_1);
-            #print Dumper('$gen_hash_2', $gen_hash_2);
             my $ret;
             foreach my $key ( @{$params->{genres}} ) {
-                #print Dumper('$key', $key);
                 if( defined $gen_hash_1->{$key} ) {
                     push (@$ret, $gen_hash_1->{$key}->{id});
                 } elsif ( defined $gen_hash_2->{$key} ) {
@@ -433,7 +426,6 @@ sub importMedia {
                     debug ('Unknown genre: '. $key);
                 }
             }
-            #print Dumper('$ret', $ret);
             $params->{genres} = $ret;
         }
 
@@ -445,7 +437,6 @@ sub importMedia {
     $params->{mediatype} = $obj->{defmediatype} unless defined $params->{mediatype} && $params->{mediatype} != 0;
     $params->{language} = $obj->{deflanguage} unless defined $params->{language} && $params->{language} ne '';
     
-    #print Dumper($params);
     $console->table({},
         {
             %$params,
@@ -465,7 +456,7 @@ sub searchMedia {
     my $console = shift || return error('No console defined!');
     my $id   = shift || 0;
     my $params  = shift || {};
-    #print Dumper($params);
+
     my $erg = [];
     my $setcount;
 
@@ -552,7 +543,7 @@ sub editMedia {
     my $console = shift || return error('No console defined!');
     my $id   = shift || 0;
     my $params  = shift || {};
-    #print Dumper($params);
+
     my $range = delete $params->{range} if defined $params->{range};
     if ( $id ) {
         my $sql = qq|
@@ -580,7 +571,6 @@ WHERE
     $params->{mediatype} = $obj->{defmediatype} unless defined $params->{mediatype} && $params->{mediatype} != 0;
     $params->{language} = $obj->{deflanguage} unless defined $params->{language} && $params->{language} ne '';
     
-    #print Dumper($params);
     $console->table({},
         {
             %$params,
@@ -792,7 +782,6 @@ sub _saveActors {
     
     $input =~ s/\r\n/\n/g;
     my @actors = split /\n/, $input;
-    #print Dumper( $input, @actors );
 
     my $rob = main::getModule('ROBOT')
         or return error('No ROBOT Module installed!');
@@ -854,7 +843,6 @@ sub _saveGenres {
     my $obj = shift || return error('No object defined!');
     my $videoid = shift || 0;
     my $genres = shift || [];
-    #print Dumper( $videoid,$genres);
     
     my $sql = sprintf("REPLACE INTO MEDIALIB_VIDEOGENRE (%s) VALUES (%s)",
             'video_id, genre_id',
@@ -927,7 +915,7 @@ WHERE
     $sth->execute(@actors)
         or return undef;
     my $erg = $sth->fetchall_hashref('name');
-    #print Dumper( $sql, $erg );
+
     foreach my $actor ( split /\n/, $input ) {
         if ( not defined $erg->{uc($actor)} ) {
             $erg->{$actor} = {
@@ -946,7 +934,6 @@ WHERE
         }
     }
     
-    #print Dumper($erg, $ret);
     return $ret;
 }
 
diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm
index e9bff44..807e298 100644
--- a/lib/XXV/MODULES/MUSIC.pm
+++ b/lib/XXV/MODULES/MUSIC.pm
@@ -768,7 +768,6 @@ sub insert {
 
     # MD5(File) as ID
     my $sql = sprintf('INSERT INTO MUSIC SET %s', join(', ', @setdata));
-    # dumper($sql);
     $obj->{dbh}->do( $sql );
     return 1;
 }
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index 8c65d42..f573675 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -1864,7 +1864,7 @@ sub delete {
           }else {
             con_msg($console,$msg);
           }
-#dumper($md5delete);
+
           my $dsql = sprintf("DELETE FROM RECORDS WHERE RecordMD5 IN (%s)", join(',' => ('?') x @{$md5delete})); 
           my $dsth = $obj->{dbh}->prepare($dsql);
             $sth->execute(@{$md5delete})
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index 9162f26..a928013 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -698,7 +698,7 @@ WHERE
                 }
                 return $value;
             },
-            msg     => gettext("Enter a day (1 to 31) or weekday in format 'MTWTFSS'."),
+            msg     => gettext("Enter a day or weekday in format 'MTWTFSS'."),
             req     => gettext("This is required!"),
             check   => sub{
                 my $value = shift || return;
diff --git a/lib/XXV/MODULES/XMLTV.pm b/lib/XXV/MODULES/XMLTV.pm
index 744ccab..63b43a4 100644
--- a/lib/XXV/MODULES/XMLTV.pm
+++ b/lib/XXV/MODULES/XMLTV.pm
@@ -344,7 +344,6 @@ sub _ProcessXML {
 
   my $xdata = $self->{xml}->XMLin($text);
   # Ausgabe
-#  dumper($xdata); 
 
   return error "Missing channel" unless $xdata->{channel};
   return error "Missing program data" unless $xdata->{programme};
@@ -354,7 +353,6 @@ sub _ProcessXML {
 
   # Find XML events
   foreach my $xml (@{$xdata->{programme}})   {
-#  dumper($xml); 
 #    {
 #      'stop' => '20080317200000 +0100',
 #      'desc' => {
diff --git a/lib/XXV/OUTPUT/Ajax.pm b/lib/XXV/OUTPUT/Ajax.pm
index 1c4d012..1cc97e4 100644
--- a/lib/XXV/OUTPUT/Ajax.pm
+++ b/lib/XXV/OUTPUT/Ajax.pm
@@ -72,6 +72,9 @@ sub new {
     $self->{outtype} = $attr{'-output'}
         || return error('No output type given!');
 
+    $self->{debug} = $attr{'-debug'}
+        || 0;
+
     $self->{charset} = $attr{'-charset'}
         || 'ISO-8859-15';
 
@@ -121,7 +124,6 @@ sub out {
 	    $self->{output}->{data} = $self->_prepare($data);
 	    $self->{output}->{param} = $self->_prepare($para)
 	        if($para);
-#dumper($self->{output});
 		} else {
 	    $self->{output}->{DATA} = $self->_prepare($data);;
 	    $self->{output}->{$name}->{data} = $self->_prepare($data);
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm
index f7e0656..bab6f6a 100644
--- a/lib/XXV/OUTPUT/Html.pm
+++ b/lib/XXV/OUTPUT/Html.pm
@@ -190,7 +190,8 @@ sub parseTemplateFile {
         info    => $self->browser,
         param   => $params,
         pid     => $$,
-        debug   => $self->{debug},
+        debug   => 0, # Avoid losing encoding like utf8
+        verbose => $self->{debug},
         user    => $user,
         charset => $self->{charset},
         # query the current locale