tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Make validate_url more intuitive

Browse source 
- Remove the parameter passed by reference
- Add modified url in return value
This commit is contained in:
Hypolite Petovan 2017-12-16 19:23:22 -05:00
commit 1724dd3841
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/dfrn_request.php
View file

@ -377,7 +377,8 @@ function dfrn_request_post(App $a) {
);
}
else {
if (! validate_url($url)) {
$url = validate_url($url);
if (! $url) {
notice( t('Invalid profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED

5
mod/settings.php
View file

@ -537,10 +537,9 @@ function settings_post(App $a) {
// If openid has changed or if there's an openid but no openidserver, try and discover it.
if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
$tmp_str = $openid;
if (strlen($tmp_str) && validate_url($tmp_str)) {
if (strlen($tmp_str) && validate_url($openid)) {
logger('updating openidserver');
require_once('library/openid.php');
require_once 'library/openid.php';
$open_id_obj = new LightOpenID;
$open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity);