forked from GNUsocial/gnu-social
Fixed arguments to syslog (LOG_ERR, not LOG_ERROR) and removed unused function
This commit is contained in:
parent
4ad5d55ecf
commit
02184df7c8
@ -25,21 +25,6 @@ define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
|
|||||||
define("FACEBOOK_NOTICE_PREFIX", 1);
|
define("FACEBOOK_NOTICE_PREFIX", 1);
|
||||||
define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
|
define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
|
||||||
|
|
||||||
// Gets all the notices from users with a Facebook link since a given ID
|
|
||||||
function getFacebookNotices($since)
|
|
||||||
{
|
|
||||||
$qry = 'SELECT notice.* ' .
|
|
||||||
'FROM notice ' .
|
|
||||||
'JOIN foreign_link ' .
|
|
||||||
'WHERE notice.profile_id = foreign_link.user_id ' .
|
|
||||||
'AND foreign_link.service = 2';
|
|
||||||
|
|
||||||
// XXX: What should the limit be?
|
|
||||||
//static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
|
|
||||||
|
|
||||||
return Notice::getStreamDirect($qry, 0, 1000, 0, 0, null, $since);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getFacebook()
|
function getFacebook()
|
||||||
{
|
{
|
||||||
$apikey = common_config('facebook', 'apikey');
|
$apikey = common_config('facebook', 'apikey');
|
||||||
@ -97,7 +82,7 @@ function isFacebookBound($notice, $flink) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} catch(FacebookRestClientException $e){
|
} catch(FacebookRestClientException $e){
|
||||||
common_log(LOG_ERROR, $e->getMessage());
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
$success = false;
|
$success = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,7 +111,7 @@ function facebookBroadcastNotice($notice)
|
|||||||
$status = "$prefix $notice->content";
|
$status = "$prefix $notice->content";
|
||||||
|
|
||||||
} catch(FacebookRestClientException $e) {
|
} catch(FacebookRestClientException $e) {
|
||||||
common_log(LOG_ERROR, $e->getMessage());
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -136,7 +121,7 @@ function facebookBroadcastNotice($notice)
|
|||||||
$facebook->api_client->users_setStatus($status, $fbuid, false, true);
|
$facebook->api_client->users_setStatus($status, $fbuid, false, true);
|
||||||
updateProfileBox($facebook, $flink, $notice);
|
updateProfileBox($facebook, $flink, $notice);
|
||||||
} catch(FacebookRestClientException $e) {
|
} catch(FacebookRestClientException $e) {
|
||||||
common_log(LOG_ERROR, $e->getMessage());
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Should we remove flink if this fails?
|
// Should we remove flink if this fails?
|
||||||
|
@ -114,7 +114,7 @@ function jabber_connect($resource=null)
|
|||||||
try {
|
try {
|
||||||
$conn->connect(true); // true = persistent connection
|
$conn->connect(true); // true = persistent connection
|
||||||
} catch (XMPPHP_Exception $e) {
|
} catch (XMPPHP_Exception $e) {
|
||||||
common_log(LOG_ERROR, $e->getMessage());
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user