From 212e46c98d5ec2e0b996bfbbab5a7c8a6134b287 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 11 Nov 2007 09:16:35 +0000
Subject: * MUSIC: Fix some warning * MUSIC: Use same log format as HTTPD *
 MEDIALIB: Fix can't save media

---
 html/mledit.tmpl         |  7 +++----
 lib/XXV/MODULES/MUSIC.pm | 40 +++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/html/mledit.tmpl b/html/mledit.tmpl
index 4108a04..4bb039e 100644
--- a/html/mledit.tmpl
+++ b/html/mledit.tmpl
@@ -14,8 +14,7 @@
         nav_ranges = 1
 %?>
 
-<form name='library'>
-<input type="hidden" name="cmd" value="mlresearch"/>
+<form method="post" action="?cmd=mlsave" name="library">
 <input type="hidden" name="data" value="<?% IF data.id %?><?% data.id %?><?% ELSE %?><?% param.id %?><?% END %?>" />
 <input type="hidden" name="__range" value="<?% param.range %?>" />
 <table border="100%">
@@ -25,7 +24,7 @@
         </td>
         <td colspan="3">
             <input type="text" name="__title" id="title" value="<?% data.title || param.title %?>" size="50" maxlength="255" />
-            &nbsp;<input type="submit" name="__search" value="<?% gettext('Search at') %?>"  onfocus="document.library.cmd.value='mlresearch'" onblur="document.library.cmd.value='mlsave'" />&nbsp;&nbsp;
+            &nbsp;<input type="submit" name="__search" value="<?% gettext('Search at') %?>"  onfocus="document.library.action='?cmd=mlresearch'" onblur="document.library.action='?cmd=mlsave'" />&nbsp;&nbsp;
             <input type="radio" name="__source" value="dvdpalace" checked>&nbsp;
             <a href="http://www.dvd-palace.de" target="_blank">DVD-Palace (DE)</a>
             <!--<img width="100" height="28" src="images/dvdpalace.gif" border="0" alt="www.dvd-palace.de"/ align="bottom">-->
@@ -199,7 +198,7 @@
     </tr>
     <tr>
         <td colspan="4">
-            <input type='submit' name="__save" value='<?% gettext('Save') %?>' onfocus="document.library.cmd.value='mlsave'" onblur="document.library.cmd.value='mlresearch'"/>&nbsp;
+            <input type='submit' name="__save" value='<?% gettext('Save') %?>' onfocus="document.library.action='?cmd=mlsave'" onblur="document.library.action='?cmd=mlresearch'"/>&nbsp;
         </td>
     </tr>
 </table>
diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm
index 13906af..398ed12 100644
--- a/lib/XXV/MODULES/MUSIC.pm
+++ b/lib/XXV/MODULES/MUSIC.pm
@@ -279,10 +279,10 @@ sub _init {
         },
     );
 
-    # Look for table or create this table
-    my $version = main::getVersion;
-
     unless($obj->{mdbh}) {
+        # Look for table or create this table
+        my $version = main::getVersion;
+
         # don't remove old table, if updated rows => warn only
         tableUpdated($obj->{dbh},'MUSIC',12,0);
 
@@ -772,8 +772,7 @@ sub stream {
             $file = $obj->{path} . "/" . $file
                 if($obj->{mdbh});
 
-            debug sprintf('Stream file "%s" to client: %s',
-                $file,$client);
+            debug sprintf('Stream file "%s"',$file);
             my $erg = $obj->{ICE}->stream($file,0,$client)
                 || last;
         }
@@ -809,24 +808,23 @@ sub parseRequest {
     		}
     	}
 
-lg sprintf(qq|
------------------------------------------
-New Request from User: %s at Host: %s!
-Query: %s
------------------------------------------
-|, $data->{username}, $data->{HOST}, $data->{Query});
+    # Log like Apache Format ip, resolved hostname, user, method request, status, bytes, referer, useragent
+    lg sprintf('%s - %s "%s %s%s" %s %s "%s" "%s"',
+          getip($hdl),
+          $data->{username} ? $data->{username} : "-",
+          "GET", #$data->{Method},
+          $data->{Request} ? $data->{Request} : "",
+          $data->{Query} ? "?" . $data->{Query} : "",
+          "-", #$console->{'header'},
+          "-", #$console->{'sendbytes'},
+          $data->{Referer} ? $data->{Referer} : "-",
+          "-" #$data->{http_useragent} ? $data->{http_useragent} : ""
+        );
 
-        return $data;
+    return $data;
 	} else {
-
-error sprintf(qq|
------------------------------------------
-Unknown Request :
-%s
------------------------------------------
-|, join("\n", @$Req));
-
-		return;
+    error sprintf(" Unknown Request : %s", join("\n", @$Req));
+    return undef;
 	}
 }
 
-- 
cgit v1.2.3