friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator.

pull/35/head
Tobias Hößl 2012-04-02 20:25:15 +00:00
parent 02165e7464
commit df343dd2d6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
facebook/facebook.php
View File

@ -649,6 +649,10 @@ function facebook_plugin_admin(&$a, &$o){
$poll_interval = get_config('facebook', 'poll_interval' ); $poll_interval = get_config('facebook', 'poll_interval' );
if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL; if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
$ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1");
$ret2 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appsecret' LIMIT 1");
if ((count($ret1) > 0 && $ret1[0]['v'] != $appid) || (count($ret2) > 0 && $ret2[0]['v'] != $appsecret)) $o .= t('Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>');
$working_connection = false; $working_connection = false;
if ($appid && $appsecret) { if ($appid && $appsecret) {
$subs = facebook_subscriptions_get(); $subs = facebook_subscriptions_get();
@ -656,7 +660,7 @@ function facebook_plugin_admin(&$a, &$o){
elseif (is_array($subs)) { elseif (is_array($subs)) {
$o .= t('The given API Key seems to work correctly.') . '<br>'; $o .= t('The given API Key seems to work correctly.') . '<br>';
$working_connection = true; $working_connection = true;
} else $o .= t('The correctness of the API Key could not be detected. Somthing strang\'s going on.') . '<br>'; } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '<br>';
} }
$o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">'; $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">';