Now there are four more ...

diff --git a/include/Contact.php b/include/Contact.php
index cd77bb3bb91a5ee53f56c44aed4930cb4265c149..3fa2410fbfa2033bfae7264a17483e6ac2315eae 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -308,7 +308,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 
        if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) &&
                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

diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index 7d3c2de6f7f676a48e359bd4873643cd6558837b..b7e99cb67ec201b9ecc0b72a350abb94c77c3037 100644 (file)
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -1,10 +1,11 @@
 <?php
 
 /**
- * @file include/checkversion.php
+ * @file src/Worker/CheckVersion.php
  *
  * @brief save Friendica upstream version to the DB
  **/
+namespace Friendica\Worker;
 
 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
  * 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);
+class CheckVersion {
+       public static function execute() {
+               global $a;
+
+               logger('checkversion: start');
 
-       // fetch the VERSION file
-       $gitversion = dbesc(trim(fetch_url($checked_url)));
-       logger("Upstream VERSION is: ".$gitversion, LOGGER_DEBUG);
+               $checkurl = Config::get('system', 'check_new_version_url', 'none');
 
-       Config::set('system', 'git_friendica_version', $gitversion);
+               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);
 
-       logger('checkversion: end');
+               // fetch the VERSION file
+               $gitversion = dbesc(trim(fetch_url($checked_url)));
+               logger("Upstream VERSION is: ".$gitversion, LOGGER_DEBUG);
 
-       return;
+               Config::set('system', 'git_friendica_version', $gitversion);
+
+               logger('checkversion: end');
+
+               return;
+       }
 }

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index c859824755a1a5ee79ff12b6fbd3b10c98874dc2..00b28b6a52ce6704e9c4510b33aefe884839f6f5 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -85,7 +85,7 @@ Class Cron {
                        dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
 
                        // check upstream version?
-                       Worker::add(PRIORITY_LOW, 'checkversion');
+                       Worker::add(PRIORITY_LOW, 'CheckVersion');
                }
 
                // Poll contacts

diff --git a/src/Worker/TagUpdate.php b/src/Worker/TagUpdate.php
index 1e97135c5b05fa6a038b3b6f001f3471be175bee..93423ecb2a7fa5729398c0563ca8a0a0dd882401 100644 (file)
--- a/src/Worker/TagUpdate.php
+++ b/src/Worker/TagUpdate.php
@@ -1,6 +1,10 @@
 <?php
+namespace Friendica\Worker;
+
 require_once("include/tags.php");
 
-function tagupdate_run(&$argv, &$argc){
-       update_items();
+class TagUpdate {
+       public static function execute() {
+               update_items();
+       }
 }

diff --git a/src/Worker/ThreadUpdate.php b/src/Worker/ThreadUpdate.php
index 3a4028603eb7236ce7da362c0f3a26a70fd27bc5..30af76399f0f32d93cceba58fd7d3255898c21e2 100644 (file)
--- a/src/Worker/ThreadUpdate.php
+++ b/src/Worker/ThreadUpdate.php
@@ -1,7 +1,11 @@
 <?php
+namespace Friendica\Worker;
+
 require_once("include/threads.php");
 
-function threadupdate_run(&$argv, &$argc){
-       update_threads();
-       update_threads_mention();
+class ThreadUpdate {
+       public static function execute() {
+               update_threads();
+               update_threads_mention();
+       }
 }

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 953778786e94108f6ec1034d64dad8cda5a10187..087028aa3f44727ccdad479c7b909e90535ca649 100644 (file)
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -1,81 +1,79 @@
 <?php
 /**
- * @file include/update_gcontact.php
+ * @file src/Worker/UpdateGcontact.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;
+class UpdateGContact {
+       public static function execute($contact_id) {
+               global $a;
 
-       logger('update_gcontact: start');
+               logger('update_gcontact: start');
 
-       if (($argc > 1) && (intval($argv[1]))) {
-               $contact_id = intval($argv[1]);
-       }
+               if (empty($contact_id)) {
+                       logger('update_gcontact: no contact');
+                       return;
+               }
 
-       if (!$contact_id) {
-               logger('update_gcontact: no contact');
-               return;
-       }
+               $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-       $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
+               if (!DBM::is_result($r)) {
+                       return;
+               }
 
-       if (!DBM::is_result($r)) {
-               return;
-       }
+               if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+                       return;
+               }
 
-       if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-               return;
-       }
+               $data = Probe::uri($r[0]["url"]);
 
-       $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"]);
 
-       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;
+               }
 
-               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["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 (($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/update.php b/update.php
index 0b482535df5d9ac04c1ea805c0e76c280027f346..5cf9bbc2d4e437719680e454092ab31f1bca6f26 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1601,7 +1601,7 @@ function update_1169() {
        if (!$r)
                return UPDATE_FAILED;
 
-       Worker::add(PRIORITY_LOW, "threadupdate");
+       Worker::add(PRIORITY_LOW, "ThreadUpdate");
 
        return UPDATE_SUCCESS;
 }
@@ -1650,7 +1650,7 @@ function update_1178() {
 function update_1180() {
 
        // Fill the new fields in the term table.
-       Worker::add(PRIORITY_LOW, "tagupdate");
+       Worker::add(PRIORITY_LOW, "TagUpdate");
 
        return UPDATE_SUCCESS;
 }