sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894 

Signed-off-by: Patrik Kernstock <info@pkern.at>
pull/11042/head
Patrik Kernstock 2018-09-04 00:58:44 +07:00
parent a0a34502c6
commit 8f9fa9ee13
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/oauth2/lib/Controller/SettingsController.php
Unescape Escape View File

@ -74,7 +74,7 @@ class SettingsController extends Controller {
public function addClient(string $name, public function addClient(string $name,
string $redirectUri): JSONResponse { string $redirectUri): JSONResponse {
if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) { if (filter_var($redirectUri, FILTER_VALIDATE_URL) === false) {
return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST); return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST);
} }

6
apps/theming/lib/ThemingDefaults.php
Unescape Escape View File

@ -174,9 +174,7 @@ class ThemingDefaults extends \OC_Defaults {
$legalLinks = ''; $divider = ''; $legalLinks = ''; $divider = '';
foreach($links as $link) { foreach($links as $link) {
if($link['url'] !== '' if($link['url'] !== ''
&& filter_var($link['url'], FILTER_VALIDATE_URL, [ && filter_var($link['url'], FILTER_VALIDATE_URL)
'flags' => FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED
])
) { ) {
$legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' . $legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' .
' rel="noreferrer noopener">' . $link['text'] . '</a>'; ' rel="noreferrer noopener">' . $link['text'] . '</a>';
@ -339,7 +337,7 @@ class ThemingDefaults extends \OC_Defaults {
} }
return false; return false;
} }
/** /**
* Increases the cache buster key * Increases the cache buster key
*/ */