pumpio: Resetting of authentification data is added.

This commit is contained in:
Michael Vogel 2013-06-23 03:30:22 +02:00
parent eccc3bfc45
commit 21778176e6
2 changed files with 73 additions and 52 deletions

View file

@ -1,11 +1,11 @@
#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label { #pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label {
float: left; float: left;
width: 200px; width: 200px;
margin-top: 10px; margin-top: 10px;
} }
#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault { #pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete {
float: left; float: left;
margin-top: 10px; margin-top: 10px;
} }

View file

@ -198,21 +198,29 @@ function pumpio_settings(&$a,&$s) {
$s .= '<div class="settings-block">'; $s .= '<div class="settings-block">';
$s .= '<h3>' . t('Pump.io Post Settings') . '</h3>'; $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
$s .= '<div id="pumpio-servername-wrapper">';
$s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.t('pump.io servername (without "http://" or "https://" )').'</label>';
$s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-username-wrapper">'; $s .= '<div id="pumpio-username-wrapper">';
$s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>'; $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
$s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />'; $s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
if (($username != '') AND ($servername != '')) { $s .= '<div id="pumpio-servername-wrapper">';
$s .= '<div id="pumpio-authenticate-wrapper">'; $s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.t('pump.io servername (without "http://" or "https://" )').'</label>';
$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("(Re-)Authenticate your pump.io connection").'</a>'; $s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
if (($username != '') AND ($servername != '')) {
$oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token");
$oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret");
$s .= '<div id="pumpio-password-wrapper">';
if (($oauth_token == "") OR ($oauth_token_secret == "")) {
$s .= '<div id="pumpio-authenticate-wrapper">';
$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Authenticate your pump.io connection").'</a>';
$s .= '</div><div class="clear"></div>';
//$s .= t("You are not authenticated to pumpio");
} else {
$s .= '<div id="pumpio-enable-wrapper">'; $s .= '<div id="pumpio-enable-wrapper">';
$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>'; $s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>';
$s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>'; $s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
@ -233,12 +241,16 @@ function pumpio_settings(&$a,&$s) {
$s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>'; $s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); $s .= '<div id="pumpio-delete-wrapper">';
$oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); $s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . t('Check to delete this preset') . '</label>';
$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-password-wrapper">'; //$s .= '<div id="pumpio-authenticate-wrapper">';
if (($oauth_token == "") OR ($oauth_token_secret == "")) //$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Reauthenticate your pump.io connection").'</a>';
$s .= t("You are not authenticated to pumpio"); //$s .= '</div><div class="clear"></div>';
}
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
} }
@ -253,6 +265,16 @@ function pumpio_settings(&$a,&$s) {
function pumpio_settings_post(&$a,&$b) { function pumpio_settings_post(&$a,&$b) {
if(x($_POST,'pumpio-submit')) { if(x($_POST,'pumpio-submit')) {
if(x($_POST,'pumpio_delete')) {
set_pconfig(local_user(),'pumpio','consumer_key','');
set_pconfig(local_user(),'pumpio','consumer_secret','');
set_pconfig(local_user(),'pumpio','host','');
set_pconfig(local_user(),'pumpio','oauth_token','');
set_pconfig(local_user(),'pumpio','oauth_token_secret','');
set_pconfig(local_user(),'pumpio','post',false);
set_pconfig(local_user(),'pumpio','post_by_default',false);
set_pconfig(local_user(),'pumpio','user','');
} else {
// filtering the username if it is filled wrong // filtering the username if it is filled wrong
$user = $_POST['pumpio_user']; $user = $_POST['pumpio_user'];
if (strstr($user, "@")) { if (strstr($user, "@")) {
@ -272,9 +294,8 @@ function pumpio_settings_post(&$a,&$b) {
set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']); set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']); set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault'])); set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
} }
}
} }
function pumpio_post_local(&$a,&$b) { function pumpio_post_local(&$a,&$b) {