From 62d9b66dffb0000122cd611a9d991da008f9a527 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 28 Sep 2010 15:45:00 -0700 Subject: Made YammerImport more robust against errors; can now pause/resume/reset the import state from the admin interface. --- plugins/YammerImport/actions/yammeradminpanel.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'plugins/YammerImport/actions') diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php index 13960d905..3faf390ac 100644 --- a/plugins/YammerImport/actions/yammeradminpanel.php +++ b/plugins/YammerImport/actions/yammeradminpanel.php @@ -73,6 +73,7 @@ class YammeradminpanelAction extends AdminPanelAction { // @fixme move this to saveSettings and friends? if ($_SERVER['REQUEST_METHOD'] == 'POST') { + StatusNet::setApi(true); // short error pages :P $this->checkSessionToken(); if ($this->subaction == 'change-apikey') { $form = new YammerApiKeyForm($this); @@ -97,6 +98,18 @@ class YammeradminpanelAction extends AdminPanelAction $this->runner->startBackgroundImport(); $form = new YammerProgressForm($this, $this->runner); + } else if ($this->subaction == 'pause-import') { + $this->runner->recordError(_m('Paused from admin panel.')); + $form = $this->statusForm(); + } else if ($this->subaction == 'continue-import') { + $this->runner->clearError(); + $this->runner->startBackgroundImport(); + $form = $this->statusForm(); + } else if ($this->subaction == 'abort-import') { + $this->runner->reset(); + $form = $this->statusForm(); + } else if ($this->subaction == 'progress') { + $form = $this->statusForm(); } else { throw new ClientException('Invalid POST'); } -- cgit v1.2.3-54-g00ecf