x2goclient.git - master (branch) updated: 3.99.3.0-15-g202c409 - x2go-commits

12 Dec 2012

The branch, master has been updated
       via  202c4095c392d0c6c5bfaf8eb96d43d3229ce156 (commit)
      from  23fbfaff062912fa4f5d42c6fac8e2f6f48ede6a (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 202c4095c392d0c6c5bfaf8eb96d43d3229ce156
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Dec 12 12:44:26 2012 +0100

    Get rid of br html tags in client<->broker communication (closes upstream issue #81).

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

Summary of changes:
 debian/changelog     |    2 ++
 httpbrokerclient.cpp |   17 ++++++++++++-----
 httpbrokerclient.h   |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 6b2831a..65d859b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.99.3.1):
     - Update German translation file.
+    - Get rid of br html tags in client<->broker communication (closes
+      upstream issue #81).
 
   [ Terje Andersen ]
   * New upstream version (3.99.3.1):
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 3788600..f994891 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -319,16 +319,18 @@ void HttpBrokerClient::testConnection()
 }
 
 
-void HttpBrokerClient::createIniFile(const QString& content)
+void HttpBrokerClient::createIniFile(const QString& raw_content)
 {
+    QString content;
+    content = raw_content;
+    content.replace("<br>","\n");
+    x2goDebug<<"inifile content: "<<content<<"\n";
     QString cont;
-    QStringList lines=content.split("START_USER_SESSIONS<br>");
+    QStringList lines=content.split("START_USER_SESSIONS\n");
     if (lines.count()>1)
     {
         cont=lines[1];
-        cont=cont.split("END_USER_SESSIONS")[0];
-        cont.replace("\n","");
-        cont.replace("<br>","\n");
+        cont=cont.split("END_USER_SESSIONS\n")[0];
     }
     mainWindow->config.iniFile=cont;
 }
@@ -449,6 +451,7 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error )
 
 void HttpBrokerClient::parseSession(QString sinfo)
 {
+    x2goDebug<<"starting parser\n";
     QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts);
     int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
     QString endStr="-----END DSA PRIVATE KEY-----";
@@ -460,11 +463,15 @@ void HttpBrokerClient::parseSession(QString sinfo)
     config->serverIp=words[0];
     if (words.count()>1)
         config->sshport=words[1];
+    x2goDebug<<"server IP: "<<config->serverIp<<"\n";
+    x2goDebug<<"server port: "<<config->sshport<<"\n";
     if (sinfo.indexOf("SESSION_INFO")!=-1)
     {
         QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts);
         config->sessiondata=(lst[1].split("\n"))[0];
+        x2goDebug<<"session data: "<<config->sessiondata<<"\n";
     }
+    x2goDebug<<"parsing has finished\n";
     emit sessionSelected();
 }
 
diff --git a/httpbrokerclient.h b/httpbrokerclient.h
index bb7e9cd..725989b 100644
--- a/httpbrokerclient.h
+++ b/httpbrokerclient.h
@@ -48,7 +48,7 @@ private:
     bool sshBroker;
     SshMasterConnection* sshConnection;
 private:
-    void createIniFile(const QString& content);
+    void createIniFile(const QString& raw_content);
     void parseSession(QString sInfo);
     void createSshConnection();
     bool checkAccess(QString answer);


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).

    