From 55ad954b15d0d2d855c4cb8db5da95d3c2d0dbfb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 17 Sep 2010 16:38:12 -0700
Subject: Basic license admin panel (maybe we can make it fancier later)

---
 lib/router.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/router.php')

diff --git a/lib/router.php b/lib/router.php
index 7e1e6a2a4..fb5a3c7c3 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -690,6 +690,8 @@ class Router
             $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
             $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
             $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
+            $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+
 
             $m->connect('getfile/:filename',
                         array('action' => 'getfile'),
-- 
cgit v1.2.3-54-g00ecf


From 77609e0c4a1b76748ab320027b0696aced92b52c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 22 Sep 2010 23:30:50 +0000
Subject: Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
 login page when a site is in private mode

---
 actions/apioauthauthorize.php |  2 +-
 lib/router.php                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/router.php')

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index e7c6f3761..c2fbbcdd8 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -270,7 +270,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_apioauthauthorize',
                                           'class' => 'form_settings',
-                                          'action' => common_local_url('apioauthauthorize')));
+                                          'action' => common_local_url('ApiOauthAuthorize')));
         $this->elementStart('fieldset');
         $this->element('legend', array('id' => 'apioauthauthorize_allowdeny'),
                                  _('Allow or deny access'));
diff --git a/lib/router.php b/lib/router.php
index fb5a3c7c3..00b299373 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -488,19 +488,19 @@ class Router
             // Social graph
 
             $m->connect('api/friends/ids/:id.:format',
-                        array('action' => 'apiuserfriends',
+                        array('action' => 'ApiUserFriends',
                               'ids_only' => true));
 
             $m->connect('api/followers/ids/:id.:format',
-                        array('action' => 'apiuserfollowers',
+                        array('action' => 'ApiUserFollowers',
                               'ids_only' => true));
 
             $m->connect('api/friends/ids.:format',
-                        array('action' => 'apiuserfriends',
+                        array('action' => 'ApiUserFriends',
                               'ids_only' => true));
 
             $m->connect('api/followers/ids.:format',
-                        array('action' => 'apiuserfollowers',
+                        array('action' => 'ApiUserFollowers',
                               'ids_only' => true));
 
             // account
@@ -672,13 +672,13 @@ class Router
             $m->connect('api/trends.json', array('action' => 'ApiTrends'));
 
             $m->connect('api/oauth/request_token',
-                        array('action' => 'apioauthrequesttoken'));
+                        array('action' => 'ApiOauthRequestToken'));
 
             $m->connect('api/oauth/access_token',
-                        array('action' => 'apioauthaccesstoken'));
+                        array('action' => 'ApiOauthAccessToken'));
 
             $m->connect('api/oauth/authorize',
-                        array('action' => 'apioauthauthorize'));
+                        array('action' => 'ApiOauthAuthorize'));
 
             // Admin
 
-- 
cgit v1.2.3-54-g00ecf