bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Now there are four more ...

Browse source
This commit is contained in:
Michael 2017-11-15 21:12:33 +00:00
parent 33e98d6264
commit 0aee6d383a
7 changed files with 113 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Contact.php
View file

@ -308,7 +308,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) && if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) &&
in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
Worker::add(PRIORITY_LOW, "update_gcontact", $profile["gid"]); Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
} }
// Show contact details of Diaspora contacts only if connected // Show contact details of Diaspora contacts only if connected

55
src/Worker/CheckVersion.php
View file

@ -1,10 +1,11 @@
<?php <?php
/** /**
* @file include/checkversion.php * @file src/Worker/CheckVersion.php
* *
* @brief save Friendica upstream version to the DB * @brief save Friendica upstream version to the DB
**/ **/
namespace Friendica\Worker;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -14,33 +15,35 @@ use Friendica\Core\Config;
* Checking the upstream version is optional (opt-in) and can be done to either * Checking the upstream version is optional (opt-in) and can be done to either
* the master or the develop branch in the repository. * the master or the develop branch in the repository.
*/ */
function checkversion_run () { class CheckVersion {
global $a; public static function execute() {
global $a;
logger('checkversion: start'); logger('checkversion: start');
$checkurl = Config::get('system', 'check_new_version_url', 'none'); $checkurl = Config::get('system', 'check_new_version_url', 'none');
switch ($checkurl) {
case 'master':
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/master/VERSION';
break;
case 'develop':
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/develop/VERSION';
break;
default:
// don't check
return;
}
logger("Checking VERSION from: ".$checked_url, LOGGER_DEBUG);
// fetch the VERSION file
$gitversion = dbesc(trim(fetch_url($checked_url)));
logger("Upstream VERSION is: ".$gitversion, LOGGER_DEBUG);
Config::set('system', 'git_friendica_version', $gitversion);
logger('checkversion: end');
switch ($checkurl) {
case 'master':
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/master/VERSION';
break;
case 'develop':
$checked_url = 'https://raw.githubusercontent.com/friendica/friendica/develop/VERSION';
break;
default:
// don't check
return; return;
} }
logger("Checking VERSION from: ".$checked_url, LOGGER_DEBUG);
// fetch the VERSION file
$gitversion = dbesc(trim(fetch_url($checked_url)));
logger("Upstream VERSION is: ".$gitversion, LOGGER_DEBUG);
Config::set('system', 'git_friendica_version', $gitversion);
logger('checkversion: end');
return;
} }

2
src/Worker/Cron.php
View file

@ -85,7 +85,7 @@ Class Cron {
dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR')); dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
// check upstream version? // check upstream version?
Worker::add(PRIORITY_LOW, 'checkversion'); Worker::add(PRIORITY_LOW, 'CheckVersion');
} }
// Poll contacts // Poll contacts

8
src/Worker/TagUpdate.php
View file

@ -1,6 +1,10 @@
<?php <?php
namespace Friendica\Worker;
require_once("include/tags.php"); require_once("include/tags.php");
function tagupdate_run(&$argv, &$argc){ class TagUpdate {
update_items(); public static function execute() {
update_items();
}
} }

10
src/Worker/ThreadUpdate.php
View file

@ -1,7 +1,11 @@
<?php <?php
namespace Friendica\Worker;
require_once("include/threads.php"); require_once("include/threads.php");
function threadupdate_run(&$argv, &$argc){ class ThreadUpdate {
update_threads(); public static function execute() {
update_threads_mention(); update_threads();
update_threads_mention();
}
} }

136
src/Worker/UpdateGContact.php
View file

@ -1,81 +1,79 @@
<?php <?php
/** /**
* @file include/update_gcontact.php * @file src/Worker/UpdateGcontact.php
*/ */
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
function update_gcontact_run(&$argv, &$argc) { class UpdateGContact {
global $a; public static function execute($contact_id) {
global $a;
logger('update_gcontact: start'); logger('update_gcontact: start');
if (($argc > 1) && (intval($argv[1]))) { if (empty($contact_id)) {
$contact_id = intval($argv[1]); logger('update_gcontact: no contact');
return;
}
$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
if (!DBM::is_result($r)) {
return;
}
if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
return;
}
$data = Probe::uri($r[0]["url"]);
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
if ($r[0]["server_url"] != "")
PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()), intval($contact_id));
return;
}
if (($data["name"] == "") && ($r[0]['name'] != ""))
$data["name"] = $r[0]['name'];
if (($data["nick"] == "") && ($r[0]['nick'] != ""))
$data["nick"] = $r[0]['nick'];
if (($data["addr"] == "") && ($r[0]['addr'] != ""))
$data["addr"] = $r[0]['addr'];
if (($data["photo"] == "") && ($r[0]['photo'] != ""))
$data["photo"] = $r[0]['photo'];
q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
WHERE `id` = %d",
dbesc($data["name"]),
dbesc($data["nick"]),
dbesc($data["addr"]),
dbesc($data["photo"]),
intval($contact_id)
);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
dbesc($data["name"]),
dbesc($data["nick"]),
dbesc($data["addr"]),
dbesc($data["photo"]),
dbesc(normalise_link($data["url"]))
);
q("UPDATE `contact` SET `addr` = '%s'
WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
dbesc($data["addr"]),
dbesc(normalise_link($data["url"]))
);
} }
if (!$contact_id) {
logger('update_gcontact: no contact');
return;
}
$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
if (!DBM::is_result($r)) {
return;
}
if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
return;
}
$data = Probe::uri($r[0]["url"]);
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
if ($r[0]["server_url"] != "")
PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()), intval($contact_id));
return;
}
if (($data["name"] == "") && ($r[0]['name'] != ""))
$data["name"] = $r[0]['name'];
if (($data["nick"] == "") && ($r[0]['nick'] != ""))
$data["nick"] = $r[0]['nick'];
if (($data["addr"] == "") && ($r[0]['addr'] != ""))
$data["addr"] = $r[0]['addr'];
if (($data["photo"] == "") && ($r[0]['photo'] != ""))
$data["photo"] = $r[0]['photo'];
q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
WHERE `id` = %d",
dbesc($data["name"]),
dbesc($data["nick"]),
dbesc($data["addr"]),
dbesc($data["photo"]),
intval($contact_id)
);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
dbesc($data["name"]),
dbesc($data["nick"]),
dbesc($data["addr"]),
dbesc($data["photo"]),
dbesc(normalise_link($data["url"]))
);
q("UPDATE `contact` SET `addr` = '%s'
WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
dbesc($data["addr"]),
dbesc(normalise_link($data["url"]))
);
} }

4
update.php
View file

@ -1601,7 +1601,7 @@ function update_1169() {
if (!$r) if (!$r)
return UPDATE_FAILED; return UPDATE_FAILED;
Worker::add(PRIORITY_LOW, "threadupdate"); Worker::add(PRIORITY_LOW, "ThreadUpdate");
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
@ -1650,7 +1650,7 @@ function update_1178() {
function update_1180() { function update_1180() {
// Fill the new fields in the term table. // Fill the new fields in the term table.
Worker::add(PRIORITY_LOW, "tagupdate"); Worker::add(PRIORITY_LOW, "TagUpdate");
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }