X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsecurity.php;h=39846a8328bce31f73cf4fa351bdd83a978983f3;hb=bae725c2797fcae0d61c13822d27e4277ec0cc0e;hp=c443586c252a48fa946a6623ee28b5a9f0daa730;hpb=c938623a3d7e947c3b979466253ba5708af3f6b4;p=friendica.git

diff --git a/include/security.php b/include/security.php
index c443586c25..39846a8328 100644
--- a/include/security.php
+++ b/include/security.php
@@ -1,7 +1,11 @@
 <?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;
@@ -27,16 +31,16 @@ function cookie_hash($user)
  * @param int $time
  * @param array $user Record from "user" table
  */
-function new_cookie($time, $user = array())
+function new_cookie($time, $user = [])
 {
 	if ($time != 0) {
 		$time = $time + time();
 	}
 
 	if ($user) {
-		$value = json_encode(array("uid" => $user["uid"],
+		$value = json_encode(["uid" => $user["uid"],
 			"hash" => cookie_hash($user),
-			"ip" => $_SERVER['REMOTE_ADDR']));
+			"ip" => $_SERVER['REMOTE_ADDR']]);
 	} else {
 		$value = "";
 	}
@@ -73,10 +77,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);
 		}
 	}
 
@@ -102,12 +106,12 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		}
 	}
 
-	$r = dba::select('user', array('uid', 'username', 'nickname'),
-		array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
+	$r = dba::select('user', ['uid', 'username', 'nickname'],
+		['password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false]);
 	if (DBM::is_result($r)) {
 		$a->identities = dba::inArray($r);
 	} else {
-		$a->identities = array();
+		$a->identities = [];
 	}
 
 	$r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
@@ -137,11 +141,11 @@ 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', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid']));
+		dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]);
 
 		// Set the login date for all identities of the user
-		dba::update('user', array('login_date' => datetime_convert()),
-			array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
+		dba::update('user', ['login_date' => datetime_convert()],
+			['password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false]);
 	}
 
 	if ($login_initial) {
@@ -157,7 +161,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']);
@@ -165,7 +169,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	}
 }
 
-function can_write_wall(App $a, $owner)
+function can_write_wall($owner)
 {
 	static $verified = 0;
 
@@ -174,8 +178,7 @@ function can_write_wall(App $a, $owner)
 	}
 
 	$uid = local_user();
-
-	if (($uid) && ($uid == $owner)) {
+	if ($uid == $owner) {
 		return true;
 	}
 
@@ -401,7 +404,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 (>3 hours) before submitting it.') . EOL;
 }
 
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token')