X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FProfile.php;h=9bbec24e63031e7c031229a90a41fb52dd7fca89;hb=2e05dac7dae0a3d028b442a2d5afbd4176a32e99;hp=2baf455cfd5e7e0cc02846bdd91466e488fac1b9;hpb=838cdac5d17cf71e7103215c65bd0b2a878254f9;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 2baf455cfd..9bbec24e63 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -24,7 +24,7 @@ namespace Friendica\Model; use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Content\Widget\ContactBlock; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; @@ -219,7 +219,7 @@ class Profile { $profile = User::getOwnerDataByNick($nickname); if (empty($profile)) { - Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); + Logger::info('profile error: ' . DI::args()->getQueryString()); return []; } @@ -706,27 +706,27 @@ class Profile // Try to find the public contact entry of the visitor. $cid = Contact::getIdForURL($my_url); if (!$cid) { - Logger::log('No contact record found for ' . $my_url, Logger::DEBUG); + Logger::info('No contact record found for ' . $my_url); return; } $contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]); if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) { - Logger::log('The visitor ' . $my_url . ' is already authenticated', Logger::DEBUG); + Logger::info('The visitor ' . $my_url . ' is already authenticated'); return; } // Avoid endless loops $cachekey = 'zrlInit:' . $my_url; if (DI::cache()->get($cachekey)) { - Logger::log('URL ' . $my_url . ' already tried to authenticate.', Logger::DEBUG); + Logger::info('URL ' . $my_url . ' already tried to authenticate.'); return; } else { DI::cache()->set($cachekey, true, Duration::MINUTE); } - Logger::log('Not authenticated. Invoking reverse magic-auth for ' . $my_url, Logger::DEBUG); + Logger::info('Not authenticated. Invoking reverse magic-auth for ' . $my_url); // Remove the "addr" parameter from the destination. It is later added as separate parameter again. $addr_request = 'addr=' . urlencode($addr); @@ -745,7 +745,7 @@ class Profile // We have to check if the remote server does understand /magic without invoking something $serverret = DI::httpClient()->get($basepath . '/magic'); if ($serverret->isSuccess()) { - Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG); + Logger::info('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path); System::externalRedirect($magic_path); } } @@ -845,7 +845,7 @@ class Profile info(DI::l10n()->t('OpenWebAuth: %1$s welcomes %2$s', DI::baseUrl()->getHostname(), $visitor['name'])); - Logger::log('OpenWebAuth: auth success from ' . $visitor['addr'], Logger::DEBUG); + Logger::info('OpenWebAuth: auth success from ' . $visitor['addr']); } public static function zrl($s, $force = false) @@ -945,7 +945,7 @@ class Profile * @param array $profile One profile array * @throws \Exception */ - public static function migrateFromLegacyProfile(array $profile) + public static function migrate(array $profile) { // Already processed, aborting if ($profile['is-default'] === null) { @@ -999,7 +999,7 @@ class Profile foreach ($custom_fields as $field => $label) { if (!empty($profile[$field]) && $profile[$field] > DBA::NULL_DATE && $profile[$field] > DBA::NULL_DATETIME) { - DI::profileField()->save(DI::profileFieldFactory()->createFromString( + DI::profileField()->save(DI::profileFieldFactory()->createFromValues( $profile['uid'], $order, trim($label, ':'),