From b3ba7669df1d26b552dcd2fb2fc84afb1d73f983 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 4 Aug 2009 06:52:57 -0400
Subject: Add hooks for Start/End LoginGroupNav

---
 lib/logingroupnav.php | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'lib/logingroupnav.php')

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index f23985f3a..538643d7e 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -69,26 +69,30 @@ class LoginGroupNav extends Widget
 
     function show()
     {
-        // action => array('prompt', 'title')
-        $menu = array();
-
-        $menu['login'] = array(_('Login'),
-                         _('Login with a username and password'));
-        if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            $menu['register'] = array(_('Register'),
-                                _('Sign up for a new account'));
-        }
-        $menu['openidlogin'] = array(_('OpenID'),
-                               _('Login or register with OpenID'));
-
         $action_name = $this->action->trimmed('action');
+
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        foreach ($menu as $menuaction => $menudesc) {
-            $this->action->menuItem(common_local_url($menuaction),
-                                    $menudesc[0],
-                                    $menudesc[1],
-                                    $action_name === $menuaction);
+        if (Event::handle('StartLoginGroupNav', array(&$this->action))) {
+
+            $this->action->menuItem(common_local_url('login'),
+                                    _('Login'),
+                                    _('Login with a username and password'),
+                                    $action_name === 'login');
+
+            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+                $this->action->menuItem(common_local_url('register'),
+                                        _('Register'),
+                                        _('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));
         }
 
         $this->action->elementEnd('ul');
-- 
cgit v1.2.3-54-g00ecf


From 58f85463efacc81a60a86a841f1a4403cd9f3949 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 4 Aug 2009 07:17:14 -0400
Subject: error in EndLoginGroupNav arguments

---
 lib/logingroupnav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/logingroupnav.php')

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 538643d7e..bae45b077 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -92,7 +92,7 @@ class LoginGroupNav extends Widget
                                     _('Login or register with OpenID'),
                                     $action_name === 'openidlogin');
 
-            Event::handle('EndLoginGroupNav', array(&$menu));
+            Event::handle('EndLoginGroupNav', array(&$this->action));
         }
 
         $this->action->elementEnd('ul');
-- 
cgit v1.2.3-54-g00ecf


From 7a742a0572a3f0aa529785f4f7eab320a2dd099d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 4 Aug 2009 07:20:17 -0400
Subject: show OpenID action in login nav

---
 lib/logingroupnav.php           |  5 -----
 plugins/OpenID/OpenIDPlugin.php | 12 ++++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib/logingroupnav.php')

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index bae45b077..59f313302 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -87,11 +87,6 @@ class LoginGroupNav extends Widget
                                         $action_name === 'register');
             }
 
-            $this->action->menuItem(common_local_url('openidlogin'),
-                                    _('OpenID'),
-                                    _('Login or register with OpenID'),
-                                    $action_name === 'openidlogin');
-
             Event::handle('EndLoginGroupNav', array(&$this->action));
         }
 
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 149a92356..b70b1da19 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -75,4 +75,16 @@ class OpenIDPlugin extends Plugin
 
         return true;
     }
+
+    function onEndLoginGroupNav(&$action)
+    {
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('openidlogin'),
+                          _('OpenID'),
+                          _('Login or register with OpenID'),
+                          $action_name === 'openidlogin');
+
+        return true;
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf