nupplaPhil/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1203 from annando/deprecated

Browse source 
Replaced deprecated functionalities
This commit is contained in:
Hypolite Petovan 2021-11-07 10:02:24 -05:00 committed by GitHub
commit 2ac5662ab2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nitter/nitter.php
View file

@ -24,13 +24,13 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function nitter_install() function nitter_install()
{ {
Addon::registerHook ('prepare_body_final', 'addon/nitter/nitter.php', 'nitter_render'); Hook::register('prepare_body_final', 'addon/nitter/nitter.php', 'nitter_render');
} }
/* Handle the send data from the admin settings /* Handle the send data from the admin settings

13
windowsphonepush/windowsphonepush.php
View file

@ -440,11 +440,16 @@ function windowsphonepush_login(App $a)
throw new UnauthorizedException('This api requires login'); throw new UnauthorizedException('This api requires login');
} }
$user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW'])); try {
$user_id = User::getIdFromPasswordAuthentication($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
if ($user_id) {
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
}
} catch (Exception $ex) {
$record = [];
}
if ($user_id) { if (empty($record)) {
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
} else {
Logger::info('API_login failure: ' . print_r($_SERVER, true)); Logger::info('API_login failure: ' . print_r($_SERVER, true));
header('WWW-Authenticate: Basic realm="Friendica"'); header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException('This api requires login'); throw new UnauthorizedException('This api requires login');