keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more spaces + curly braces + converted multiple single-line comments to one mult-line comment

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-04-08 18:51:29 +02:00
parent a4d60b65f1
commit 8191bcc402
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/cron.php
View file

@ -4,7 +4,7 @@ use \Friendica\Core\Config;
function cron_run(&$argv, &$argc){ function cron_run(&$argv, &$argc){
global $a; global $a;
require_once('include/datetime.php'); require_once 'include/datetime.php';
// Poll contacts with specific parameters // Poll contacts with specific parameters
if ($argc > 1) { if ($argc > 1) {
@ -12,9 +12,9 @@ function cron_run(&$argv, &$argc){
return; return;
} }
$last = get_config('system','last_cron'); $last = get_config('system', 'last_cron');
$poll_interval = intval(get_config('system','cron_interval')); $poll_interval = intval(get_config('system', 'cron_interval'));
if (! $poll_interval) { if (! $poll_interval) {
$poll_interval = 10; $poll_interval = 10;
} }
@ -63,7 +63,7 @@ function cron_run(&$argv, &$argc){
proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database"); proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database");
// once daily run birthday_updates and then expire in background // once daily run birthday_updates and then expire in background
$d1 = get_config('system','last_expire_day'); $d1 = get_config('system', 'last_expire_day');
$d2 = intval(datetime_convert('UTC','UTC','now','d')); $d2 = intval(datetime_convert('UTC','UTC','now','d'));
if ($d2 != intval($d1)) { if ($d2 != intval($d1)) {
@ -74,7 +74,7 @@ function cron_run(&$argv, &$argc){
proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions"); proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
set_config('system','last_expire_day',$d2); set_config('system', 'last_expire_day',$d2);
proc_run(PRIORITY_LOW, 'include/expire.php'); proc_run(PRIORITY_LOW, 'include/expire.php');
@ -88,7 +88,7 @@ function cron_run(&$argv, &$argc){
logger('cron: end'); logger('cron: end');
set_config('system','last_cron', time()); set_config('system', 'last_cron', time());
return; return;
} }
@ -131,7 +131,7 @@ function cron_poll_contacts($argc, $argv) {
// and which have a polling address and ignore Diaspora since // and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates. // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
$abandon_days = intval(get_config('system','account_abandon_days')); $abandon_days = intval(get_config('system', 'account_abandon_days'));
if ($abandon_days < 1) { if ($abandon_days < 1) {
$abandon_days = 0; $abandon_days = 0;
} }
@ -157,7 +157,7 @@ function cron_poll_contacts($argc, $argv) {
dbesc(NETWORK_MAIL2) dbesc(NETWORK_MAIL2)
); );
if (!count($contacts)) { if (!dbm::is_result($contacts)) {
return; return;
} }
@ -184,25 +184,24 @@ function cron_poll_contacts($argc, $argv) {
} }
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) * We should be getting everything via a hub. But just to be sure, let's check once a day.
// This also lets us update our subscription to the hub, and add or replace hubs in case it * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
// changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. * This also lets us update our subscription to the hub, and add or replace hubs in case it
* changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
$poll_interval = get_config('system','pushpoll_frequency'); */
$poll_interval = get_config('system', 'pushpoll_frequency');
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
} }
if ($contact['priority'] AND !$force) { if ($contact['priority'] AND !$force) {
$update = false;
$update = false;
$t = $contact['last-update']; $t = $contact['last-update'];
/** /*
* Based on $contact['priority'], should we poll this site now? Or later? * Based on $contact['priority'], should we poll this site now? Or later?
*/ */
switch ($contact['priority']) { switch ($contact['priority']) {
case 5: case 5:
if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) { if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 month")) {
@ -236,7 +235,7 @@ function cron_poll_contacts($argc, $argv) {
} }
} }
logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]);
if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id']));