<?php
+/**
+ * @file mod/openid.php
+ */
-
-require_once('library/openid.php');
-
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
function openid_content(App $a) {
- $noid = get_config('system','no_openid');
- if ($noid)
- goaway(z_root());
+ $noid = Config::get('system','no_openid');
+ if($noid)
+ goaway(System::baseUrl());
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
- if ((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+ if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
- $openid = new LightOpenID;
+ $openid = new LightOpenID($a->get_hostname());
- if ($openid->validate()) {
+ if($openid->validate()) {
$authid = $_REQUEST['openid_identity'];
- if (! strlen($authid)) {
- logger( t('OpenID protocol error. No ID returned.') . EOL);
- goaway(z_root());
+ if(! strlen($authid)) {
+ logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
+ goaway(System::baseUrl());
}
// NOTE: we search both for normalised and non-normalised form of $authid
// mod/settings.php in 8367cad so it might have left mixed
// records in the user table
//
- $r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
+ $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
dbesc($authid), dbesc(normalise_openid($authid))
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
// successful OpenID login
// just in case there was no return url set
// and we fell through
- goaway(z_root());
+ goaway(System::baseUrl());
}
// Successful OpenID login - but we can't match it to an existing account.
// New registration?
- if ($a->config['register_policy'] == REGISTER_CLOSED) {
- notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
- goaway(z_root());
+ if (Config::get('config', 'register_policy') === REGISTER_CLOSED) {
+ notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
+ goaway(System::baseUrl());
}
unset($_SESSION['register']);
if ($k === 'namePerson/friendly') {
$nick = notags(trim($v));
}
- if ($k === 'namePerson/first') {
+ if($k === 'namePerson/first') {
$first = notags(trim($v));
}
- if ($k === 'namePerson') {
- $args .= '&username=' . notags(trim($v));
+ if($k === 'namePerson') {
+ $args .= '&username=' . urlencode(notags(trim($v)));
}
if ($k === 'contact/email') {
- $args .= '&email=' . notags(trim($v));
+ $args .= '&email=' . urlencode(notags(trim($v)));
}
if ($k === 'media/image/aspect11') {
$photosq = bin2hex(trim($v));
}
}
if ($nick) {
- $args .= '&nickname=' . $nick;
+ $args .= '&nickname=' . urlencode($nick);
}
elseif ($first) {
- $args .= '&nickname=' . $first;
+ $args .= '&nickname=' . urlencode($first);
}
if ($photosq) {
- $args .= '&photo=' . $photosq;
+ $args .= '&photo=' . urlencode($photosq);
}
elseif ($photo) {
- $args .= '&photo=' . $photo;
+ $args .= '&photo=' . urlencode($photo);
}
- $args .= '&openid_url=' . notags(trim($authid));
+ $args .= '&openid_url=' . urlencode(notags(trim($authid)));
- goaway(App::get_baseurl() . '/register' . $args);
+ goaway(System::baseUrl() . '/register?' . $args);
// NOTREACHED
}
}
- notice( t('Login failed.') . EOL);
- goaway(z_root());
+ notice(L10n::t('Login failed.') . EOL);
+ goaway(System::baseUrl());
// NOTREACHED
}