[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdepim/blogilo/src
From:       Golnaz Nilieh <g382nilieh () gmail ! com>
Date:       2010-06-18 7:46:33
Message-ID: 20100618074633.B8D81AC8D8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1139404 by golnazn:

BUG: 226560 Remove trailing slashes from the blog url, before attaching "xmlrpc.php" at the end of it.

 M  +23 -4     addeditblog.cpp  


--- branches/KDE/4.4/kdepim/blogilo/src/addeditblog.cpp #1139403:1139404
@@ -113,6 +113,7 @@
         return;
     }
     showWaitWidget( i18n("Trying to guess blog and API type...") );
+    QString textUrl;
     ///Guess API with Url:
     if ( ui.txtUrl->text().contains( "xmlrpc.php", Qt::CaseInsensitive ) ) {
         ui.comboApi->setCurrentIndex( 3 );
@@ -126,7 +127,11 @@
     }
     if ( ui.txtUrl->text().contains( "wordpress", Qt::CaseInsensitive ) ) {
         ui.comboApi->setCurrentIndex( 3 );
-        ui.txtUrl->setText( ui.txtUrl->text() + "/xmlrpc.php" );
+	textUrl = ui.txtUrl->text();
+	while (textUrl.endsWith(QChar('/'))) {
+	    textUrl.remove(textUrl.length()-1, 1);
+	}
+        ui.txtUrl->setText( textUrl + "/xmlrpc.php" );
         fetchBlogId();
         return;
     }
@@ -161,6 +166,7 @@
     QString httpData( dynamic_cast<KIO::StoredTransferJob*>( job )->data() );
     job->deleteLater();
 
+    QString textUrl;
     QRegExp rxGData( QString( "content='blogger' name='generator'" ) );
     if ( rxGData.indexIn( httpData ) != -1 ) {
         kDebug() << "content='blogger' name='generator' matched";
@@ -188,13 +194,22 @@
         kDebug() << "name=\"generator\" content=\"WordPress matched";
         mFetchAPITimer->deleteLater();
         ui.comboApi->setCurrentIndex( 3 );
-        ui.txtUrl->setText( ui.txtUrl->text() + "/xmlrpc.php" );
+	
+	textUrl = ui.txtUrl->text();
+	while (textUrl.endsWith(QChar('/'))) {
+	    textUrl.remove(textUrl.length()-1, 1);
+	}
+        ui.txtUrl->setText( textUrl + "/xmlrpc.php" );
         fetchBlogId();
         return;
     }
 
     // add MT for WordpressBuggy -> URL/xmlrpc.php exists
-    KIO::StoredTransferJob *testXmlRpcJob = KIO::storedGet( ui.txtUrl->text() + "/xmlrpc.php",
+    textUrl = ui.txtUrl->text();
+    while (textUrl.endsWith(QChar('/'))) {
+	textUrl.remove(textUrl.length()-1, 1);
+    }
+    KIO::StoredTransferJob *testXmlRpcJob = KIO::storedGet( textUrl + "/xmlrpc.php",
                                                             KIO::NoReload, KIO::HideProgressInfo );
 
     connect( testXmlRpcJob, SIGNAL( result( KJob* ) ), this, SLOT( gotXmlRpcTest( KJob* ) ) );
@@ -215,7 +230,11 @@
 but has found an XMLRPC interface and is trying to use it.\
 \nThe MovableType API is assumed for now; choose another API if you know the server supports it."));
     ui.comboApi->setCurrentIndex( 2 );
-    ui.txtUrl->setText( ui.txtUrl->text() + "/xmlrpc.php" );
+    QString textUrl = ui.txtUrl->text();
+    while (textUrl.endsWith(QChar('/'))) {
+	    textUrl.remove(textUrl.length()-1, 1);
+    }
+    ui.txtUrl->setText( textUrl + "/xmlrpc.php" );
     fetchBlogId();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]