Ok, got the AJAX clicky-throughs working for yammer auth (if app is already registere...

diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php
index 71651cdf5667050ce8738979375f517ab7df1a67..fdf7a084f4db0397a1b317e1426e7633b7e92f52 100644 (file)
--- a/plugins/YammerImport/actions/yammeradminpanel.php
+++ b/plugins/YammerImport/actions/yammeradminpanel.php
@@ -76,7 +76,7 @@ class YammeradminpanelAction extends AdminPanelAction
                 return $this->showAjaxForm($form);
             } else if ($this->verify_token) {
                 $this->runner->saveAuthToken($this->verify_token);
-                $form = new YammerAuthProgressForm();
+                $form = new YammerProgressForm($this, $this->runner);
                 return $this->showAjaxForm($form);
             } else {
                 throw new ClientException('Invalid POST');

diff --git a/plugins/YammerImport/lib/yammerauthverifyform.php b/plugins/YammerImport/lib/yammerauthverifyform.php
index dc9d2ce1b205d6dd63fee8a63bfa1d2a17e31814..96decea1027a53440b0dc680fa5d8271a4f25730 100644 (file)
--- a/plugins/YammerImport/lib/yammerauthverifyform.php
+++ b/plugins/YammerImport/lib/yammerauthverifyform.php
@@ -65,8 +65,17 @@ class YammerAuthVerifyForm extends Form
     function formData()
     {
         $this->out->input('verify_token', _m('Verification code:'), '', _m("Click through and paste the code it gives you below..."));
+        
+        // iframe would be nice to avoid leaving -- since they don't seem to have callback url O_O
+        /*
         $this->out->element('iframe', array('id' => 'yammer-oauth',
                                             'src' => $this->runner->getAuthUrl()));
+        */
+        // yeah, it ignores the callback_url
+        $this->out->element('a',
+            array('href' => $this->runner->getAuthUrl(),
+                  'target' => '_blank'),
+            'clicky click');
     }
 
     /**