OStatus usage of static Validate::* calls fixed

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index e8a3c2d66663c58a40c56a511535a94916bc209d..f14c3057ddb49197755ad7601119e649ac5664b5 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -246,11 +246,13 @@ class OStatusPlugin extends Plugin
             $profile->whereAdd('uri LIKE "%' . $profile->escape($q) . '%"');
             $profile->query();
 
+            $validate = new Validate();
+
             if ($profile->N == 0) {
                 try {
-                    if (Validate::email($q)) {
+                    if ($validate->email($q)) {
                         $oprofile = Ostatus_profile::ensureWebfinger($q);
-                    } else if (Validate::uri($q)) {
+                    } else if ($validate->uri($q)) {
                         $oprofile = Ostatus_profile::ensureProfileURL($q);
                     } else {
                         // TRANS: Exception in OStatus when invalid URI was entered.

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 5666c898af4e91938e91c2c412174579089865f0..64b47df498eb956c278fe4c88c519d78fdc3b713 100644 (file)
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -153,8 +153,9 @@ class OStatusInitAction extends Action
 
     function ostatusConnect()
     {
+        $validate = new Validate();
         $opts = array('allowed_schemes' => array('http', 'https', 'acct'));
-        if (Validate::uri($this->profile, $opts)) {
+        if ($validate->uri($this->profile, $opts)) {
             $bits = parse_url($this->profile);
             if ($bits['scheme'] == 'acct') {
                 $this->connectWebfinger($bits['path']);

diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index f349b5d534800084231f04846646ed5716d0e149..fb0d2ba758b4cf12e73c438ff103b6355cec6a85 100644 (file)
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -241,11 +241,12 @@ class OStatusSubAction extends Action
      */
     function pullRemoteProfile()
     {
+        $validate = new Validate();
         $this->profile_uri = $this->trimmed('profile');
         try {
-            if (Validate::email($this->profile_uri)) {
+            if ($validate->email($this->profile_uri)) {
                 $this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri);
-            } else if (Validate::uri($this->profile_uri)) {
+            } else if ($validate->uri($url, $params)) {
                 $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);
             } else {
                 // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com

diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php
index 5d0b9fbf903f64686388e4eeefc494bdddccc511..d70a0c0c0c28022720064baeb54bb47bb3959a9f 100644 (file)
--- a/plugins/OStatus/actions/pushhub.php
+++ b/plugins/OStatus/actions/pushhub.php
@@ -200,7 +200,7 @@ class PushHubAction extends Action
         $url = $this->arg($arg);
         $params = array('domain_check' => false, // otherwise breaks my local tests :P
                         'allowed_schemes' => array('http', 'https'));
-        $validate = new Validate;
+        $validate = new Validate();
         if ($validate->uri($url, $params)) {
             return $url;
         } else {

diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php
index 3d13724f7db1336979a951e6f5616c8bae1dba9a..d5d0924fbfe3fe7330df4f49f543c20d175a8368 100755 (executable)
--- a/plugins/OStatus/scripts/resub-feed.php
+++ b/plugins/OStatus/scripts/resub-feed.php
@@ -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);
 }

diff --git a/plugins/OStatus/scripts/testfeed.php b/plugins/OStatus/scripts/testfeed.php
index 84b470c3b251dbfc1f31bfe7823fa628d1657643..da1eee292ef8d5a3b439a7d0bb039ad167b39c4e 100755 (executable)
--- a/plugins/OStatus/scripts/testfeed.php
+++ b/plugins/OStatus/scripts/testfeed.php
@@ -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);
 }

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
index e024ed95a780f3b09b8771f0d7360671b7303320..ca48dc34a7db1b7a57308da618f015c7b0a97cac 100755 (executable)
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -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 {

diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php
index f20429cd8340327be686e41aad98879c383984d3..c5d9aa897c264549dac9a07a0da7c14d72a53699 100755 (executable)
--- a/plugins/OStatus/scripts/update-profile.php
+++ b/plugins/OStatus/scripts/update-profile.php
@@ -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);
 }

diff --git a/plugins/OStatus/scripts/update_ostatus_profiles.php b/plugins/OStatus/scripts/update_ostatus_profiles.php
index 2a32ae0491f5fc238a5da390ea842f10917d4f01..3f54c83cda1ec3da4f121509d043d814f0e2cf5f 100755 (executable)
--- a/plugins/OStatus/scripts/update_ostatus_profiles.php
+++ b/plugins/OStatus/scripts/update_ostatus_profiles.php
@@ -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";