Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 538643d7e0d02b53c8c59993490d6ba5f2a4ef26..5d1b52f795d2030088fd151d5553bb860caa72af 100644 (file)
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Menu for login group of actions
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Menu
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008 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);
 }
 
@@ -37,62 +37,46 @@ require_once INSTALLDIR.'/lib/widget.php';
  * Menu for login group of actions
  *
  * @category Output
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@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      Widget
  */
-
-class LoginGroupNav extends Widget
+class LoginGroupNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
 
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartLoginGroupNav', array(&$this->action))) {
+        if (Event::handle('StartLoginGroupNav', array($this->action))) {
 
             $this->action->menuItem(common_local_url('login'),
-                                    _('Login'),
+                                    // TRANS: Menu item for logging in to the StatusNet site.
+                                    _m('MENU','Login'),
+                                    // TRANS: Title for menu item for logging in to the StatusNet site.
                                     _('Login with a username and password'),
                                     $action_name === 'login');
 
-            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+            if (!common_logged_in() &&
+                !(common_config('site','closed') || common_config('site','inviteonly'))) {
                 $this->action->menuItem(common_local_url('register'),
-                                        _('Register'),
+                                        // TRANS: Menu item for registering with the StatusNet site.
+                                        _m('MENU','Register'),
+                                        // TRANS: Title for menu item for registering with the StatusNet site.
                                         _('Sign up for a new account'),
                                         $action_name === 'register');
             }
 
-            $this->action->menuItem(common_local_url('openidlogin'),
-                                    _('OpenID'),
-                                    _('Login or register with OpenID'),
-                                    $action_name === 'openidlogin');
-
-            Event::handle('EndLoginGroupNav', array(&$menu));
+            Event::handle('EndLoginGroupNav', array($this->action));
         }
 
         $this->action->elementEnd('ul');