Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / src / Module / Login.php

diff --git a/src/Module/Login.php b/src/Module/Login.php
index c6396a4148e1bda0af1cc92d098f961b9d1ff7f0..53ab57585f5d6a6261ea91922f66331dae73c6ce 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -10,8 +10,11 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use dba;
+use Exception;
+use LightOpenID;
 
 require_once 'boot.php';
 require_once 'include/datetime.php';
@@ -60,7 +63,7 @@ class Login extends BaseModule
                        $openid_url = trim($_POST['openid_url'] ? : $_POST['username']);
 
                        // if it's an email address or doesn't resolve to a URL, fail.
-                       if ($noid || strpos($openid_url, '@') || !Network::validateURL($openid_url)) {
+                       if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
                                notice(L10n::t('Login failed.') . EOL);
                                goaway(self::getApp()->get_baseurl());
                                // NOTREACHED
@@ -68,8 +71,7 @@ class Login extends BaseModule
 
                        // Otherwise it's probably an openid.
                        try {
-                               require_once 'library/openid.php';
-                               $openid = new \LightOpenID;
+                               $openid = new LightOpenID;
                                $openid->identity = $openid_url;
                                $_SESSION['openid'] = $openid_url;
                                $_SESSION['remember'] = $_POST['remember'];
@@ -119,7 +121,7 @@ class Login extends BaseModule
 
                        // if we haven't failed up this point, log them in.
                        $_SESSION['remember'] = $_POST['remember'];
-                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
+                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                        authenticate_success($record, true, true);
 
                        if (x($_SESSION, 'return_url')) {
@@ -218,10 +220,10 @@ class Login extends BaseModule
                                // stays logged in for a long time, e.g. with "Remember Me"
                                $login_refresh = false;
                                if (!x($_SESSION['last_login_date'])) {
-                                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
+                                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                                }
-                               if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
-                                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
+                               if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
+                                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                                        $login_refresh = true;
                                }
                                authenticate_success($user, false, false, $login_refresh);