From 8e799b0216700b2501f28f92ebc07b0b3bfd77af Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 Sep 2013 21:56:37 +0200
Subject: [PATCH] pumpio: Connecting to pumpio should be made much more easier

---
 .gitignore              | 2 +-
 blogger/blogger.css     | 4 ++--
 pumpio/pumpio.php       | 5 +++++
 statusnet/statusnet.php | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1850648..39340a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ report/
 /nbproject/private/
 
 #ignore smarty cache
-/view/smarty3/compiled/
\ No newline at end of file
+/view/smarty3/compiled/
diff --git a/blogger/blogger.css b/blogger/blogger.css
index 4e2294e5..2304ef9b 100755
--- a/blogger/blogger.css
+++ b/blogger/blogger.css
@@ -1,11 +1,11 @@
 
-#blogger-enable-label, #blogger-username-label, #blogger-password-label, #blogger-bydefault-label {
+#blogger-enable-label, #blogger-username-label, #blogger-password-label, #blogger-bydefault-label, #blogger-blog-label {
 	float: left;
 	width: 200px;
 	margin-top: 10px;
 }
 
-#blogger-checkbox, #blogger-username, #blogger-password, #blogger-bydefault {
+#blogger-checkbox, #blogger-username, #blogger-password, #blogger-bydefault, #blogger-blog {
 	float: left;
 	margin-top: 10px;
 }
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index e9130dd4..a9e611ac 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -163,6 +163,9 @@ function pumpio_connect(&$a) {
 
         if($success) {
 		logger("pumpio_connect: authenticated");
+
+		header("Location: ".$a->get_baseurl()."/settings/connectors");
+
 		$o .= t("You are now authenticated to pumpio.");
 		$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
 	} else {
@@ -316,6 +319,8 @@ function pumpio_settings_post(&$a,&$b) {
 			set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
 			set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
 			set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
+
+			header("Location: ".$a->get_baseurl()."/pumpio/connect");
 		}
 	}
 }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c19065cf..2c979540 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -313,11 +313,12 @@ function statusnet_settings(&$a,&$s) {
             $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
             $s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
-            $s .= '<p></p><div class="clear"></div></div>';
+            $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('StatusNet application name').'</label>';
             $s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
-            $s .= '<p></p><div class="clear"></div></div>';
+            $s .= '<p></p><div class="clear"></div>';
             $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+            $s .= '</div>';
 	} else {
 		/***
 		 * ok we have a consumer key pair now look into the OAuth stuff