require_once('include/email.php');
require_once('include/socgraph.php');
require_once('mod/nodeinfo.php');
+ require_once('include/post_update.php');
load_config('config');
load_config('system');
// run queue delivery process in the background
- proc_run('php',"include/queue.php");
+ proc_run(PRIORITY_NEGLIGIBLE,"include/queue.php");
// run the process to discover global contacts in the background
- proc_run('php',"include/discover_poco.php");
+ proc_run(PRIORITY_LOW,"include/discover_poco.php");
// run the process to update locally stored global contacts in the background
- proc_run('php',"include/discover_poco.php", "checkcontact");
+ proc_run(PRIORITY_LOW,"include/discover_poco.php", "checkcontact");
- // expire any expired accounts
-
- q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
- AND `account_expires_on` != '0000-00-00 00:00:00'
- AND `account_expires_on` < UTC_TIMESTAMP() ");
-
- // delete user and contact records for recently removed accounts
+ // Expire and remove user entries
+ cron_expire_and_remove_users();
- $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
- if ($r) {
- foreach($r as $user) {
- q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
- q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
- }
- }
+ // If the worker is active, split the jobs in several sub processes
+ if (get_config("system", "worker")) {
+ // Check OStatus conversations
+ proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_mentions");
- $abandon_days = intval(get_config('system','account_abandon_days'));
- if($abandon_days < 1)
- $abandon_days = 0;
+ // Check every conversation
+ proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_conversations");
- // Check OStatus conversations
- // Check only conversations with mentions (for a longer time)
- ostatus::check_conversations(true);
+ // Call possible post update functions
+ proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
- // Check every conversation
- ostatus::check_conversations(false);
+ // update nodeinfo data
+ proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo");
+ } else {
+ // Check OStatus conversations
+ // Check only conversations with mentions (for a longer time)
+ ostatus::check_conversations(true);
- // Set the gcontact-id in the item table if missing
- item_set_gcontact();
+ // Check every conversation
+ ostatus::check_conversations(false);
- // update nodeinfo data
- nodeinfo_cron();
+ // Call possible post update functions
+ // see include/post_update.php for more details
+ post_update();
- /// @TODO Regenerate usage statistics
- // q("ANALYZE TABLE `item`");
+ // update nodeinfo data
+ nodeinfo_cron();
+ }
// once daily run birthday_updates and then expire in background
update_contact_birthdays();
- proc_run('php',"include/discover_poco.php", "suggestions");
+ proc_run(PRIORITY_LOW,"include/discover_poco.php", "suggestions");
set_config('system','last_expire_day',$d2);
- proc_run('php','include/expire.php');
+ proc_run(PRIORITY_LOW,'include/expire.php');
}
// Clear cache entries
// Repair entries in the database
cron_repair_database();
+ // Poll contacts
+ cron_poll_contacts($argc, $argv);
+
+ logger('cron: end');
+
+ set_config('system','last_cron', time());
+
+ return;
+}
+
+/**
+ * @brief Expire and remove user entries
+ */
+function cron_expire_and_remove_users() {
+ // expire any expired accounts
+ q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
+ AND `account_expires_on` != '0000-00-00 00:00:00'
+ AND `account_expires_on` < UTC_TIMESTAMP() ");
+
+ // delete user and contact records for recently removed accounts
+ $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+ if ($r) {
+ foreach($r as $user) {
+ q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
+ q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
+ }
+ }
+}
+
+/**
+ * @brief Poll contacts for unreceived messages
+ *
+ * @param Integer $argc Number of command line arguments
+ * @param Array $argv Array of command line arguments
+ */
+function cron_poll_contacts($argc, $argv) {
$manual_id = 0;
$generation = 0;
$force = false;
$restart = false;
- if(($argc > 1) && ($argv[1] == 'force'))
+ if (($argc > 1) && ($argv[1] == 'force'))
$force = true;
- if(($argc > 1) && ($argv[1] == 'restart')) {
+ if (($argc > 1) && ($argv[1] == 'restart')) {
$restart = true;
$generation = intval($argv[2]);
- if(! $generation)
+ if (!$generation)
killme();
}
- if(($argc > 1) && intval($argv[1])) {
+ if (($argc > 1) && intval($argv[1])) {
$manual_id = intval($argv[1]);
$force = true;
}
$interval = intval(get_config('system','poll_interval'));
- if(! $interval)
+ if (!$interval)
$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
// If we are using the worker we don't need a delivery interval
// and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+ $abandon_days = intval(get_config('system','account_abandon_days'));
+ if($abandon_days < 1)
+ $abandon_days = 0;
+
$abandon_sql = (($abandon_days)
? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
: ''
dbesc(NETWORK_MAIL2)
);
- if(! count($contacts)) {
+ if (!count($contacts)) {
return;
}
- foreach($contacts as $c) {
+ foreach ($contacts as $c) {
$res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($c['id'])
$update = true;
break;
}
- if(!$update)
+ if (!$update)
continue;
}
logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
- proc_run('php','include/onepoll.php',$contact['id']);
+ proc_run(PRIORITY_MEDIUM,'include/onepoll.php',$contact['id']);
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
}
-
- logger('cron: end');
-
- set_config('system','last_cron', time());
-
- return;
}
/**
// This call is very "cheap" so we can do it at any time without a problem
q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
+ // There was an issue where the nick vanishes from the contact table
+ q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''");
+
+ // Update the global contacts for local users
+ $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
+ if ($r)
+ foreach ($r AS $user)
+ update_gcontact_for_user($user["uid"]);
+
/// @todo
/// - remove thread entries without item
/// - remove sign entries without item
projects / friendica.git / blobdiff