Moved some workers in their new habitat

diff --git a/include/checkversion.php b/include/checkversion.php
deleted file mode 100644 (file)
index 7d3c2de..0000000
--- a/include/checkversion.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file include/checkversion.php
- *
- * @brief save Friendica upstream version to the DB
- **/
-
-use Friendica\Core\Config;
-
-/**
- * @brief check the git repository VERSION file and save the version to the DB
- *
- * Checking the upstream version is optional (opt-in) and can be done to either
- * the master or the develop branch in the repository.
- */
-function checkversion_run () {
-       global $a;
-
-       logger('checkversion: start');
-
-       $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');
-
-       return;
-}

diff --git a/include/tagupdate.php b/include/tagupdate.php
deleted file mode 100644 (file)
index 1e97135..0000000
--- a/include/tagupdate.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once("include/tags.php");
-
-function tagupdate_run(&$argv, &$argc){
-       update_items();
-}

diff --git a/include/threadupdate.php b/include/threadupdate.php
deleted file mode 100644 (file)
index 3a40286..0000000
--- a/include/threadupdate.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-require_once("include/threads.php");
-
-function threadupdate_run(&$argv, &$argc){
-       update_threads();
-       update_threads_mention();
-}

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
deleted file mode 100644 (file)
index 9537787..0000000
--- a/include/update_gcontact.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * @file include/update_gcontact.php
- */
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
-
-function update_gcontact_run(&$argv, &$argc) {
-       global $a;
-
-       logger('update_gcontact: start');
-
-       if (($argc > 1) && (intval($argv[1]))) {
-               $contact_id = intval($argv[1]);
-       }
-
-       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"]))
-                       );
-}

diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
new file mode 100644 (file)
index 0000000..7d3c2de
--- /dev/null
+++ b/src/Worker/CheckVersion.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file include/checkversion.php
+ *
+ * @brief save Friendica upstream version to the DB
+ **/
+
+use Friendica\Core\Config;
+
+/**
+ * @brief check the git repository VERSION file and save the version to the DB
+ *
+ * Checking the upstream version is optional (opt-in) and can be done to either
+ * the master or the develop branch in the repository.
+ */
+function checkversion_run () {
+       global $a;
+
+       logger('checkversion: start');
+
+       $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');
+
+       return;
+}

diff --git a/src/Worker/TagUpdate.php b/src/Worker/TagUpdate.php
new file mode 100644 (file)
index 0000000..1e97135
--- /dev/null
+++ b/src/Worker/TagUpdate.php
@@ -0,0 +1,6 @@
+<?php
+require_once("include/tags.php");
+
+function tagupdate_run(&$argv, &$argc){
+       update_items();
+}

diff --git a/src/Worker/ThreadUpdate.php b/src/Worker/ThreadUpdate.php
new file mode 100644 (file)
index 0000000..3a40286
--- /dev/null
+++ b/src/Worker/ThreadUpdate.php
@@ -0,0 +1,7 @@
+<?php
+require_once("include/threads.php");
+
+function threadupdate_run(&$argv, &$argc){
+       update_threads();
+       update_threads_mention();
+}

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
new file mode 100644 (file)
index 0000000..9537787
--- /dev/null
+++ b/src/Worker/UpdateGContact.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @file include/update_gcontact.php
+ */
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Network\Probe;
+use Friendica\Protocol\PortableContact;
+
+function update_gcontact_run(&$argv, &$argc) {
+       global $a;
+
+       logger('update_gcontact: start');
+
+       if (($argc > 1) && (intval($argv[1]))) {
+               $contact_id = intval($argv[1]);
+       }
+
+       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"]))
+                       );
+}