Merge branch '0.7.x' into 0.8.x
This commit is contained in:
commit
9a566c51cd
@ -392,6 +392,8 @@ class TwittersettingsAction extends ConnectSettingsAction
|
|||||||
|
|
||||||
if ($friendsync) {
|
if ($friendsync) {
|
||||||
save_twitter_friends($user, $twit_user->id, $screen_name, $password);
|
save_twitter_friends($user, $twit_user->id, $screen_name, $password);
|
||||||
|
$flink->last_friendsync = common_sql_now();
|
||||||
|
$flink->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->showForm(_('Twitter settings saved.'), true);
|
$this->showForm(_('Twitter settings saved.'), true);
|
||||||
|
@ -291,6 +291,8 @@ create table foreign_link (
|
|||||||
noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,
|
noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,
|
||||||
friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */,
|
friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */,
|
||||||
profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,
|
profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,
|
||||||
|
last_noticesync timestamp default null /* comment 'last time notices were imported' */,
|
||||||
|
last_friendsync timestamp default null /* comment 'last time friends were imported' */,
|
||||||
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
|
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
|
||||||
modified timestamp /* comment 'date this record was modified' */,
|
modified timestamp /* comment 'date this record was modified' */,
|
||||||
|
|
||||||
|
@ -32,8 +32,25 @@ define('LACONICA', true);
|
|||||||
|
|
||||||
require_once(INSTALLDIR . '/lib/common.php');
|
require_once(INSTALLDIR . '/lib/common.php');
|
||||||
|
|
||||||
|
// Make a lockfile
|
||||||
|
$lockfilename = lockFilename();
|
||||||
|
if (!($lockfile = @fopen($lockfilename, "w"))) {
|
||||||
|
print "Already running... exiting.\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Obtain an exlcusive lock on file (will fail if script is already going)
|
||||||
|
if (!@flock( $lockfile, LOCK_EX | LOCK_NB, &$wouldblock) || $wouldblock) {
|
||||||
|
// Script already running - abort
|
||||||
|
@fclose($lockfile);
|
||||||
|
print "Already running... exiting.\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
$flink = new Foreign_link();
|
$flink = new Foreign_link();
|
||||||
$flink->service = 1; // Twitter
|
$flink->service = 1; // Twitter
|
||||||
|
$flink->orderBy('last_friendsync');
|
||||||
|
$flink->limit(25); // sync this many users during this run
|
||||||
$cnt = $flink->find();
|
$cnt = $flink->find();
|
||||||
|
|
||||||
print "Updating Twitter friends subscriptions for $cnt users.\n";
|
print "Updating Twitter friends subscriptions for $cnt users.\n";
|
||||||
@ -60,8 +77,11 @@ while ($flink->fetch()) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = save_twitter_friends($user, $fuser->id,
|
save_twitter_friends($user, $fuser->id, $fuser->nickname, $flink->credentials);
|
||||||
$fuser->nickname, $flink->credentials);
|
|
||||||
|
$flink->last_friendsync = common_sql_now();
|
||||||
|
$flink->update();
|
||||||
|
|
||||||
if (defined('SCRIPT_DEBUG')) {
|
if (defined('SCRIPT_DEBUG')) {
|
||||||
print "\nDONE\n";
|
print "\nDONE\n";
|
||||||
} else {
|
} else {
|
||||||
@ -70,4 +90,18 @@ while ($flink->fetch()) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function lockFilename()
|
||||||
|
{
|
||||||
|
$piddir = common_config('daemon', 'piddir');
|
||||||
|
if (!$piddir) {
|
||||||
|
$piddir = '/var/run';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $piddir . '/synctwitterfriends.lock';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cleanup
|
||||||
|
fclose($lockfile);
|
||||||
|
unlink($lockfilename);
|
||||||
|
|
||||||
exit(0);
|
exit(0);
|
||||||
|
Loading…
Reference in New Issue
Block a user