[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-560-g08814bc

[GetAway]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  08814bc329f1b8c2ac5264aaec7cfe55df57b13c (commit)
      from  5a34ea4859dd2b93f8923b2c62ce0ccb4cc4e4f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08814bc329f1b8c2ac5264aaec7cfe55df57b13c
Author: GetAway <get-a...@t-online.de>
Date:   Sun May 17 17:24:44 2015 +0200

    reverse: add new line and line feed to xml
    
    currently makes no sense and
    break down reading of saved EPG data
    
    Signed-off-by: GetAway <get-a...@t-online.de>

diff --git a/dvb/zapit/lib/zapittools.cpp b/dvb/zapit/lib/zapittools.cpp
index 6d17be5..1c1ce51 100644
--- a/dvb/zapit/lib/zapittools.cpp
+++ b/dvb/zapit/lib/zapittools.cpp
@@ -94,13 +94,6 @@ namespace ZapitTools {
                        case '\'':
                                r += "&apos;";
                                break;
-                       case 0x0a:
-                               r +="&#x0a;";
-                               break;
-                       case 0x0d:
-                               r +="&#x0d;";
-                               break;
-
                        default:
                                r += *s;
                        }
diff --git a/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp 
b/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
index 332bf4b..a47ec0d 100644
--- a/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/SIutils.cpp
@@ -162,7 +162,7 @@ time_t changeUTCtoCtime(const unsigned char *buffer, int 
local_time)
 }
 
 // Thanks to tmbinc
-int saveStringToXMLfile(FILE *out, const char *c /*, int withControlCodes*/)
+int saveStringToXMLfile(FILE *out, const char *c, int withControlCodes)
 {
   if(!c)
     return 1;
@@ -178,28 +178,15 @@ int saveStringToXMLfile(FILE *out, const char *c /*, int 
withControlCodes*/)
 */
   for(;*c; c++) {
     switch ((unsigned char)*c) {
-               case '<':
-                       fprintf(out, "&lt;");
-                       break;
-               case '>':
-                       fprintf(out, "&gt;");
-                       break;
-               case '&':
-                       fprintf(out, "&amp;");
-                       break;
-               case '\"':
-                       fprintf(out, "&quot;");
-                       break;
-               case '\'':
-                       fprintf(out, "&apos;");
-                       break;
-               case 0x0a:
-                       fprintf(out,"&#x0a;");
-                       break;
-               case 0x0d:
-                       fprintf(out,"&#x0d;");
-                       break;
-#if 0
+      case '&':
+        fprintf(out, "&amp;");
+        break;
+      case '<':
+        fprintf(out, "&lt;");
+        break;
+      case '\"':
+        fprintf(out, "&quot;");
+       break;
       case 0x81:
       case 0x82:
         break;
@@ -222,12 +209,6 @@ int saveStringToXMLfile(FILE *out, const char *c /*, int 
withControlCodes*/)
           fprintf(out, "%c", *c);
         else
           fprintf(out, "&#%d;", *c);
-#else
-               default:
-                       if ((unsigned char)*c<32)
-                               break;
-                       fprintf(out, "%c", *c);
-#endif
      } // case
 
   } // for
diff --git a/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp 
b/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
index f1976b0..4dc269e 100644
--- a/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
+++ b/tuxbox/neutrino/daemons/sectionsd/SIutils.hpp
@@ -29,7 +29,7 @@ time_t changeUTCtoCtime(const unsigned char *buffer, int 
local_time=1);
 // returns the descriptor type as readable text
 const char *decode_descr (unsigned char tag_value);
 
-int saveStringToXMLfile(FILE *out, const char *string /*, int 
withControlCodes=0*/);
+int saveStringToXMLfile(FILE *out, const char *string, int withControlCodes=0);
 
 // Entfernt die ControlCodes aus dem String (-> String wird evtl. kuerzer)
 void removeControlCodes(char *string);
diff --git a/tuxbox/neutrino/src/gui/movieinfo.cpp 
b/tuxbox/neutrino/src/gui/movieinfo.cpp
index e7410ed..c7c20b7 100644
--- a/tuxbox/neutrino/src/gui/movieinfo.cpp
+++ b/tuxbox/neutrino/src/gui/movieinfo.cpp
@@ -725,8 +725,6 @@ std::string decodeXmlSpecialChars(std::string s)
        StrSearchReplace(s,"&amp;","&");
        StrSearchReplace(s,"&quot;","\"");
        StrSearchReplace(s,"&apos;","\'");
-       StrSearchReplace(s,"&#x0a;","\n");
-       StrSearchReplace(s,"&#x0d;","\n");
        return s;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 dvb/zapit/lib/zapittools.cpp                  |    7 ----
 tuxbox/neutrino/daemons/sectionsd/SIutils.cpp |   39 ++++++------------------
 tuxbox/neutrino/daemons/sectionsd/SIutils.hpp |    2 +-
 tuxbox/neutrino/src/gui/movieinfo.cpp         |    2 -
 4 files changed, 11 insertions(+), 39 deletions(-)


-- 
Tuxbox-GIT: apps

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits