Merge pull request #4312 from zeroadam/feature/L10n

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 575343bc19d95ba4c673994241c1fc185d2b34a2..01477fd434b506261bbc932f85ac2f7bf5039a78 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -7,29 +7,31 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 
 require_once 'include/items.php';
-require_once 'include/auth.php';
 
 function dfrn_poll_init(App $a)
 {
-       $dfrn_id         = x($_GET,'dfrn_id')         ? $_GET['dfrn_id']              : '';
-       $type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
-       $last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
-       $destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
-       $challenge       = x($_GET,'challenge')       ? $_GET['challenge']            : '';
-       $sec             = x($_GET,'sec')             ? $_GET['sec']                  : '';
-       $dfrn_version    = x($_GET,'dfrn_version')    ? (float) $_GET['dfrn_version'] : 2.0;
-       $perm            = x($_GET,'perm')            ? $_GET['perm']                 : 'r';
-       $quiet           = x($_GET,'quiet')           ? true                          : false;
+       Login::sessionAuth();
+
+       $dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
+       $type            = defaults($_GET, 'type'           , 'data');
+       $last_update     = defaults($_GET, 'last_update'    , '');
+       $destination_url = defaults($_GET, 'destination_url', '');
+       $challenge       = defaults($_GET, 'challenge'      , '');
+       $sec             = defaults($_GET, 'sec'            , '');
+       $dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
+       $perm            = defaults($_GET, 'perm'           , 'r');
+       $quiet                   = x($_GET, 'quiet');
 
        // Possibly it is an OStatus compatible server that requests a user feed
        if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
-               echo OStatus::feed($a, $nickname, $last_update, 10);
+               echo OStatus::feed($nickname, $last_update, 10);
                killme();
        }
 
@@ -105,17 +107,17 @@ function dfrn_poll_init(App $a)
                                if ((int) $xml->status === 1) {
                                        $_SESSION['authenticated'] = 1;
                                        if (!x($_SESSION, 'remote')) {
-                                               $_SESSION['remote'] = array();
+                                               $_SESSION['remote'] = [];
                                        }
 
-                                       $_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
+                                       $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']];
 
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
                                        $_SESSION['visitor_handle'] = $r[0]['addr'];
                                        $_SESSION['visitor_visiting'] = $r[0]['uid'];
                                        if (!$quiet) {
-                                               info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
+                                               info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
                                        }
 
                                        // Visitors get 1 day session.
@@ -486,13 +488,13 @@ function dfrn_poll_content(App $a)
                                        . '&sec=' . $sec
                                );
                        } else {
-                               $s = post_url($r[0]['poll'], array(
+                               $s = post_url($r[0]['poll'], [
                                        'dfrn_id' => $encrypted_id,
                                        'type' => 'profile-check',
                                        'dfrn_version' => DFRN_PROTOCOL_VERSION,
                                        'challenge' => $challenge,
                                        'sec' => $sec
-                               ));
+                               ]);
                        }
 
                        $profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
@@ -527,15 +529,15 @@ function dfrn_poll_content(App $a)
                                if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
                                        $_SESSION['authenticated'] = 1;
                                        if (!x($_SESSION, 'remote')) {
-                                               $_SESSION['remote'] = array();
+                                               $_SESSION['remote'] = [];
                                        }
 
-                                       $_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
+                                       $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']];
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
                                        $_SESSION['visitor_visiting'] = $r[0]['uid'];
                                        if (!$quiet) {
-                                               info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
+                                               info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
                                        }
 
                                        // Visitors get 1 day session.