use library function to determine if https should be used for recaptcha

[quix0rs-gnu-social.git] / actions / apioauthauthorize.php

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 0b6cf34bd20970024dab5021d9d102c657e92aed..2b8ea84c7d9ca3ebc0d463bd52a0a6a6b2110543 100644 (file)
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -323,18 +323,46 @@ class ApiOauthAuthorizeAction extends Action
     }
 
     /**
-     * Override to add some special (more compact) styling when the page is
-     * being displayed in desktop mode.
+     * Show body - override to add a special CSS class for the authorize
+     * page's "desktop mode" (minimal display)
+     *
+     * Calls template methods
      *
      * @return nothing
      */
-    function showStylesheets()
+    function showBody()
     {
-        parent::showStyleSheets();
+        $bodyClasses = array();
 
         if ($this->desktopMode()) {
-            $this->style('#wrap {min-width: 500px; } #content {width: 480px; padding: 10px;} fieldset {margin-bottom: 10px !important;}</style>');
+            $bodyClasses[] = 'oauth-desktop-mode';
+        }
+
+        if (common_current_user()) {
+            $bodyClasses[] = 'user_in';
+        }
+
+        $attrs = array('id' => strtolower($this->trimmed('action')));
+
+        if (!empty($bodyClasses)) {
+            $attrs['class'] = implode(' ', $bodyClasses);
         }
+
+        $this->elementStart('body', $attrs);
+
+        $this->elementStart('div', array('id' => 'wrap'));
+        if (Event::handle('StartShowHeader', array($this))) {
+            $this->showHeader();
+            Event::handle('EndShowHeader', array($this));
+        }
+        $this->showCore();
+        if (Event::handle('StartShowFooter', array($this))) {
+            $this->showFooter();
+            Event::handle('EndShowFooter', array($this));
+        }
+        $this->elementEnd('div');
+        $this->showScripts();
+        $this->elementEnd('body');
     }
 
     function showForm($error=null)
@@ -372,20 +400,21 @@ class ApiOauthAuthorizeAction extends Action
         $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'),
                                  // TRANS: Fieldset legend.
                                  _('Allow or deny access'));
 
         $this->hidden('token', common_session_token());
+       $this->hidden('mode', $this->mode);
         $this->hidden('oauth_token', $this->oauthTokenParam);
         $this->hidden('oauth_callback', $this->callback);
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->elementStart('p');
-        if (!empty($this->app->icon)) {
+        if (!empty($this->app->icon) && $this->app->name != 'anonymous') {
             $this->element('img', array('src' => $this->app->icon));
         }
 
@@ -395,11 +424,19 @@ class ApiOauthAuthorizeAction extends Action
         // TRANS: User notification of external application requesting account access.
         // TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
         // TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-        $msg = _('The application <strong>%1$s</strong> by ' .
-                 '<strong>%2$s</strong> would like the ability ' .
+        if ($this->app->name == 'anonymous') {
+        // Special message for the anonymous app and consumer
+            $msg = _('An application would like the ability ' .
                  'to <strong>%3$s</strong> your %4$s account data. ' .
                  'You should only give access to your %4$s account ' .
                  'to third parties you trust.');
+        } else {
+            $msg = _('The application <strong>%1$s</strong> by ' .
+                     '<strong>%2$s</strong> would like the ability ' .
+                     'to <strong>%3$s</strong> your %4$s account data. ' .
+                     'You should only give access to your %4$s account ' .
+                     'to third parties you trust.');
+        }
 
         $this->raw(sprintf($msg,
                            $this->app->name,
@@ -578,19 +615,24 @@ class ApiOauthAuthorizeAction extends Action
         $title = sprintf(
            // TRANS: Header of user notification after authorising an application access to a profile.
            // TRANS: %s is the authorised application name.
-            _("You have successfully authorized %s."),
-            $this->app->name
+            _('You have successfully authorized %s.'),
+            ($this->app->name == 'anonymous') ? 'the application' : $this->app->name
         );
 
         $msg = sprintf(
             // TRANS: Uer notification after authorising an application access to a profile.
             // TRANS: %s is the authorised application name.
             _('Please return to %s and enter the following security code to complete the process.'),
-            $this->app->name
+            ($this->app->name == 'anonymous') ? 'the application' : $this->app->name
         );
 
         if ($this->reqToken->verified_callback == 'oob') {
-            $pin = new ApiOauthPinAction($title, $msg, $this->reqToken->verifier);
+            $pin = new ApiOauthPinAction(
+                $title,
+                $msg,
+                $this->reqToken->verifier,
+                $this->desktopMode()
+            );
             $pin->showPage();
         } else {