Merge branch 'fix-author-fallback' into 'nightly'

[quix0rs-gnu-social.git] / plugins / AutoSandbox / AutoSandboxPlugin.php

diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php
index 870eda86f2809673b8e4ef2149c93acc59db6a01..706523564a521126f800b5bc2e801b56848b95a1 100644 (file)
--- a/plugins/AutoSandbox/AutoSandboxPlugin.php
+++ b/plugins/AutoSandbox/AutoSandboxPlugin.php
@@ -56,27 +56,33 @@ class AutoSandboxPlugin extends Plugin
         }
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AutoSandbox',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Sean Carmody',
-                            'homepage' => 'http://status.net/wiki/Plugin:AutoSandbox',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AutoSandbox',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Automatically sandboxes newly registered members.'));
         return true;
     }
 
     function onStartRegistrationFormData($action)
     {
+         // TRANS: User instructions after registration.
          $instr = _m('Note you will initially be "sandboxed" so your posts will not appear in the public timeline.');
 
          if (isset($this->contact)) {
-             $contactuser = User::staticGet('nickname', $this->contact);
-             if (!empty($contactuser)) {
-                 $contactlink = "@<a href=\"$contactuser->uri\">$contactuser->nickname</a>";
-                 $instr = _m("Note you will initially be \"sandboxed\" so your posts will not appear in the public timeline. ".
-                   'Send a message to $contactlink to speed up the unsandboxing process.');
+             $contactuser = User::getKV('nickname', $this->contact);
+             if ($contactuser instanceof User) {
+                 $contactlink = sprintf('@<a href="%s">%s</a>',
+                                        htmlspecialchars($contactuser->getProfile()->getUrl()),
+                                        htmlspecialchars($contactuser->getProfile()->getNickname()));
+                 // TRANS: User instructions after registration.
+                 // TRANS: %s is a clickable OStatus profile URL.
+                 $instr = sprintf(_m('Note you will initially be "sandboxed" so your posts will not appear in the public timeline. '.
+                   'Send a message to %s to speed up the unsandboxing process.'),$contactlink);
              }
          }
 
@@ -86,11 +92,11 @@ class AutoSandboxPlugin extends Plugin
          $action->elementEnd('div');
     }
 
-    function onEndUserRegister(&$profile,&$user)
+    public function onEndUserRegister(Profile $profile)
     {
-       $profile->sandbox();
-       if ($this->debug) {
-           common_log(LOG_WARNING, "AutoSandbox: sandboxed of $user->nickname");
+        $profile->sandbox();
+        if ($this->debug) {
+            common_log(LOG_WARNING, "AutoSandbox: sandboxed of $profile->nickname");
         }
     }
 }