Log function

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index bca3e73f5dd6d898588f48dde020c6dd1d49f4ea..29809b2cde37bbf102e63b682b5bd7f40f360490 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -10,6 +10,7 @@ use Exception;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -450,7 +451,7 @@ class User
                                } catch (Exception $e) {
                                        throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e);
                                }
-                               goaway($authurl);
+                               System::externalRedirect($authurl);
                                // NOTREACHED
                        }
 
@@ -470,7 +471,7 @@ class User
                $username_max_length = max(1, min(64, intval(Config::get('system', 'username_max_length', 48))));
 
                if ($username_min_length > $username_max_length) {
-                       logger(L10n::t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), LOGGER_WARNING);
+                       Logger::log(L10n::t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), LOGGER_WARNING);
                        $tmp = $username_min_length;
                        $username_min_length = $username_max_length;
                        $username_max_length = $tmp;
@@ -642,7 +643,7 @@ class User
 
                        $Image = new Image($img_str, $type);
                        if ($Image->isValid()) {
-                               $Image->scaleToSquare(175);
+                               $Image->scaleToSquare(300);
 
                                $hash = Photo::newResource();
 
@@ -783,7 +784,9 @@ class User
                        return;
                }
 
-               logger('Removing user: ' . $uid);
+               $a = get_app();
+
+               Logger::log('Removing user: ' . $uid);
 
                $user = DBA::selectFirst('user', [], ['uid' => $uid]);
 
@@ -807,7 +810,7 @@ class User
                if ($uid == local_user()) {
                        unset($_SESSION['authenticated']);
                        unset($_SESSION['uid']);
-                       goaway();;
+                       $a->internalRedirect();
                }
        }
 }