diff options
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/facebook/facebook.php | 17 | ||||
| -rw-r--r-- | addon/statusnet/statusnet.php | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 7bebb3b4f..119ee2f3e 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -123,15 +123,12 @@ function facebook_content(&$a) { function facebook_install() { register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); register_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets'); - register_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local'); - } function facebook_uninstall() { unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); unregister_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets'); - unregister_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local'); } @@ -148,17 +145,6 @@ function facebook_jot_nets(&$a,&$b) { } } -function facebook_post_local(&$a,&$b) { - - if(! local_user()) - return; - - if((x($b,'facebook_enable')) && (intval($b['facebook_enable']))) - set_pconfig(local_user(),'facebook','enable','1'); - else - del_pconfig(local_user(),'facebook','enable'); -} - function facebook_post_hook(&$a,&$b) { @@ -179,9 +165,10 @@ function facebook_post_hook(&$a,&$b) { logger('facebook: have appid+secret'); $fb_post = intval(get_pconfig(local_user(),'facebook','post')); - $fb_enable = intval(get_pconfig(local_user(),'facebook','enable')); + $fb_enable = (($fb_post && x($_POST,'facebook_enable')) ? intval($_POST['facebook_enable']) : 0); $fb_token = get_pconfig(local_user(),'facebook','access_token'); + logger('facebook: $fb_post: ' . $fb_post . ' $fb_enable: ' . $fb_enable . ' $fb_token: ' . $fb_token,LOGGER_DEBUG); if($fb_post && $fb_token && $fb_enable) { logger('facebook: able to post'); require_once('library/facebook.php'); diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index bc47242fc..3dd4b5e98 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -133,7 +133,7 @@ function statusnet_settings(&$a,&$s) { $s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />'; $s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>'; $s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />'; - $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path (remember the trailing /)') .'</label>'; + $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 .= '</div><div class="clear"></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; |