use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
use Friendica\Object\Image;
use Friendica\Util\Crypto;
// Check if the returned data is valid, otherwise fix it. See issue #6122
// Check for correct url and normalised nurl
- $url = System::baseUrl() . '/profile/' . $r['nickname'];
+ $url = DI::baseUrl() . '/profile/' . $r['nickname'];
$repair = ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']));
if (!$repair) {
// Check if "addr" is present and correct
- $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+ $addr = $r['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
$repair = ($addr != $r['addr']);
}
$default_group = 0;
if ($network == Protocol::OSTATUS) {
- $default_group = PConfig::get($uid, "ostatus", "default_group");
+ $default_group = DI::pConfig()->get($uid, "ostatus", "default_group");
}
if ($default_group != 0) {
{
$user = self::getAuthenticationInfo($user_info);
- if ($third_party && PConfig::get($user['uid'], '2fa', 'verified')) {
+ if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
// Third-party apps can't verify two-factor authentication, we use app-specific passwords instead
if (AppSpecificPassword::authenticateUser($user['uid'], $password)) {
return $user['uid'];
*/
public static function create(array $data)
{
- $a = \get_app();
$return = ['user' => null, 'password' => ''];
$using_invites = Config::get('system', 'invitation_only');
$_SESSION['register'] = 1;
$_SESSION['openid'] = $openid_url;
- $openid = new LightOpenID($a->getHostName());
+ $openid = new LightOpenID(DI::baseUrl()->getHostname());
$openid->identity = $openid_url;
- $openid->returnUrl = System::baseUrl() . '/openid';
+ $openid->returnUrl = DI::baseUrl() . '/openid';
$openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
$openid->optional = ['namePerson/first', 'media/image/aspect11', 'media/image/default'];
try {
$insert_result = DBA::insert('profile', [
'uid' => $uid,
'name' => $username,
- 'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
- 'thumb' => System::baseUrl() . "/photo/avatar/{$uid}.jpg",
+ 'photo' => DI::baseUrl() . "/photo/profile/{$uid}.jpg",
+ 'thumb' => DI::baseUrl() . "/photo/avatar/{$uid}.jpg",
'publish' => $publish,
'is-default' => 1,
'net-publish' => $netpublish,