Changeset 1168

Timestamp:

11/18/08 23:20:20 (2 months ago)

Author:

laurentj

Message:

ticket #658: jauth~login:form should support auth_url_return in the form

Files:

• trunk/lib/jelix-modules/jauth/controllers/login.classic.php (modified) (7 diffs)
• trunk/lib/jelix-modules/jauth/templates/login.form.tpl (modified) (2 diffs)
• trunk/lib/jelix-modules/jauth/zones/loginform.zone.php (modified) (1 diff)
• trunk/lib/jelix/plugins/coord/auth/auth.coord.php (modified) (1 diff)

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

@@ -25 +25 @@
-        $url_return = '/';
-
+        // both after_login and after_logout config fields are required 
-        if ($conf['after_login'] == '')
-            throw new jException ('jauth~autherror.no.auth_login');
@@ -31 +32 @@
-            throw new jException ('jauth~autherror.no.auth_logout');
-
+        // if after_login_override = off or url_return doesnt exists, set url_return to after_login   
+        // if auth_url_return exists, redirect to it 
-        if (!($conf['enable_after_login_override'] && $url_return= $this->param('auth_url_return'))){
-            $url_return =  jUrl::get($conf['after_login']);
@@ -36 +39 @@
-
-        if (!jAuth::login($this->param('login'), $this->param('password'), $this->param('rememberMe'))){
+            // auth fails
-            sleep (intval($conf['on_error_sleep']));
-
+
+
+
+
-        }
-
@@ -48 +55 @@
-    *
-    */
- 
+
-        jAuth::logout();
-        $conf = $GLOBALS['gJCoord']->getPlugin ('auth')->config;
@@ -55 +62 @@
-            throw new jException ('jauth~autherror.no.auth_logout');
-
-
+
+
-            $url_return =  jUrl::get($conf['after_logout']);
-        }
+
-        $rep = $this->getResponse('redirectUrl');
-        $rep->url = $url_return;
@@ -67 +76 @@
-    */
-    function form() {
+        $conf = $GLOBALS['gJCoord']->getPlugin('auth')->config; 
-        if (jAuth::isConnected()) {
-            $conf = $GLOBALS['gJCoord']->getPlugin('auth')->config; 
-
-            if ($conf['after_login'] != '') {
-
+
+
-                    $url_return =  jUrl::get($conf['after_login']);
-                }
@@ -81 +90 @@
-
-        $rep = $this->getResponse('html');
+        $rep->title =  jLocale::get ('auth.titlePage.login');
+        //$rep->bodyTpl = 'jauth~index';
-
-
-
-
+
+
+
+
+
+
+
+
+
-        return $rep;
-    }

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

@@ -6 +6 @@
-{if ! $isLogged}
-
-j
+form
-      <fieldset>
-      <table>
@@ -24 +24 @@
-       {/if}
-       </table>
+       {formurlparam 'jauth~login:in'}
+       {if !empty($auth_url_return)}
+       <input type="hidden" name="auth_url_return" value="{$auth_url_return|eschtml}" />
+       {/if}
-       <input type="submit" value="{@jauth~auth.buttons.login@}"/>
-       </fieldset>

trunk/lib/jelix-modules/jauth/zones/loginform.zone.php

@@ -16 +16 @@
-    protected function _prepareTpl(){
-
-
-
-
+
+
+
+
-        $this->_tpl->assign ('user', jAuth::getUserSession());
-        $this->_tpl->assign ('isLogged', jAuth::isConnected());

trunk/lib/jelix/plugins/coord/auth/auth.coord.php

@@ -119 +119 @@
-                }else{
-                    if(!$badip){
+                        $auth_url_return = $GLOBALS['gJCoord']->request->getParam('auth_url_return');
+                        if($auth_url_return === null)
+                            $GLOBALS['gJCoord']->request->params['auth_url_return'] = jUrl::getCurrentUrl();
-                        $selector= new jSelectorAct($this->config['on_error_action']);
-                    }