*/
use Friendica\App;
-use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\Util\Strings;
function openid_content(App $a) {
- $noid = Config::get('system','no_openid');
- if($noid)
+ if (Config::get('system','no_openid')) {
$a->internalRedirect();
+ }
- logger('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());
- if($openid->validate()) {
-
- $authid = $_REQUEST['openid_identity'];
+ if ($openid->validate()) {
+ $authid = $openid->identity;
- if(! strlen($authid)) {
- logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
+ if (empty($authid)) {
+ Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
$a->internalRedirect();
}
// mod/settings.php in 8367cad so it might have left mixed
// records in the user table
//
- $r = q("SELECT *
- FROM `user`
- WHERE ( `openid` = '%s' OR `openid` = '%s' )
- AND `blocked` = 0 AND `account_expired` = 0
- AND `account_removed` = 0 AND `verified` = 1
- LIMIT 1",
- DBA::escape($authid), DBA::escape(normalise_openid($authid))
- );
-
- if (DBA::isResult($r)) {
+ $condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
+ 'openid' => [$authid, Strings::normaliseOpenID($authid)]];
+ $user = DBA::selectFirst('user', [], $condition);
+ if (DBA::isResult($user)) {
// successful OpenID login
unset($_SESSION['openid']);
- Authentication::setAuthenticatedSessionForUser($r[0],true,true);
+ Session::setAuthenticatedForUser($a, $user, true, true);
// just in case there was no return url set
// and we fell through
// Successful OpenID login - but we can't match it to an existing account.
// New registration?
- if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
+ if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
$a->internalRedirect();
}
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));
+ if ($k === 'namePerson/first') {
+ $first = Strings::escapeTags(trim($v));
}
- if($k === 'namePerson') {
- $args .= '&username=' . urlencode(notags(trim($v)));
+ if ($k === 'namePerson') {
+ $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));
}
}
}
- if ($nick) {
+ if (!empty($nick)) {
$args .= '&nickname=' . urlencode($nick);
- }
- elseif ($first) {
+ } elseif (!empty($first)) {
$args .= '&nickname=' . urlencode($first);
}
- if ($photosq) {
+ if (!empty($photosq)) {
$args .= '&photo=' . urlencode($photosq);
- }
- elseif ($photo) {
+ } elseif (!empty($photo)) {
$args .= '&photo=' . urlencode($photo);
}
- $args .= '&openid_url=' . urlencode(notags(trim($authid)));
+ $args .= '&openid_url=' . urlencode(Strings::escapeTags(trim($authid)));
$a->internalRedirect('register?' . $args);