Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / joinform.php

diff --git a/lib/joinform.php b/lib/joinform.php
index 1edb2f72dc7136aae9df8e4d716f555723ad532d..a1a6189b089b65a1989175bbe62be670bbc7aabb 100644 (file)
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Form for joining a group
  *
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Form
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,21 +38,19 @@ require_once INSTALLDIR.'/lib/form.php';
  * Form for joining a group
  *
  * @category Form
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnsubscribeForm
  */
-
 class JoinForm extends Form
 {
     /**
      * group for user to join
      */
-
     var $group = null;
 
     /**
@@ -61,7 +59,6 @@ class JoinForm extends Form
      * @param HTMLOutputter $out   output channel
      * @param group         $group group to join
      */
-
     function __construct($out=null, $group=null)
     {
         parent::__construct($out);
@@ -74,7 +71,6 @@ class JoinForm extends Form
      *
      * @return string ID of the form
      */
-
     function id()
     {
         return 'group-join-' . $this->group->id;
@@ -85,10 +81,9 @@ class JoinForm extends Form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
-        return 'form_group_join';
+        return 'form_group_join ajax';
     }
 
     /**
@@ -96,11 +91,10 @@ class JoinForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('joingroup',
-                                array('nickname' => $this->group->nickname));
+                                array('id' => $this->group->id));
     }
 
     /**
@@ -108,9 +102,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'));
     }
 }