X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcron.php;h=97744ed27a1e9c156c0a08ffe6e656e590a06cea;hb=30a77cc10a21728efdca48e6cd3cb04586b1df23;hp=c03745a4429e0d38bb1502e433ede5f0b3a516d0;hpb=3463a442badb575f024a090f371d4f75c89d9b78;p=friendica.git

diff --git a/include/cron.php b/include/cron.php
index c03745a442..97744ed27a 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -11,6 +11,8 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once("boot.php");
+require_once("include/photos.php");
+require_once("include/user.php");
 
 
 function cron_run(&$argv, &$argc){
@@ -41,7 +43,7 @@ function cron_run(&$argv, &$argc){
 
 	// Don't check this stuff if the function is called by the poller
 	if (App::callstack() != "poller_run") {
-		if (App::maxload_reached())
+		if ($a->maxload_reached())
 			return;
 		if (App::is_already_running('cron', 'include/cron.php', 540))
 			return;
@@ -126,14 +128,7 @@ function cron_run(&$argv, &$argc){
 
 		proc_run(PRIORITY_LOW, 'include/expire.php');
 
-		if (get_config("system", "worker")) {
-			proc_run(PRIORITY_LOW, 'include/dbclean.php', 1);
-			proc_run(PRIORITY_LOW, 'include/dbclean.php', 2);
-			proc_run(PRIORITY_LOW, 'include/dbclean.php', 3);
-			proc_run(PRIORITY_LOW, 'include/dbclean.php', 4);
-		} else {
-			proc_run(PRIORITY_LOW, 'include/dbclean.php');
-		}
+		proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
 
 		cron_update_photo_albums();
 	}
@@ -162,8 +157,9 @@ function cron_run(&$argv, &$argc){
  */
 function cron_update_photo_albums() {
 	$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
-	if (!dbm::is_result($r))
+	if (!dbm::is_result($r)) {
 		return;
+	}
 
 	foreach ($r AS $user) {
 		photo_albums($user['uid'], true);
@@ -268,7 +264,7 @@ function cron_poll_contacts($argc, $argv) {
 			intval($c['id'])
 		);
 
-		if((! $res) || (! count($res)))
+		if (dbm::is_result($res))
 			continue;
 
 		foreach($res as $contact) {
@@ -330,7 +326,11 @@ function cron_poll_contacts($argc, $argv) {
 
 			logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
 
-			proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
+			if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
+				proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
+			} else {
+				proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']);
+			}
 
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
@@ -343,7 +343,7 @@ function cron_poll_contacts($argc, $argv) {
  *
  * @param App $a
  */
-function cron_clear_cache(&$a) {
+function cron_clear_cache(App &$a) {
 
 	$last = get_config('system','cache_last_cleared');
 
@@ -430,11 +430,11 @@ function cron_clear_cache(&$a) {
  *
  * @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));
-	if ($r) {
+	if (dbm::is_result($r)) {
 		foreach ($r AS $contact) {
 			if (poco_reachable($contact["url"])) {
 				$data = probe_url($contact["url"]);
@@ -455,6 +455,16 @@ function cron_repair_diaspora(&$a) {
  */
 function cron_repair_database() {
 
+	// Sometimes there seem to be issues where the "self" contact vanishes.
+	// We haven't found the origin of the problem by now.
+	$r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
+	if (dbm::is_result($r)) {
+		foreach ($r AS $user) {
+			logger('Create missing self contact for user '.$user['uid']);
+			user_create_self_contact($user['uid']);
+		}
+	}
+
 	// Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
 	// 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");
@@ -464,7 +474,7 @@ function cron_repair_database() {
 
 	// 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)
+	if (dbm::is_result($r))
 		foreach ($r AS $user)
 			update_gcontact_for_user($user["uid"]);