diff options
author | Evan Prodromou <evan@status.net> | 2010-02-24 15:00:52 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-02-24 15:00:52 -0500 |
commit | daea98878692cadc9406be16fe2e15a419add3c4 (patch) | |
tree | d7b5e0ec34b04c7f91c43a4e5761dc764c64330a /plugins/OStatus/actions/ostatussub.php | |
parent | f5ec7c27070dac4ac28ba860f4cc9a808b5f7c30 (diff) | |
parent | 07214f1370547fcc64db34ce8c8a84ec70e0d5bd (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions/ostatussub.php')
-rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index b3569e695..12832cdcf 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -288,10 +288,15 @@ class OStatusSubAction extends Action } $this->profile_uri = $profile_uri; - // @fixme validate, normalize bla bla try { - $oprofile = Ostatus_profile::ensureProfile($this->profile_uri); - $this->oprofile = $oprofile; + if (Validate::email($this->profile_uri)) { + $this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri); + } else if (Validate::uri($this->profile_uri)) { + $this->oprofile = Ostatus_profile::ensureProfile($this->profile_uri); + } else { + $this->error = _m("Invalid address format."); + return false; + } return true; } catch (FeedSubBadURLException $e) { $this->error = _m('Invalid URL or could not reach server.'); |