Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index e97607304ffc216c0d73d357eb19ec7c2fb6165a..4e247b384fe254f26869a5f54354a0536f9104c9 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -10,6 +10,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 function openid_content(App $a) {
 
@@ -17,9 +18,9 @@ function openid_content(App $a) {
        if($noid)
                $a->internalRedirect();
 
-       Logger::log('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
+       Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
 
-       if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+       if(!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
 
                $openid = new LightOpenID($a->getHostName());
 
@@ -43,7 +44,7 @@ function openid_content(App $a) {
                                AND `blocked` = 0 AND `account_expired` = 0
                                AND `account_removed` = 0 AND `verified` = 1
                                LIMIT 1",
-                               DBA::escape($authid), DBA::escape(normalise_openid($authid))
+                               DBA::escape($authid), DBA::escape(Strings::normaliseOpenID($authid))
                        );
 
                        if (DBA::isResult($r)) {
@@ -74,16 +75,16 @@ function openid_content(App $a) {
                        if (is_array($attr) && count($attr)) {
                                foreach ($attr as $k => $v) {
                                        if ($k === 'namePerson/friendly') {
-                                               $nick = notags(trim($v));
+                                               $nick = Strings::escapeTags(trim($v));
                                        }
                                        if($k === 'namePerson/first') {
-                                               $first = notags(trim($v));
+                                               $first = Strings::escapeTags(trim($v));
                                        }
                                        if($k === 'namePerson') {
-                                               $args .= '&username=' . urlencode(notags(trim($v)));
+                                               $args .= '&username=' . urlencode(Strings::escapeTags(trim($v)));
                                        }
                                        if ($k === 'contact/email') {
-                                               $args .= '&email=' . urlencode(notags(trim($v)));
+                                               $args .= '&email=' . urlencode(Strings::escapeTags(trim($v)));
                                        }
                                        if ($k === 'media/image/aspect11') {
                                                $photosq = bin2hex(trim($v));
@@ -107,7 +108,7 @@ function openid_content(App $a) {
                                $args .= '&photo=' . urlencode($photo);
                        }
 
-                       $args .= '&openid_url=' . urlencode(notags(trim($authid)));
+                       $args .= '&openid_url=' . urlencode(Strings::escapeTags(trim($authid)));
 
                        $a->internalRedirect('register?' . $args);