]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_request.php
added spaces + curly braces
[friendica.git] / mod / dfrn_request.php
index 2a9f68eabd7f8e82ed24903295475d03df925c1c..14ea0fdd4a9773d6c04515f2cd6065ec301f791d 100644 (file)
@@ -1,19 +1,22 @@
 <?php
 
 /**
- *
- * Module: dfrn_request
+ * @file mod/dfrn_request.php
+ * @brief Module: dfrn_request
  *
  * Purpose: Handles communication associated with the issuance of
  * friend requests.
  *
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *    You also find a graphic which describes the confirmation process at
+ *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
 
 require_once('include/enotify.php');
 require_once('include/Scrape.php');
+require_once('include/Probe.php');
 require_once('include/group.php');
 
-if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
        if($a->argc > 1)
@@ -21,7 +24,7 @@ function dfrn_request_init(&$a) {
 
        profile_load($a,$which);
        return;
-}}
+}
 
 
 /**
@@ -39,8 +42,6 @@ function dfrn_request_init(&$a) {
  * After logging in, we click 'submit' to approve the linkage.
  *
  */
-
-if(! function_exists('dfrn_request_post')) {
 function dfrn_request_post(&$a) {
 
        if(($a->argc != 2) || (! count($a->profile))) {
@@ -54,7 +55,7 @@ function dfrn_request_post(&$a) {
        }
 
 
-       /**
+       /*
         *
         * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
         * to confirm the request, and then we've clicked submit (perhaps after logging in).
@@ -64,7 +65,7 @@ function dfrn_request_post(&$a) {
 
        if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
 
-               /**
+               /*
                 * Ensure this is a valid request
                 */
 
@@ -76,23 +77,24 @@ function dfrn_request_post(&$a) {
                        $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
                        $hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
                        $contact_record = null;
+                       $blocked = 1;
+                       $pending = 1;
 
                        if(x($dfrn_url)) {
 
-                               /**
+                               /*
                                 * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
                                 */
 
-                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
+                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
                                        intval(local_user()),
-                                       dbesc($dfrn_url),
                                        dbesc(normalise_link($dfrn_url))
                                );
 
-                               if(count($r)) {
+                               if (dbm::is_result($r)) {
                                        if(strlen($r[0]['dfrn-id'])) {
 
-                                               /**
+                                               /*
                                                 * We don't need to be here. It has already happened.
                                                 */
 
@@ -112,11 +114,11 @@ function dfrn_request_post(&$a) {
                                }
                                else {
 
-                                       /**
+                                       /*
                                         * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
                                         */
 
-                                       $parms = scrape_dfrn($dfrn_url);
+                                       $parms = Probe::profile($dfrn_url);
 
                                        if(! count($parms)) {
                                                notice( t('Profile location is not valid or does not contain profile information.') . EOL );
@@ -127,7 +129,7 @@ function dfrn_request_post(&$a) {
                                                        notice( t('Warning: profile location has no identifiable owner name.') . EOL );
                                                if(! x($parms,'photo'))
                                                        notice( t('Warning: profile location has no profile photo.') . EOL );
-                                               $invalid = validate_dfrn($parms);
+                                               $invalid = Probe::valid_dfrn($parms);
                                                if($invalid) {
                                                        notice( sprintf( tt("%d required parameter was not found at the given location",
                                                                                                "%d required parameters were not found at the given location",
@@ -140,19 +142,18 @@ function dfrn_request_post(&$a) {
 
                                        $photo = $parms["photo"];
 
-                                       /********* Escape the entire array ********/
+                                       // Escape the entire array
 
                                        dbesc_array($parms);
 
-                                       /******************************************/
 
-                                       /**
+                                       /*
                                         * Create a contact record on our site for the other person
                                         */
 
                                        $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
-                                               `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
-                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+                                               `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
+                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
@@ -169,7 +170,9 @@ function dfrn_request_post(&$a) {
                                                $parms['dfrn-poco'],
                                                dbesc(NETWORK_DFRN),
                                                intval($aes_allow),
-                                               intval($hidden)
+                                               intval($hidden),
+                                               intval($blocked),
+                                               intval($pending)
                                        );
                                }
 
@@ -182,7 +185,7 @@ function dfrn_request_post(&$a) {
                                        dbesc($dfrn_url),
                                        $parms['key'] // this was already escaped
                                );
-                               if(count($r)) {
+                               if (dbm::is_result($r)) {
                                        $def_gid = get_default_group(local_user(), $r[0]["network"]);
                                        if(intval($def_gid))
                                                group_add_member(local_user(), '', $r[0]['id'], $def_gid);
@@ -190,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)
 
@@ -221,7 +227,7 @@ function dfrn_request_post(&$a) {
                return; // NOTREACHED
        }
 
-       /**
+       /*
         * Otherwise:
         *
         * Scenario 1:
@@ -255,11 +261,13 @@ function dfrn_request_post(&$a) {
        $contact_record = null;
        $failed         = false;
        $parms          = null;
+       $blocked = 1;
+       $pending = 1;
 
 
        if( x($_POST,'dfrn_url')) {
 
-               /**
+               /*
                 * Block friend request spam
                 */
 
@@ -268,7 +276,7 @@ function dfrn_request_post(&$a) {
                                dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
                                intval($uid)
                        );
-                       if(count($r) > $maxreq) {
+                       if (dbm::is_result($r) && count($r) > $maxreq) {
                                notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
                                notice( t('Spam protection measures have been invoked.') . EOL);
                                notice( t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -276,7 +284,7 @@ function dfrn_request_post(&$a) {
                        }
                }
 
-               /**
+               /*
                 *
                 * Cleanup old introductions that remain blocked.
                 * Also remove the contact record, but only if there is no existing relationship
@@ -290,7 +298,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -303,7 +311,7 @@ function dfrn_request_post(&$a) {
                        }
                }
 
-               /**
+               /*
                 *
                 * Cleanup any old email intros - which will have a greater lifetime
                 */
@@ -315,7 +323,7 @@ function dfrn_request_post(&$a) {
                        AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
                        dbesc(NETWORK_MAIL2)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        foreach($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
@@ -353,8 +361,6 @@ function dfrn_request_post(&$a) {
                        $nurl    = normalise_url($host);
                        $poll    = 'email ' . random_string();
                        $notify  = 'smtp ' . random_string();
-                       $blocked = 1;
-                       $pending = 1;
                        $network = NETWORK_MAIL2;
                        $rel     = CONTACT_IS_FOLLOWER;
 
@@ -367,8 +373,8 @@ function dfrn_request_post(&$a) {
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval($uid)
                                );
-                               if(! count($r)) {
 
+                               if (! dbm::is_result($r)) {
                                        notice( t('This account has not been configured for email. Request failed.') . EOL);
                                        return;
                                }
@@ -395,7 +401,7 @@ function dfrn_request_post(&$a) {
                                dbesc($poll),
                                intval($uid)
                        );
-                       if(count($r)) {
+                       if (dbm::is_result($r)) {
                                $contact_id = $r[0]['id'];
 
                                $def_gid = get_default_group($uid, $r[0]["network"]);
@@ -428,8 +434,8 @@ function dfrn_request_post(&$a) {
 
                        $hash = random_string();
 
-                       $r = q("insert into intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
-                               values( %d , %d, %d, '%s', '%s', '%s', %d ) ",
+                       $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),
                                ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
@@ -447,7 +453,7 @@ function dfrn_request_post(&$a) {
                        $network = $data["network"];
 
                        // Canonicalise email-style profile locator
-                       $url = webfinger_dfrn($url,$hcard);
+                       $url = Probe::webfinger_dfrn($url,$hcard);
 
                        if (substr($url,0,5) === 'stat:') {
 
@@ -470,7 +476,7 @@ function dfrn_request_post(&$a) {
                                dbesc($url)
                        );
 
-                       if(count($ret)) {
+                       if (dbm::is_result($ret)) {
                                if(strlen($ret[0]['issued-id'])) {
                                        notice( t('You have already introduced yourself here.') . EOL );
                                        return;
@@ -498,31 +504,31 @@ 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
                                }
 
 
                                require_once('include/Scrape.php');
 
-                               $parms = scrape_dfrn(($hcard) ? $hcard : $url);
+                               $parms = Probe::profile(($hcard) ? $hcard : $url);
 
                                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'))
                                                notice( t('Warning: profile location has no identifiable owner name.') . EOL );
                                        if(! x($parms,'photo'))
                                                notice( t('Warning: profile location has no profile photo.') . EOL );
-                                       $invalid = validate_dfrn($parms);
+                                       $invalid = Probe::valid_dfrn($parms);
                                        if($invalid) {
                                                notice( sprintf( tt("%d required parameter was not found at the given location",
                                                                                        "%d required parameters were not found at the given location",
@@ -539,8 +545,8 @@ function dfrn_request_post(&$a) {
 
                                dbesc_array($parms);
                                $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
-                                       `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
                                        intval($uid),
                                        dbesc(datetime_convert()),
                                        $parms['url'],
@@ -556,32 +562,34 @@ function dfrn_request_post(&$a) {
                                        $parms['dfrn-notify'],
                                        $parms['dfrn-poll'],
                                        $parms['dfrn-poco'],
-                                       dbesc(NETWORK_DFRN)
+                                       dbesc(NETWORK_DFRN),
+                                       intval($blocked),
+                                       intval($pending)
                                );
 
                                // 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),
                                                $parms['url'],
                                                $parms['issued-id']
                                        );
-                                       if(count($r)) {
+                                       if (dbm::is_result($r)) {
                                                $contact_record = $r[0];
                                                update_contact_avatar($photo, $uid, $contact_record["id"], true);
                                        }
                                }
 
                        }
-                       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),
@@ -595,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"
@@ -612,7 +621,7 @@ function dfrn_request_post(&$a) {
                        // END $network === NETWORK_DFRN
                } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
 
-                       /**
+                       /*
                         *
                         * Substitute our user's feed URL into $url template
                         * Send the subscriber home to subscribe
@@ -628,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);
@@ -641,24 +651,22 @@ function dfrn_request_post(&$a) {
                }
 
        }       return;
-}}
-
-
+}
 
 
-if(! function_exists('dfrn_request_content')) {
 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;
@@ -718,7 +726,7 @@ function dfrn_request_content(&$a) {
                        dbesc($_GET['confirm_key'])
                );
 
-               if(count($intro)) {
+               if (dbm::is_result($intro)) {
 
                        $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                                WHERE `contact`.`id` = %d LIMIT 1",
@@ -727,7 +735,7 @@ function dfrn_request_content(&$a) {
 
                        $auto_confirm = false;
 
-                       if(count($r)) {
+                       if (dbm::is_result($r)) {
                                if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
                                        $auto_confirm = true;
 
@@ -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'],
@@ -752,11 +760,11 @@ function dfrn_request_content(&$a) {
                                if($auto_confirm) {
                                        require_once('mod/dfrn_confirm.php');
                                        $handsfree = array(
-                                               'uid' => $r[0]['uid'],
-                                               'node' => $r[0]['nickname'],
-                                               'dfrn_id' => $r[0]['issued-id'],
+                                               'uid'      => $r[0]['uid'],
+                                               'node'     => $r[0]['nickname'],
+                                               'dfrn_id'  => $r[0]['issued-id'],
                                                'intro_id' => $intro[0]['id'],
-                                               'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
+                                               'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
                                                'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
                                        );
                                        dfrn_confirm_post($a,$handsfree);
@@ -780,7 +788,7 @@ function dfrn_request_content(&$a) {
        }
        else {
 
-               /**
+               /*
                 * Normal web request. Display our user's introduction form.
                 */
 
@@ -792,7 +800,7 @@ function dfrn_request_content(&$a) {
                }
 
 
-               /**
+               /*
                 * Try to auto-fill the profile address
                 */
 
@@ -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 );
@@ -815,7 +823,7 @@ function dfrn_request_content(&$a) {
                $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 
 
-               /**
+               /*
                 *
                 * The auto_request form only has the profile address
                 * because nobody is going to read the comments and
@@ -840,8 +848,9 @@ function dfrn_request_content(&$a) {
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                intval($a->profile['uid'])
                        );
-                       if(! count($r))
+                       if (! dbm::is_result($r)) {
                                $mail_disabled = 1;
+                       }
                }
 
                // "coming soon" is disabled for now
@@ -880,4 +889,4 @@ function dfrn_request_content(&$a) {
        }
 
        return; // Somebody is fishing.
-}}
+}