Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 9fd61f8d5e959aba3891e7de2dc0d8395eb91d1c..dc29d38257a38a6cca4f0ae60c7f0df152215661 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -5,7 +5,7 @@
 // authorisation to do this.
 
 function user_remove($uid) {
-       if(! $uid)
+       if (! $uid)
                return;
        logger('Removing user: ' . $uid);
 
@@ -49,7 +49,7 @@ function user_remove($uid) {
        // Send an update to the directory
        proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']);
 
-       if($uid == local_user()) {
+       if ($uid == local_user()) {
                unset($_SESSION['authenticated']);
                unset($_SESSION['uid']);
                goaway(App::get_baseurl());
@@ -122,12 +122,14 @@ function terminate_friendship($user,$self,$contact) {
 // This provides for the possibility that their database is temporarily messed
 // up or some other transient event and that there's a possibility we could recover from it.
 
-function mark_for_death($contact) {
+function mark_for_death(array $contact) {
 
-       if($contact['archive'])
+       if ($contact['archive']) {
                return;
+       }
 
-       if($contact['term-date'] == '0000-00-00 00:00:00') {
+       /// @TODO Comparison of strings this way may lead to bugs/incompatibility, better switch to DateTime
+       if ($contact['term-date'] <= NULL_DATE) {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                                dbesc(datetime_convert()),
                                intval($contact['id'])
@@ -151,7 +153,7 @@ function mark_for_death($contact) {
                /// Check for contact vitality via probing
 
                $expiry = $contact['term-date'] . ' + 32 days ';
-               if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
+               if (datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
                        // relationship is really truly dead.
                        // archive them rather than delete
@@ -185,13 +187,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']))
                );
        }
@@ -483,7 +485,7 @@ function random_profile() {
 
 function contacts_not_grouped($uid,$start = 0,$count = 0) {
 
-       if(! $count) {
+       if (! $count) {
                $r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
                        intval($uid),
                        intval($uid)
@@ -775,18 +777,18 @@ function posts_from_contact_url(App $a, $contact_url) {
 function formatted_location($profile) {
        $location = '';
 
-       if($profile['locality'])
+       if ($profile['locality'])
                $location .= $profile['locality'];
 
-       if($profile['region'] AND ($profile['locality'] != $profile['region'])) {
-               if($location)
+       if ($profile['region'] AND ($profile['locality'] != $profile['region'])) {
+               if ($location)
                        $location .= ', ';
 
                $location .= $profile['region'];
        }
 
-       if($profile['country-name']) {
-               if($location)
+       if ($profile['country-name']) {
+               if ($location)
                        $location .= ', ';
 
                $location .= $profile['country-name'];
@@ -808,7 +810,7 @@ function account_type($contact) {
        // "page-flags" is a field in the user table,
        // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
        // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
-       if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
+       if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
                || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
                || (isset($contact['forum']) && intval($contact['forum']))
                || (isset($contact['prv']) && intval($contact['prv']))