<?php
-if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
- $directory = dirname($_SERVER["argv"][0]);
-
- if (substr($directory, 0, 1) != "/")
- $directory = $_SERVER["PWD"]."/".$directory;
-
- $directory = realpath($directory."/..");
-
- chdir($directory);
-}
-
-require_once("boot.php");
-require_once("include/photos.php");
-require_once("include/user.php");
+use \Friendica\Core\Config;
+require_once('include/photos.php');
+require_once('include/user.php');
function cron_run(&$argv, &$argc){
- global $a, $db;
-
- if(is_null($a)) {
- $a = new App;
- }
-
- if(is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- };
+ global $a;
require_once('include/session.php');
require_once('include/datetime.php');
require_once('mod/nodeinfo.php');
require_once('include/post_update.php');
- load_config('config');
- load_config('system');
-
- // Don't check this stuff if the function is called by the poller
- if (App::callstack() != "poller_run") {
- if ($a->maxload_reached())
- return;
- if (App::is_already_running('cron', 'include/cron.php', 540))
- return;
- }
-
$last = get_config('system','last_cron');
$poll_interval = intval(get_config('system','cron_interval'));
}
}
- $a->set_baseurl(get_config('system','url'));
-
- load_hooks();
-
logger('cron: start');
// run queue delivery process in the background
// Expire and remove user entries
cron_expire_and_remove_users();
- // 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");
-
- // Check every conversation
- proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_conversations");
+ // Check OStatus conversations
+ proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_mentions");
- // Call possible post update functions
- proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
+ // Check every conversation
+ proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_conversations");
- // 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);
+ // Call possible post update functions
+ proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
- // Check every conversation
- ostatus::check_conversations(false);
-
- // Call possible post update functions
- // see include/post_update.php for more details
- post_update();
-
- // update nodeinfo data
- nodeinfo_cron();
- }
+ // update nodeinfo data
+ proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo");
// once daily run birthday_updates and then expire in background
update_contact_birthdays();
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");
+
proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
set_config('system','last_expire_day',$d2);
proc_run(PRIORITY_LOW, 'include/expire.php');
- proc_run(PRIORITY_LOW, 'include/dbclean.php');
+ proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
cron_update_photo_albums();
}
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() ");
+ AND `account_expires_on` > '%s'
+ AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
// 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");
$force = true;
}
- $interval = intval(get_config('system','poll_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
- if (get_config("system", "worker"))
- $interval = false;
-
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
reload_plugins();
: ''
);
- $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
- $sql_extra
- AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
- AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
+ $contacts = q("SELECT `contact`.`id` FROM `user`
+ STRAIGHT_JOIN `contact`
+ ON `contact`.`uid` = `user`.`uid` AND `contact`.`rel` IN (%d, %d) AND `contact`.`poll` != ''
+ AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
+ AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
+ AND NOT `contact`.`archive`
+ WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DFRN),
intval($c['id'])
);
- if((! $res) || (! count($res)))
+ if (!dbm::is_result($res)) {
continue;
+ }
foreach($res as $contact) {
$xml = false;
- if($manual_id)
- $contact['last-update'] = '0000-00-00 00:00:00';
+ if ($manual_id) {
+ $contact['last-update'] = NULL_DATE;
+ }
- if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
+ if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
$contact['priority'] = 2;
+ }
- if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
+ if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
// We should be getting everything via a hub. But just to be sure, let's check once a day.
// (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
// This also lets us update our subscription to the hub, and add or replace hubs in case it
} else {
proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']);
}
-
- if($interval)
- @time_sleep_until(microtime(true) + (float) $interval);
}
}
}
*
* @param App $a
*/
-function cron_clear_cache(&$a) {
+function cron_clear_cache(App $a) {
$last = get_config('system','cache_last_cleared');
*
* @param App $a
*/
-function cron_repair_diaspora(&$a) {
+function cron_repair_diaspora(App $a) {
$r = q("SELECT `id`, `url` FROM `contact`
WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
/// - remove children when parent got lost
/// - set contact-id in item when not present
}
-
-if (array_search(__file__,get_included_files())===0){
- cron_run($_SERVER["argv"],$_SERVER["argc"]);
- killme();
-}
projects / friendica.git / blobdiff