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

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index 5c393cbb62e9c29ab3e667f430764fe7d15d016e..45f8d86b10f4808238059e97515cd5fc3eeffb1f 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -1,11 +1,16 @@
 <?php
+/**
+ * @file include/security.php
+ */
 
-use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Group;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -73,10 +78,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                if ($a->user['login_date'] <= NULL_DATE) {
                        $_SESSION['return_url'] = 'profile_photo/new';
                        $a->module = 'profile_photo';
-                       info(t("Welcome ") . $a->user['username'] . EOL);
-                       info(t('Please upload a profile photo.') . EOL);
+                       info(L10n::t("Welcome ") . $a->user['username'] . EOL);
+                       info(L10n::t('Please upload a profile photo.') . EOL);
                } else {
-                       info(t("Welcome back ") . $a->user['username'] . EOL);
+                       info(L10n::t("Welcome back ") . $a->user['username'] . EOL);
                }
        }
 
@@ -137,10 +142,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"');
 
        if ($login_initial || $login_refresh) {
-               dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]);
+               dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
                // Set the login date for all identities of the user
-               dba::update('user', ['login_date' => datetime_convert()],
+               dba::update('user', ['login_date' => DateTimeFormat::utcNow()],
                        ['password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false]);
        }
 
@@ -157,7 +162,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        }
 
        if ($login_initial) {
-               call_hooks('logged_in', $a->user);
+               Addon::callHooks('logged_in', $a->user);
 
                if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
                        goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
@@ -400,7 +405,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 
 function check_form_security_std_err_msg()
 {
-       return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
+       return L10n::t("The form security token was not correct. This probably happened because the form has been opened for too long \x28>3 hours\x29 before submitting it.") . EOL;
 }
 
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token')