Fixes issue pi-engine#42 for redirection bug

taiwen · May 2, 2013 · babb9ec · babb9ec
1 parent 532d58c
commit babb9ec
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/usr/module/system/src/Controller/Front/LoginController.php b/usr/module/system/src/Controller/Front/LoginController.php
@@ -46,9 +46,13 @@ public function indexAction()
 
         // Display login form
         $form = $this->getForm();
-        $redirect = $this->params('redirect') ?: $this->request->getServer('HTTP_REFERER');
-        if ($redirect) {
-            $form->setData(array('redirect' => urlencode($redirect)));
+        $redirect = $this->params('redirect');
+        if (null === $redirect) {
+            $redirect = $this->request->getServer('HTTP_REFERER');
+        }
+        if (null !== $redirect) {
+            $redirect = $redirect ? urlencode($redirect) : '';
+            $form->setData(array('redirect' => $redirect));
         }
         $this->renderForm($form);
     }

diff --git a/usr/module/system/src/Controller/Front/ProfileController.php b/usr/module/system/src/Controller/Front/ProfileController.php
@@ -32,7 +32,7 @@ public function indexAction()
     {
         $id = $this->params('id');
         if (!$id) {
-            $this->redirect()->toRoute('user');
+            $this->redirect()->toRoute('user', array('controller' => 'account'));
             return;
         }
         if (is_numeric($id)) {

diff --git a/usr/module/system/src/Controller/Front/RegisterController.php b/usr/module/system/src/Controller/Front/RegisterController.php
@@ -34,6 +34,12 @@ public function indexAction()
             return;
         }
 
+        // If already logged in
+        if (Pi::service('authentication')->hasIdentity()) {
+            $this->redirect()->toRoute('user', array('controller' => 'account'));
+            return;
+        }
+
         // Display register form
         $form = $this->getForm();
         $this->renderForm($form);

diff --git a/usr/module/system/src/Form/LoginForm.php b/usr/module/system/src/Form/LoginForm.php
@@ -89,12 +89,17 @@ public function init()
             'type'  => 'csrf',
         ));
 
-        $redirect = Pi::engine()->application()->getRequest()->getServer('HTTP_REFERER') ?: Pi::engine()->application()->getRequest()->getRequestUri();
+        $request = Pi::engine()->application()->getRequest();
+        $redirect = $request->getQuery('redirect');
+        if (null === $redirect) {
+            $redirect = $request->getServer('HTTP_REFERER') ?: $request->getRequestUri();
+        }
+        $redirect = $redirect ? urlencode($redirect) : '';
         $this->add(array(
             'name'  => 'redirect',
             'type'  => 'hidden',
             'attributes'    => array(
-                'value' => urlencode($redirect),
+                'value' => $redirect,
             ),
         ));
 

diff --git a/www/setup/src/Controller/Finish.php b/www/setup/src/Controller/Finish.php
@@ -93,7 +93,7 @@ public function indexAction()
         $readPaths .= "</ul>";
 
         $message = <<<'HTML'
-<h2>Congratulatons! The system is set up successfully. <a href='../index.php'>Click to visit your website!</a></h2>
+<h2>Congratulatons! The system is set up successfully. <a href='../index.php?redirect=0'>Click to visit your website!</a></h2>
 <h3>Security advisory</h3>
 <ol>For security considerations please make sure the following operations are done:
     <li>Remove the installation folder <strong>{www}/setup/</strong> from your server manually.</li>