added spaces + curly braces

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 390eaff86dc755c0526f3f3638b2e3c888944f11..14ea0fdd4a9773d6c04515f2cd6065ec301f791d 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -193,19 +193,22 @@ function dfrn_request_post(&$a) {
                                        if (isset($photo))
                                                update_contact_avatar($photo, local_user(), $r[0]["id"], true);
 
-                                       $forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
-                               } else
-                                       $forwardurl = $a->get_baseurl()."/contacts";
+                                       $forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
+                               } else {
+                                       $forwardurl = App::get_baseurl()."/contacts";
+                               }
 
                                /*
                                 * Allow the blocked remote notification to complete
                                 */
 
-                               if(is_array($contact_record))
+                               if (is_array($contact_record)) {
                                        $dfrn_request = $contact_record['request'];
+                               }
 
-                               if(strlen($dfrn_request) && strlen($confirm_key))
+                               if (strlen($dfrn_request) && strlen($confirm_key)) {
                                        $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+                               }
 
                                // (ignore reply, nothing we can do it failed)
 
@@ -371,7 +374,7 @@ function dfrn_request_post(&$a) {
                                        intval($uid)
                                );
 
-                               if(! dbm::is_result($r)) {
+                               if (! dbm::is_result($r)) {
                                        notice( t('This account has not been configured for email. Request failed.') . EOL);
                                        return;
                                }
@@ -431,7 +434,7 @@ function dfrn_request_post(&$a) {
 
                        $hash = random_string();
 
-                       $r = q("INSERT INTO intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
+                       $r = q("INSERT INTO `intro` ( `uid`, `contact-id`, knowyou, note, hash, datetime, blocked )
                                VALUES( %d , %d, %d, '%s', '%s', '%s', %d ) ",
                                intval($uid),
                                intval($contact_id),
@@ -465,6 +468,8 @@ function dfrn_request_post(&$a) {
                                $network = NETWORK_DFRN;
                }
 
+               logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
+
                if($network === NETWORK_DFRN) {
                        $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
                                intval($uid),
@@ -499,13 +504,13 @@ function dfrn_request_post(&$a) {
                        else {
                                if(! validate_url($url)) {
                                        notice( t('Invalid profile URL.') . EOL);
-                                       goaway($a->get_baseurl() . '/' . $a->cmd);
+                                       goaway(App::get_baseurl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
                                if(! allowed_url($url)) {
                                        notice( t('Disallowed profile URL.') . EOL);
-                                       goaway($a->get_baseurl() . '/' . $a->cmd);
+                                       goaway(App::get_baseurl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
@@ -516,7 +521,7 @@ function dfrn_request_post(&$a) {
 
                                if(! count($parms)) {
                                        notice( t('Profile location is not valid or does not contain profile information.') . EOL );
-                                       goaway($a->get_baseurl() . '/' . $a->cmd);
+                                       goaway(App::get_baseurl() . '/' . $a->cmd);
                                }
                                else {
                                        if(! x($parms,'fn'))
@@ -563,7 +568,7 @@ function dfrn_request_post(&$a) {
                                );
 
                                // find the contact record we just created
-                               if($r) {
+                               if ($r) {
                                        $r = q("SELECT `id` FROM `contact`
                                                WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
                                                intval($uid),
@@ -577,14 +582,14 @@ function dfrn_request_post(&$a) {
                                }
 
                        }
-                       if($r === false) {
+                       if ($r === false) {
                                notice( t('Failed to update contact record.') . EOL );
                                return;
                        }
 
                        $hash = random_string() . (string) time();   // Generate a confirm_key
 
-                       if(is_array($contact_record)) {
+                       if (is_array($contact_record)) {
                                $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
                                        VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
                                        intval($uid),
@@ -598,12 +603,13 @@ function dfrn_request_post(&$a) {
 
                        // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 
-                       if(! $failed)
+                       if (! $failed) {
                                info( t('Your introduction has been sent.') . EOL );
+                       }
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
 
-                       $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
+                       $dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
                        $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
                        goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -631,8 +637,9 @@ function dfrn_request_post(&$a) {
                                        $uri .= '/'.$a->get_path();
 
                                $uri = urlencode($uri);
-                       } else
-                               $uri = $a->get_baseurl().'/profile/'.$nickname;
+                       } else {
+                               $uri = App::get_baseurl().'/profile/'.$nickname;
+                       }
 
                        $url = str_replace('{uri}', $uri, $url);
                        goaway($url);
@@ -649,16 +656,17 @@ function dfrn_request_post(&$a) {
 
 function dfrn_request_content(&$a) {
 
-       if(($a->argc != 2) || (! count($a->profile)))
+       if (($a->argc != 2) || (! count($a->profile))) {
                return "";
+       }
 
 
        // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
        // to send us to the post section to record the introduction.
 
-       if(x($_GET,'dfrn_url')) {
+       if (x($_GET,'dfrn_url')) {
 
-               if(! local_user()) {
+               if (! local_user()) {
                        info( t("Please login to confirm introduction.") . EOL );
                        /* setup the return URL to come back to this page if they use openid */
                        $_SESSION['return_url'] = $a->query_string;
@@ -740,7 +748,7 @@ function dfrn_request_content(&$a) {
                                                'to_name'      => $r[0]['username'],
                                                'to_email'     => $r[0]['email'],
                                                'uid'          => $r[0]['uid'],
-                                               'link'         => $a->get_baseurl() . '/notifications/intros',
+                                               'link'         => App::get_baseurl() . '/notifications/intros',
                                                'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
                                                'source_link'  => $r[0]['url'],
                                                'source_photo' => $r[0]['photo'],
@@ -804,7 +812,7 @@ function dfrn_request_content(&$a) {
                        $myaddr = $_GET['address'];
                elseif(local_user()) {
                        if(strlen($a->path)) {
-                               $myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+                               $myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
                        }
                        else {
                                $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
@@ -840,8 +848,9 @@ function dfrn_request_content(&$a) {
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                intval($a->profile['uid'])
                        );
-                       if(! dbm::is_result($r))
+                       if (! dbm::is_result($r)) {
                                $mail_disabled = 1;
+                       }
                }
 
                // "coming soon" is disabled for now