- $uri = notags(trim($_GET['uri']));
- $local = str_replace('acct:', '', $uri);
- $name = substr($local,0,strpos($local,'@'));
+ $uri = urldecode(notags(trim($_GET['uri'])));
+
+ if(substr($uri,0,4) === 'http')
+ $name = basename($uri);
+ else {
+ $local = str_replace('acct:', '', $uri);
+ if(substr($local,0,2) == '//')
+ $local = substr($local,2);
+
+ $name = substr($local,0,strpos($local,'@'));
+ }