Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 69d708f7fc3e9b99f540f300c7f3b38a0440a555..ba8e27431fc31b675cb6784e839f595f399352ef 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -415,23 +415,26 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        );
                }
 
-               if($r === false)
-                               notice( t('Unable to set contact photo.') . EOL);
+               /// @TODO is dbm::is_result() working here?
+               if ($r === false) {
+                       notice( t('Unable to set contact photo.') . EOL);
+               }
 
                // reload contact info
 
                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($contact_id)
                );
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $contact = $r[0];
-               else
+               } else {
                        $contact = null;
+               }
 
 
-               if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
+               if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
-                       if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
+                       if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
                                require_once('include/diaspora.php');
                                $ret = diaspora::send_share($user[0],$r[0]);
                                logger('share returns: ' . $ret);
@@ -661,10 +664,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($dfrn_record));
 
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $photo = $r[0]['photo'];
-               else
+               } else {
                        $photo = App::get_baseurl() . '/images/person-175.jpg';
+               }
 
                require_once("include/Photo.php");
 
@@ -673,11 +677,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                logger('dfrn_confirm: request - photos imported');
 
                $new_relation = CONTACT_IS_SHARING;
-               if(($relation == CONTACT_IS_FOLLOWER) || ($duplex))
+               if (($relation == CONTACT_IS_FOLLOWER) || ($duplex)) {
                        $new_relation = CONTACT_IS_FRIEND;
+               }
 
-               if(($relation == CONTACT_IS_FOLLOWER) && ($duplex))
+               if (($relation == CONTACT_IS_FOLLOWER) && ($duplex)) {
                        $duplex = 0;
+               }
 
                $r = q("UPDATE `contact` SET
                        `rel` = %d,
@@ -699,7 +705,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        dbesc(NETWORK_DFRN),
                        intval($dfrn_record)
                );
-               if($r === false) {    // indicates schema is messed up or total db failure
+               if ($r === false) {    // indicates schema is messed up or total db failure
                        $message = t('Unable to update your contact profile details on our system');
                        xml_status(3,$message);
                }