eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

OStatus usage of static Validate::* calls fixed

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-11-08 10:33:41 +01:00
parent f29daa22b6
commit 65184782aa
9 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/scripts/resub-feed.php
View File

@@ -36,7 +36,9 @@ END_OF_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
if (empty($args[0]) || !Validate::uri($args[0])) {
$validate = new Validate();
if (empty($args[0]) || !$validate->uri($args[0])) {
print "$helptext";
exit(1);
}

4
plugins/OStatus/scripts/testfeed.php
View File

@@ -35,7 +35,9 @@ END_OF_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
if (empty($args[0]) || !Validate::uri($args[0])) {
$validate = new Validate();
if (empty($args[0]) || !$validate->uri($args[0])) {
print "$helptext";
exit(1);
}

3
plugins/OStatus/scripts/update-profile-data.php
View File

@@ -99,6 +99,7 @@ function fixProfile($uri) {
}
$ok = true;
$validate = new Validate();
if (have_option('all')) {
$oprofile = new Ostatus_profile();
$oprofile->find();
@@ -115,7 +116,7 @@ if (have_option('all')) {
while ($oprofile->fetch()) {
$ok = fixProfile($oprofile->uri) && $ok;
}
} else if (!empty($args[0]) && Validate::uri($args[0])) {
} else if (!empty($args[0]) && $validate->uri($args[0])) {
$uri = $args[0];
$ok = fixProfile($uri);
} else {

4
plugins/OStatus/scripts/update-profile.php
View File

@@ -32,7 +32,9 @@ END_OF_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
if (empty($args[0]) || !Validate::uri($args[0])) {
$validate = new Validate();
if (empty($args[0]) || !$validate->uri($args[0])) {
print "$helptext";
exit(1);
}

5
plugins/OStatus/scripts/update_ostatus_profiles.php
View File

@@ -207,10 +207,11 @@ class LooseOstatusProfile extends Ostatus_profile
function pullOstatusProfile($uri) {
$oprofile = null;
$validate = new Validate();
if (Validate::email($uri)) {
if ($validate->email($uri)) {
$oprofile = LooseOstatusProfile::updateWebfinger($uri);
} else if (Validate::uri($uri)) {
} else if ($validate->uri($uri)) {
$oprofile = LooseOstatusProfile::updateProfileURL($uri);
} else {
print "Sorry, we could not reach the address: $uri\n";