Rework application registration workflow to be more private

5 files changed, 16 insertions, 37 deletions

diff --git a/actions/editapplication.php b/actions/editapplication.php
index a0ed3117a..a6db87c61 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -125,10 +125,7 @@ class EditApplicationAction extends OwnerDesignAction
 
         if ($this->arg('cancel')) {
             common_redirect(common_local_url('showapplication',
-                                             array(
-                                                   'nickname' => $cur->nickname,
-                                                   'id' => $this->app->id)
-                                             ), 303);
+                                             array('id' => $this->app->id)), 303);
         } elseif ($this->arg('save')) {
             $this->trySave();
         } else {
@@ -253,8 +250,7 @@ class EditApplicationAction extends OwnerDesignAction
 
         $this->app->uploadLogo();
 
-        common_redirect(common_local_url('apps',
-            array('nickname' => $cur->nickname)), 303);
+        common_redirect(common_local_url('oauthappssettings'), 303);
     }
 
 }
diff --git a/actions/newapplication.php b/actions/newapplication.php
index 7bb81095d..c499fe7c7 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -114,8 +114,7 @@ class NewApplicationAction extends OwnerDesignAction
     $cur = common_current_user();
 
     if ($this->arg('cancel')) {
-        common_redirect(common_local_url('apps',
-                         array('nickname' => $cur->nickname)), 303);
+        common_redirect(common_local_url('oauthappssettings'), 303);
     } elseif ($this->arg('save')) {
         $this->trySave();
     } else {
@@ -147,7 +146,7 @@ class NewApplicationAction extends OwnerDesignAction
 
     function trySave()
     {
-    $name         = $this->trimmed('name');
+        $name         = $this->trimmed('name');
         $description  = $this->trimmed('description');
         $source_url   = $this->trimmed('source_url');
         $organization = $this->trimmed('organization');
@@ -270,8 +269,7 @@ class NewApplicationAction extends OwnerDesignAction
 
         $app->query('COMMIT');
 
-        common_redirect(common_local_url('apps',
-            array('nickname' => $cur->nickname)), 303);
+        common_redirect(common_local_url('oauthappssettings'), 303);
 
     }
 
diff --git a/actions/apps.php b/actions/oauthappssettings.php
index 7c7b24570..6c0670b17 100644
--- a/actions/apps.php
+++ b/actions/oauthappssettings.php
@@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/applicationlist.php';
  * @see      SettingsAction
  */
 
-class AppsAction extends SettingsAction
+class OauthappssettingsAction extends SettingsAction
 {
     var $page = 0;
 
@@ -116,10 +116,7 @@ class AppsAction extends SettingsAction
 
         $this->elementStart('p', array('id' => 'application_register'));
         $this->element('a',
-            array('href' => common_local_url(
-                'newapplication',
-                array('nickname' => $user->nickname)
-                ),
+            array('href' => common_local_url('newapplication'),
                   'class' => 'more'
             ),
             'Register a new application');
@@ -129,8 +126,7 @@ class AppsAction extends SettingsAction
             $this->page > 1,
             $cnt > APPS_PER_PAGE,
             $this->page,
-            'apps',
-            array('nickname' => $user->nickname)
+            'oauthappssettings'
         );
     }
 
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 56e7b02fb..99bb9022b 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -158,7 +158,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
        $this->elementStart('p');
        $this->raw(_('Developers can edit the registration settings for their applications '));
        $this->element('a',
-           array('href' => common_local_url('apps', array('nickname' => $cur->nickname))),
+           array('href' => common_local_url('oauthappssettings')),
                'here.');
        $this->elementEnd('p');
     }
diff --git a/actions/showapplication.php b/actions/showapplication.php
index f2ff8b900..bd3337136 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -211,15 +211,9 @@ class ShowApplicationAction extends OwnerDesignAction
         $this->elementStart('ul');
         $this->elementStart('li', 'entity_edit');
         $this->element('a',
-            array('href' =>
-                common_local_url(
-                    'editapplication',
-                    array(
-                        'nickname' => $this->owner->nickname,
-                        'id' => $this->application->id
-                    )
-                )
-            ), 'Edit');
+                       array('href' => common_local_url('editapplication',
+                                                        array('id' => $this->application->id))),
+                       'Edit');
         $this->elementEnd('li');
 
         $this->elementStart('li', 'entity_reset_keysecret');
@@ -228,8 +222,7 @@ class ShowApplicationAction extends OwnerDesignAction
             'class' => 'form_reset_key',
             'method' => 'POST',
             'action' => common_local_url('showapplication',
-                array('nickname' => $cur->nickname,
-                      'id' => $this->application->id))));
+                array('id' => $this->application->id))));
 
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
@@ -273,13 +266,9 @@ class ShowApplicationAction extends OwnerDesignAction
 
         $this->elementStart('p', array('id' => 'application_action'));
         $this->element('a',
-            array(
-                'href' => common_local_url(
-                    'apps',
-                    array('nickname' => $this->owner->nickname)),
-                'class' => 'more'
-            ),
-            'View your applications');
+            array('href' => common_local_url('oauthappssettings'),
+                  'class' => 'more'),
+                  'View your applications');
         $this->elementEnd('p');
     }