Resubmit all profiles on directory change

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 5b0599449f6518f7fd71603d00fa820deab54a69..4e86b32977695c361de3b120aab84d6fc45012db 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -127,7 +127,7 @@ function mark_for_death($contact) {
        if($contact['archive'])
                return;
 
-       if($contact['term-date'] == '0000-00-00 00:00:00') {
+       if ($contact['term-date'] <= NULL_DATE) {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                                dbesc(datetime_convert()),
                                intval($contact['id'])
@@ -185,13 +185,13 @@ function unmark_for_death($contact) {
 
        // It's a miracle. Our dead contact has inexplicably come back to life.
        q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
-               dbesc('0000-00-00 00:00:00'),
+               dbesc(NULL_DATE),
                intval($contact['id'])
        );
 
        if ($contact['url'] != '') {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
-                       dbesc('0000-00-00 00:00:00'),
+                       dbesc(NULL_DATE),
                        dbesc(normalise_link($contact['url']))
                );
        }
@@ -254,7 +254,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 
                // "bd" always contains the upcoming birthday of a contact.
                // "birthday" might contain the birthday including the year of birth.
-               if ($profile["birthday"] != "0000-00-00") {
+               if ($profile["birthday"] > '0001-01-01') {
                        $bd_timestamp = strtotime($profile["birthday"]);
                        $month = date("m", $bd_timestamp);
                        $day = date("d", $bd_timestamp);
@@ -271,7 +271,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
                                $profile["bd"] = (++$current_year)."-".$month."-".$day;
                        }
                } else {
-                       $profile["bd"] = "0000-00-00";
+                       $profile["bd"] = '0001-01-01';
                }
        } else {
                $profile = $default;
@@ -307,7 +307,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
                $profile["location"] = "";
                $profile["about"] = "";
                $profile["gender"] = "";
-               $profile["birthday"] = "0000-00-00";
+               $profile["birthday"] = '0001-01-01';
        }
 
        $cache[$url][$uid] = $profile;
@@ -578,8 +578,8 @@ function get_contact($url, $uid = 0, $no_update = false) {
        require_once('include/Probe.php');
        $data = Probe::uri($url);
 
-       // Does this address belongs to a valid network?
-       if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+       // Last try in gcontact for unsupported networks
+       if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) {
                if ($uid != 0) {
                        return 0;
                }
@@ -594,11 +594,6 @@ function get_contact($url, $uid = 0, $no_update = false) {
                $data = $gcontacts[0];
        }
 
-       // Unable to convert nick@server.tld into http://server.tld/nick
-       if (!$data['url'] && (!strstr($url, "http") OR strstr($url, "@"))) {
-               return 0;
-       }
-
        $url = $data["url"];
 
        if (!$contact_id) {
@@ -707,15 +702,6 @@ function posts_from_gcontact(App $a, $gcontact_id) {
        else
                $sql = "`item`.`uid` = %d";
 
-       if(get_config('system', 'old_pager')) {
-               $r = q("SELECT COUNT(*) AS `total` FROM `item`
-                       WHERE `gcontact-id` = %d and $sql",
-                       intval($gcontact_id),
-                       intval(local_user()));
-
-               $a->set_pager_total($r[0]['total']);
-       }
-
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                        `author-name` AS `name`, `owner-avatar` AS `photo`,
                        `owner-link` AS `url`, `owner-avatar` AS `thumb`
@@ -729,13 +715,9 @@ function posts_from_gcontact(App $a, $gcontact_id) {
                intval($a->pager['itemspage'])
        );
 
-       $o = conversation($a,$r,'community',false);
+       $o = conversation($a, $r, 'community', false);
 
-       if(!get_config('system', 'old_pager')) {
-               $o .= alt_pager($a,count($r));
-       } else {
-               $o .= paginate($a);
-       }
+       $o .= alt_pager($a, count($r));
 
        return $o;
 }
@@ -768,15 +750,6 @@ function posts_from_contact_url(App $a, $contact_url) {
 
        $author_id = intval($r[0]["author-id"]);
 
-       if (get_config('system', 'old_pager')) {
-               $r = q("SELECT COUNT(*) AS `total` FROM `item`
-                       WHERE `author-id` = %d and $sql",
-                       intval($author_id),
-                       intval(local_user()));
-
-               $a->set_pager_total($r[0]['total']);
-       }
-
        $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
                " ORDER BY `item`.`created` DESC LIMIT %d, %d",
                intval($author_id),
@@ -785,13 +758,9 @@ function posts_from_contact_url(App $a, $contact_url) {
                intval($a->pager['itemspage'])
        );
 
-       $o = conversation($a,$r,'community',false);
+       $o = conversation($a, $r, 'community', false);
 
-       if (!get_config('system', 'old_pager')) {
-               $o .= alt_pager($a,count($r));
-       } else {
-               $o .= paginate($a);
-       }
+       $o .= alt_pager($a, count($r));
 
        return $o;
 }