X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjoinform.php;h=ef868553fcc0917f494973f1a76d3e624b10f1e6;hb=f134a423f6a9e7bb61d069c4d6281c05417bbd45;hp=eb06f1de660495cb7f89d34e5ebfcb10c05d68a9;hpb=ae883ceb9b4689f6c1dd3aecdc4a844eda7d179a;p=quix0rs-gnu-social.git

diff --git a/lib/joinform.php b/lib/joinform.php
index eb06f1de66..ef868553fc 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/form.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Form for joining a group
@@ -46,23 +42,20 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      UnsubscribeForm
  */
-
 class JoinForm extends Form
 {
     /**
      * group for user to join
      */
-
     var $group = null;
 
     /**
      * Constructor
      *
      * @param HTMLOutputter $out   output channel
-     * @param group         $group group to join
+     * @param User_group    $group group to join
      */
-
-    function __construct($out=null, $group=null)
+    function __construct(HTMLOutputter $out=null, User_group $group=null)
     {
         parent::__construct($out);
 
@@ -74,10 +67,9 @@ class JoinForm extends Form
      *
      * @return string ID of the form
      */
-
     function id()
     {
-        return 'group-join-' . $this->group->id;
+        return 'group-join-' . $this->group->getID();
     }
 
     /**
@@ -85,10 +77,9 @@ class JoinForm extends Form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
-        return 'form_group_join';
+        return 'form_group_join ajax';
     }
 
     /**
@@ -96,11 +87,9 @@ class JoinForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
-        return common_local_url('joingroup',
-                                array('nickname' => $this->group->nickname));
+        return common_local_url('joingroup', array('id' => $this->group->getID()));
     }
 
     /**
@@ -108,9 +97,9 @@ class JoinForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _('Join'));
+        // TRANS: Button text for joining a group.
+        $this->out->submit('submit', _m('BUTTON','Join'));
     }
 }