Merge pull request #918 from thnkloud9/zplus

MOTM-851: Redirect user to the page they visited before logging in after...
sourcefabric · Dec 10, 2014 · 787a8e0 · 787a8e0
2 parents f6ffd48 + 8c3c9c9
commit 787a8e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/newscoop/application/controllers/AuthController.php b/newscoop/application/controllers/AuthController.php
@@ -34,6 +34,9 @@ public function indexAction()
             $result = $this->auth->authenticate($adapter);
 
             if ($result->getCode() == Zend_Auth_Result::SUCCESS) {
+                if (isset($values['_target_path'])) {
+                    $this->_helper->redirector->gotoUrl($values['_target_path']);
+                }
                 $this->_helper->redirector('index', 'dashboard');
             } else {
                 $form->addError($this->view->translate("Invalid credentials"));
@@ -99,6 +102,10 @@ public function socialAction()
             if ($user->isPending()) {
                 $this->_forward('confirm', 'register', 'default');
             } else {
+                $request = $this->getRequest();
+                if ($request->getParam('_target_path')) {
+                    $this->_helper->redirector->gotoUrl($request->getParam('_target_path'));
+                } 
                 $this->_helper->redirector('index', 'dashboard');
             }
         } catch (\Exception $e) {

diff --git a/newscoop/application/forms/Login.php b/newscoop/application/forms/Login.php
@@ -11,6 +11,10 @@ class Application_Form_Login extends Zend_Form
 {
     public function init()
     {
+        $this->addElement('hidden', '_target_path', array(
+            'value' => $_SERVER['REQUEST_URI'],
+        ));
+
         $this->addElement('text', 'email', array(
             'label' => 'Email',
             'required' => true,