Refactor datetime_convert into Temporal::convert

[friendica.git] / src / Model / GContact.php

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 231970820f99c32c081aeaf221f563b7e08d08ce..1e0adac4940aa6d31d54b36d0b0783cf01a4506c 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file src/Model/GlobalContact.php
  * @brief This file includes the GlobalContact class with directory related functions
@@ -14,12 +15,12 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 use Exception;
 
 require_once 'include/datetime.php';
 require_once 'include/dba.php';
-require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
 
 /**
@@ -119,12 +120,12 @@ class GContact
                                intval($uid),
                                intval($gcid),
                                intval($zcid),
-                               dbesc(datetime_convert())
+                               dbesc(Temporal::convert())
                        );
                } else {
                        q(
                                "UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
                                intval($cid),
                                intval($uid),
                                intval($gcid),
@@ -569,7 +570,7 @@ class GContact
                $done[] = System::baseUrl() . '/poco';
 
                if (strlen(Config::get('system', 'directory'))) {
-                       $x = Network::fetchURL(get_server()."/pubsites");
+                       $x = Network::fetchUrl(get_server()."/pubsites");
                        if ($x) {
                                $j = json_decode($x);
                                if ($j->entries) {
@@ -716,8 +717,8 @@ class GContact
                                dbesc($contact["url"]),
                                dbesc(normalise_link($contact["url"])),
                                dbesc($contact["photo"]),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
+                               dbesc(Temporal::convert()),
+                               dbesc(Temporal::convert()),
                                dbesc($contact["location"]),
                                dbesc($contact["about"]),
                                intval($contact["hide"]),
@@ -981,7 +982,7 @@ class GContact
 
                $url = $server."/main/statistics";
 
-               $result = Network::zFetchURL($url);
+               $result = Network::curl($url);
                if (!$result["success"]) {
                        return false;
                }
@@ -1049,7 +1050,7 @@ class GContact
 
                foreach ($r as $server) {
                        self::fetchGsUsers($server["url"]);
-                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(Temporal::convert()), dbesc($server["nurl"]));
                }
        }