From e917f3d26b8385ebe9064e6832b2795238b0acc6 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Sep 2013 09:33:24 +0200 Subject: [PATCH 1/6] pumpio: Added some more logging information. --- pumpio/pumpio.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index f697b227..4824df1f 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -77,6 +77,8 @@ function pumpio_registerclient(&$a, $host) { $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png"; $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect"; + logger("pumpio_registerclient: ".$url." parameters ".$print_r($params, true), LOGGER_DEBUG); + $ch = curl_init($url); curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); @@ -89,9 +91,12 @@ function pumpio_registerclient(&$a, $host) { if ($curl_info["http_code"] == "200") { $values = json_decode($s); + logger("pumpio_registerclient: success ".$print_r($values, true), LOGGER_DEBUG); return($values); } + logger("pumpio_registerclient: failed: ".$print_r($curl_info, true), LOGGER_DEBUG); return(false); + } function pumpio_connect(&$a) { @@ -112,7 +117,7 @@ function pumpio_connect(&$a) { $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key'); $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret'); - logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret); + logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG); } if (($consumer_key == "") OR ($consumer_secret == "")) { @@ -146,7 +151,7 @@ function pumpio_connect(&$a) { if (($success = $client->Initialize())) { if (($success = $client->Process())) { if (strlen($client->access_token)) { - logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret); + logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG); set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token); set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); } @@ -157,10 +162,13 @@ function pumpio_connect(&$a) { $o = 'Could not connect to pumpio. Refresh the page or try again later.'; if($success) { + logger("pumpio_connect: authenticated"); $o .= t("You are now authenticated to pumpio."); $o .= '
'.t("return to the connector page").''; - } else - $o = 'Could not connect to pumpio. Refresh the page or try again later.'; + } else { + logger("pumpio_connect: could not connect"); + $o = 'Could not connect to pumpio. Refresh the page or try again later.'; + } return($o); } From b8213b207a5073468df94341ed668ce6d7bb1683 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Sep 2013 12:12:17 +0200 Subject: [PATCH 2/6] pumpio: corrected some typos --- pumpio/pumpio.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 4824df1f..e9130dd4 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -77,7 +77,7 @@ function pumpio_registerclient(&$a, $host) { $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png"; $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect"; - logger("pumpio_registerclient: ".$url." parameters ".$print_r($params, true), LOGGER_DEBUG); + logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG); $ch = curl_init($url); curl_setopt($ch, CURLOPT_HEADER, false); @@ -91,10 +91,10 @@ function pumpio_registerclient(&$a, $host) { if ($curl_info["http_code"] == "200") { $values = json_decode($s); - logger("pumpio_registerclient: success ".$print_r($values, true), LOGGER_DEBUG); + logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG); return($values); } - logger("pumpio_registerclient: failed: ".$print_r($curl_info, true), LOGGER_DEBUG); + logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG); return(false); } From 8e799b0216700b2501f28f92ebc07b0b3bfd77af Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Sep 2013 21:56:37 +0200 Subject: [PATCH 3/6] 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 .= '
'.t("return to the connector page").''; } 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 .= '
'; $s .= ''; $s .= '
'; - $s .= '

'; + $s .= '
'; $s .= ''; $s .= '
'; - $s .= '

'; + $s .= '

'; $s .= '
'; + $s .= ''; } else { /*** * ok we have a consumer key pair now look into the OAuth stuff From bcf5b407c58436f833a5f63a90469d2616777013 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 2 Oct 2013 22:19:28 +0200 Subject: [PATCH 4/6] pumpio: changed logger --- pumpio/pumpio.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index a9e611ac..0cea1081 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -356,7 +356,7 @@ function pumpio_send(&$a,&$b) { return; } - logger("pumpio_send: parameter ".print_r($b, true)); + logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA); if($b['parent'] != $b['id']) { // Looking if its a reply to a pumpio post From 150db7e816e92f0dedb5675934116203db4d2966 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 3 Oct 2013 11:12:57 +0200 Subject: [PATCH 5/6] libertree: Send the sitename - if set. --- libertree/libertree.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libertree/libertree.php b/libertree/libertree.php index c618fd8c..6a875bb7 100755 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -153,8 +153,11 @@ function libertree_send(&$a,&$b) { $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token'); $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; - $ltree_source = "Friendica"; - //$ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")"; + if (isset($a->config['sitename']) AND ($a->config['sitename'] != "")) + $ltree_source = $a->config['sitename']; + else + $ltree_source = "Friendica"; + if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { require_once('include/bb2diaspora.php'); From 88a0cac5a6c9a5ee741dd2571dc0dfce4dd876a2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 3 Oct 2013 13:41:08 +0200 Subject: [PATCH 6/6] pumpio: no redirection after successfull authentification. --- pumpio/pumpio.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 89f39ca0..4bab7be5 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -163,9 +163,6 @@ 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 .= '
'.t("return to the connector page").''; } else {