7 files changed, 23 insertions, 15 deletions
diff --git a/cmps/serverlib/src/AbstractMediaRequestHandler.cc b/cmps/serverlib/src/AbstractMediaRequestHandler.cc
index b65ad13..ad845b6 100644
--- a/cmps/serverlib/src/AbstractMediaRequestHandler.cc
+++ b/cmps/serverlib/src/AbstractMediaRequestHandler.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      AbstractMediaRequestHandler.cc
- * Created:   5. Juli 2012, 07:58
+ * Created:   5. Juli 2012, 07
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/serverlib/src/CommandHandler.cc b/cmps/serverlib/src/CommandHandler.cc
index b1a17b8..5449d25 100644
--- a/cmps/serverlib/src/CommandHandler.cc
+++ b/cmps/serverlib/src/CommandHandler.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      CommandHandler.cc
- * Created:   5. Juli 2012, 16:06
+ * Created:   5. Juli 2012, 16
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/serverlib/src/HTMLListAssembler.cc b/cmps/serverlib/src/HTMLListAssembler.cc
index 8ef3261..c455fc1 100644
--- a/cmps/serverlib/src/HTMLListAssembler.cc
+++ b/cmps/serverlib/src/HTMLListAssembler.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      HTMLListAssembler.cc
- * Created:   6. Juli 2012, 09:55
+ * Created:   6. Juli 2012, 09
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
@@ -25,6 +25,7 @@
 #include <HTMLListAssembler.h>
 #include <AbstractMedia.h>
 #include <StringBuilder.h>
+#include <Url.h>
 #include <tools.h>
 
 cHTMLListAssembler::cHTMLListAssembler()
@@ -97,11 +98,14 @@ cStringBuilder &cHTMLListAssembler::genDelim(cStringBuilder &sb)
 cStringBuilder &cHTMLListAssembler::genMediaLink(cStringBuilder &sb, void *Element, bool odd)
 {
   cAbstractMedia *m = (cAbstractMedia *)Element;
+  cUrl *uri = new cUrl(m->LogicalPath());
+  char *lp = uri->ToString();
 
   sb.Append("<a class=\"");
   sb.Append(odd ? "odd" : "even");
   sb.Append("\" href=\"");
-  sb.Append(m->LogicalPath());
+  sb.Append(lp);
+  free(lp);
   sb.Append("\">");
   switch (m->MediaType()) {
     case cAbstractMedia::Audio:              sb.Append("[A] "); break;
diff --git a/cmps/serverlib/src/HTTPMediaResponse.cc b/cmps/serverlib/src/HTTPMediaResponse.cc
index 667d114..ca08576 100644
--- a/cmps/serverlib/src/HTTPMediaResponse.cc
+++ b/cmps/serverlib/src/HTTPMediaResponse.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      HTTPMediaResponse.cc
- * Created:   6. Juli 2012, 07:44
+ * Created:   6. Juli 2012, 07
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/serverlib/src/JSonListAssembler.cc b/cmps/serverlib/src/JSonListAssembler.cc
index 8660953..f49b8ec 100644
--- a/cmps/serverlib/src/JSonListAssembler.cc
+++ b/cmps/serverlib/src/JSonListAssembler.cc
@@ -1,30 +1,31 @@
 /**
  * ======================== legal notice ======================
- *
+ * 
  * File:      JSonListAssembler.cc
- * Created:   6. Juli 2012, 09:53
+ * Created:   6. Juli 2012, 09
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
- *
+ * 
  * CMP - compound media player
- *
+ * 
  * is a client/server mediaplayer intended to play any media from any workstation
  * without the need to export or mount shares. cmps is an easy to use backend
  * with a (ready to use) HTML-interface. Additionally the backend supports
  * authentication via HTTP-digest authorization.
  * cmpc is a client with vdr-like osd-menues.
- *
+ * 
  * Copyright (c) 2012 Reinhard Mantey, some rights reserved!
  * published under Creative Commons by-sa
  * For details see http://creativecommons.org/licenses/by-sa/3.0/
- *
+ * 
  * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp
- *
+ * 
  * --------------------------------------------------------------
  */
 #include <JSonListAssembler.h>
 #include <AbstractMedia.h>
 #include <JSonWriter.h>
+#include <Url.h>
 
 cJSonListAssembler::cJSonListAssembler()
 {
@@ -57,11 +58,14 @@ bool cJSonListAssembler::OpenList(cStringBuilder &sb, std::map<int, size_t> &Cat
 bool cJSonListAssembler::AddElement(cStringBuilder &sb, void *ListElement, bool odd)
 {
   cAbstractMedia *m = (cAbstractMedia *)ListElement;
+  cUrl *uri = new cUrl(m->LogicalPath());
+  char *lp = uri->ToString();
 
   writer->Object();
   writer->Key("name").Value(m->Name());
   writer->Key("type").Value(m->MediaType());
-  writer->Key("path").Value(m->LogicalPath());
+  writer->Key("path").Value(lp);
+  free(lp);
   writer->EndObject();
 
   return true;
diff --git a/cmps/serverlib/src/MediaFileHandler.cc b/cmps/serverlib/src/MediaFileHandler.cc
index d16a033..b2e97a3 100644
--- a/cmps/serverlib/src/MediaFileHandler.cc
+++ b/cmps/serverlib/src/MediaFileHandler.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      MediaFileHandler.cc
- * Created:   5. Juli 2012, 08:06
+ * Created:   5. Juli 2012, 08
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/serverlib/src/MediaListHandler.cc b/cmps/serverlib/src/MediaListHandler.cc
index 029c137..cdb2b21 100644
--- a/cmps/serverlib/src/MediaListHandler.cc
+++ b/cmps/serverlib/src/MediaListHandler.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      MediaListHandler.cc
- * Created:   5. Juli 2012, 08:06
+ * Created:   5. Juli 2012, 08
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  *