opps, re-introduced this out-dated code by mistake

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 5787439c1ff57d6be9e6e7bf346c007ad368ba07..bb6d8c198178a9002ee0ade07daff13c0ba94d49 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Network\Probe;
 
 // Included here for completeness, but this is a very dangerous operation.
 // It is the caller's responsibility to confirm the requestor's intent and
@@ -22,29 +23,7 @@ function user_remove($uid) {
                $r[0]['nickname']
        );
 
-       /// @todo Should be done in a background job since this likely will run into a time out
-       // don't delete yet, will be done later when contacts have deleted my stuff
-       // q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `item_id` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `mailacct` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `manage` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `notify` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `attach` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `search` WHERE `uid` = %d", intval($uid));
-       q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid));
-       // don't delete yet, will be done later when contacts have deleted my stuff
-       // q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
+       // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
        q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
        proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
 
@@ -363,7 +342,6 @@ function get_contact_details_by_addr($addr, $uid = -1) {
                                dbesc($addr));
 
        if (!dbm::is_result($r)) {
-               require_once('include/Probe.php');
                $data = Probe::uri($addr);
 
                $profile = get_contact_details_by_url($data['url'], $uid);
@@ -589,7 +567,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
                return 0;
        }
 
-       require_once('include/Probe.php');
        $data = Probe::uri($url);
 
        // Last try in gcontact for unsupported networks