Merge pull request #3110 from tobiasd/20170127-translationdocs

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 14ea0fdd4a9773d6c04515f2cd6065ec301f791d..9e5f022d1bf12f398512603da6d53120a426f830 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -17,7 +17,7 @@ require_once('include/Scrape.php');
 require_once('include/Probe.php');
 require_once('include/group.php');
 
-function dfrn_request_init(&$a) {
+function dfrn_request_init(App $a) {
 
        if($a->argc > 1)
                $which = $a->argv[1];
@@ -42,7 +42,7 @@ function dfrn_request_init(&$a) {
  * After logging in, we click 'submit' to approve the linkage.
  *
  */
-function dfrn_request_post(&$a) {
+function dfrn_request_post(App $a) {
 
        if(($a->argc != 2) || (! count($a->profile))) {
                logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
@@ -120,17 +120,19 @@ function dfrn_request_post(&$a) {
 
                                        $parms = Probe::profile($dfrn_url);
 
-                                       if(! count($parms)) {
+                                       if (! count($parms)) {
                                                notice( t('Profile location is not valid or does not contain profile information.') . EOL );
                                                return;
                                        }
                                        else {
-                                               if(! x($parms,'fn'))
+                                               if (! x($parms,'fn')) {
                                                        notice( t('Warning: profile location has no identifiable owner name.') . EOL );
-                                               if(! x($parms,'photo'))
+                                               }
+                                               if (! x($parms,'photo')) {
                                                        notice( t('Warning: profile location has no profile photo.') . EOL );
+                                               }
                                                $invalid = Probe::valid_dfrn($parms);
-                                               if($invalid) {
+                                               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",
                                                                                                $invalid), $invalid) . EOL );
@@ -176,7 +178,7 @@ function dfrn_request_post(&$a) {
                                        );
                                }
 
-                               if($r) {
+                               if ($r) {
                                        info( t("Introduction complete.") . EOL);
                                }
 
@@ -299,7 +301,7 @@ function dfrn_request_post(&$a) {
                        dbesc(NETWORK_MAIL2)
                );
                if (dbm::is_result($r)) {
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
                                                intval($rr['cid'])
@@ -324,7 +326,7 @@ function dfrn_request_post(&$a) {
                        dbesc(NETWORK_MAIL2)
                );
                if (dbm::is_result($r)) {
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
                                                intval($rr['cid'])
@@ -502,13 +504,13 @@ function dfrn_request_post(&$a) {
                                );
                        }
                        else {
-                               if(! validate_url($url)) {
+                               if (! validate_url($url)) {
                                        notice( t('Invalid profile URL.') . EOL);
                                        goaway(App::get_baseurl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
-                               if(! allowed_url($url)) {
+                               if (! allowed_url($url)) {
                                        notice( t('Disallowed profile URL.') . EOL);
                                        goaway(App::get_baseurl() . '/' . $a->cmd);
                                        return; // NOTREACHED
@@ -519,17 +521,19 @@ function dfrn_request_post(&$a) {
 
                                $parms = Probe::profile(($hcard) ? $hcard : $url);
 
-                               if(! count($parms)) {
+                               if (! count($parms)) {
                                        notice( t('Profile location is not valid or does not contain profile information.') . EOL );
                                        goaway(App::get_baseurl() . '/' . $a->cmd);
                                }
                                else {
-                                       if(! x($parms,'fn'))
+                                       if (! x($parms,'fn')) {
                                                notice( t('Warning: profile location has no identifiable owner name.') . EOL );
-                                       if(! x($parms,'photo'))
+                                       }
+                                       if (! x($parms,'photo')) {
                                                notice( t('Warning: profile location has no profile photo.') . EOL );
+                                       }
                                        $invalid = Probe::valid_dfrn($parms);
-                                       if($invalid) {
+                                       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",
                                                                                        $invalid), $invalid) . EOL );
@@ -654,7 +658,7 @@ function dfrn_request_post(&$a) {
 }
 
 
-function dfrn_request_content(&$a) {
+function dfrn_request_content(App $a) {
 
        if (($a->argc != 2) || (! count($a->profile))) {
                return "";
@@ -806,19 +810,20 @@ function dfrn_request_content(&$a) {
 
                // At first look if an address was provided
                // Otherwise take the local address
-               if (x($_GET,'addr') AND ($_GET['addr'] != ""))
+               if (x($_GET,'addr') AND ($_GET['addr'] != "")) {
                        $myaddr = hex2bin($_GET['addr']);
-               elseif (x($_GET,'address') AND ($_GET['address'] != ""))
+               } elseif (x($_GET,'address') AND ($_GET['address'] != "")) {
                        $myaddr = $_GET['address'];
-               elseif(local_user()) {
-                       if(strlen($a->path)) {
+               } elseif (local_user()) {
+                       if (strlen($a->path)) {
                                $myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
-                       }
-                       else {
+                       } else {
                                $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
                        }
-               } else  // last, try a zrl
+               } else {
+                       // last, try a zrl
                        $myaddr = get_my_url();
+               }
 
                $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 
@@ -831,20 +836,23 @@ function dfrn_request_content(&$a) {
                 *
                 */
 
-               if($a->profile['page-flags'] == PAGE_NORMAL)
+               if ($a->profile['page-flags'] == PAGE_NORMAL) {
                        $tpl = get_markup_template('dfrn_request.tpl');
-               else
+               } else {
                        $tpl = get_markup_template('auto_request.tpl');
+               }
 
                $page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
                // see if we are allowed to have NETWORK_MAIL2 contacts
 
                $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-               if(get_config('system','dfrn_only'))
+
+               if (get_config('system','dfrn_only')) {
                        $mail_disabled = 1;
+               }
 
-               if(! $mail_disabled) {
+               if (! $mail_disabled) {
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                intval($a->profile['uid'])
                        );