diff options
author | Brion Vibber <brion@pobox.com> | 2010-09-27 12:24:10 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-09-28 07:44:25 -0700 |
commit | a57d67c91548482c74e07034c7717fa4e1057d3b (patch) | |
tree | d60467ffc0993682fb5f46f7434fbca815dafedc /plugins/YammerImport/actions | |
parent | 698f5c7a20d5792b629404ce513d2fa2c2bab907 (diff) |
Work in progress on fixing auth... looks like the iframe doesn't work though. Sigh.
Diffstat (limited to 'plugins/YammerImport/actions')
-rw-r--r-- | plugins/YammerImport/actions/yammeradminpanel.php | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php index 56e721d03..71651cdf5 100644 --- a/plugins/YammerImport/actions/yammeradminpanel.php +++ b/plugins/YammerImport/actions/yammeradminpanel.php @@ -33,6 +33,8 @@ if (!defined('STATUSNET')) { class YammeradminpanelAction extends AdminPanelAction { + private $runner; + /** * Returns the page title * @@ -59,23 +61,29 @@ class YammeradminpanelAction extends AdminPanelAction $this->init_auth = $this->trimmed('init_auth'); $this->verify_token = $this->trimmed('verify_token'); + $this->runner = YammerRunner::init(); return $ok; } function handle($args) { - if ($this->init_auth) { - $url = $runner->requestAuth(); - $form = new YammerAuthVerifyForm($this, $url); - return $this->showAjaxForm($form); - } else if ($this->verify_token) { - $runner->saveAuthToken($this->verify_token); - $form = new YammerAuthProgressForm(); - return $this->showAjaxForm($form); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->checkSessionToken(); + if ($this->init_auth) { + $url = $this->runner->requestAuth(); + $form = new YammerAuthVerifyForm($this, $this->runner); + return $this->showAjaxForm($form); + } else if ($this->verify_token) { + $this->runner->saveAuthToken($this->verify_token); + $form = new YammerAuthProgressForm(); + return $this->showAjaxForm($form); + } else { + throw new ClientException('Invalid POST'); + } + } else { + return parent::handle($args); } - - return parent::handle($args); } function showAjaxForm($form) @@ -99,18 +107,16 @@ class YammeradminpanelAction extends AdminPanelAction { $this->elementStart('fieldset'); - $runner = YammerRunner::init(); - - switch($runner->state()) + switch($this->runner->state()) { case 'init': - $form = new YammerAuthInitForm($this); + $form = new YammerAuthInitForm($this, $this->runner); break; case 'requesting-auth': - $form = new YammerAuthVerifyForm($this, $runner); + $form = new YammerAuthVerifyForm($this, $this->runner); break; default: - $form = new YammerProgressForm($this, $runner); + $form = new YammerProgressForm($this, $this->runner); } $form->show(); |