Changeset 1024

Timestamp:

07/18/08 23:28:59 (1 month ago)

Author:

laurentj

Message:

ticket #650: jauth~login:form should redirect to after_login if the user is already connected. p=bastnic

Files:

• branches/1.0.x/lib/jelix-modules/jauth/controllers/login.classic.php (modified) (3 diffs)
• branches/1.0.x/lib/jelix-modules/jauth/templates/login.form.tpl (modified) (1 diff)
• trunk/lib/jelix-modules/jauth/controllers/login.classic.php (modified) (3 diffs)
• trunk/lib/jelix-modules/jauth/templates/login.form.tpl (modified) (1 diff)

branches/1.0.x/lib/jelix-modules/jauth/controllers/login.classic.php

@@ -5 +5 @@
-* @author      Laurent Jouanneau
-* @contributor Antoine Detante
-
+
+
-* @link        http://www.jelix.org
-* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -66 +67 @@
-    */
-    function form() {
+        if (jAuth::isConnected()) {
+            $conf = $GLOBALS['gJCoord']->getPlugin('auth')->config; 
+
+            if ($conf['after_login'] != '') {
+                if (!($conf['enable_after_login_override'] && $url_return= $this->param('auth_url_return'))){ 
+                    $url_return =  jUrl::get($conf['after_login']);
+                }
+                $rep = $this->getResponse('redirectUrl');
+                $rep->url = $url_return;
+                return $rep;
+            }
+        }
+
-        $rep = $this->getResponse('html');
-
@@ -74 +88 @@
-    }
-}
-?>

branches/1.0.x/lib/jelix-modules/jauth/templates/login.form.tpl

@@ -28 +28 @@
-   </form>
-{else}
-surname} {$user->name
+login
-{/if}
-</div>

trunk/lib/jelix-modules/jauth/controllers/login.classic.php

@@ -5 +5 @@
-* @author      Laurent Jouanneau
-* @contributor Antoine Detante
-
+
+
-* @link        http://www.jelix.org
-* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
@@ -66 +67 @@
-    */
-    function form() {
+        if (jAuth::isConnected()) {
+            $conf = $GLOBALS['gJCoord']->getPlugin('auth')->config; 
+
+            if ($conf['after_login'] != '') {
+                if (!($conf['enable_after_login_override'] && $url_return= $this->param('auth_url_return'))){ 
+                    $url_return =  jUrl::get($conf['after_login']);
+                }
+                $rep = $this->getResponse('redirectUrl');
+                $rep->url = $url_return;
+                return $rep;
+            }
+        }
+
-        $rep = $this->getResponse('html');
-
@@ -74 +88 @@
-    }
-}
-?>

trunk/lib/jelix-modules/jauth/templates/login.form.tpl

@@ -28 +28 @@
-   </form>
-{else}
-surname} {$user->name
+login
-{/if}
-</div>