[Fmsystem-commits] [11319] registration: include correct domain in url

[Sigurd Nes]

Revision: 11319
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11319
Author:   sigurdne
Date:     2013-09-24 12:55:12 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
registration: include correct domain in url

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/templates/base/login.tpl

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-24 12:53:55 UTC 
(rev 11318)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-24 12:55:12 UTC 
(rev 11319)
@@ -478,16 +478,15 @@
                        $this->tmpl->set_var('lang_new_user', lang('new user'));
                        $this->tmpl->set_var('lang_forgotten_password', 
lang('forgotten password'));
 
-                       $url_new_user = 
"{$webserver_url}/registration/main.php?logindomain={$_COOKIE['last_domain']}";
+                       $url_new_user = 
"{$webserver_url}/registration/main.php";
 
                        $this->tmpl->set_var('url_new_user', $url_new_user);
 
-                       $url_forgotten_password = 
"{$webserver_url}/registration/main.php?" . http_build_query(array(
-                                               'menuaction'    
=>'registration.uireg.lostpw1',
-                                               'logindomain'   
=>$_COOKIE['last_domain'])
+                       $url_lost_password = 
"{$webserver_url}/registration/main.php?" . http_build_query(array(
+                                               'menuaction'    
=>'registration.uireg.lostpw1')
                                                );
                        
-                       $this->tmpl->set_var('url_forgotten_password', 
$url_forgotten_password);
+                       $this->tmpl->set_var('url_lost_password', 
$url_lost_password);
 
                        $this->tmpl->set_var('website_title', 
isset($GLOBALS['phpgw_info']['server']['site_title'])
                                                                ? 
$GLOBALS['phpgw_info']['server']['site_title'] 

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2013-09-24 12:53:55 UTC (rev 
11318)
+++ trunk/phpgwapi/templates/base/login.tpl     2013-09-24 12:55:12 UTC (rev 
11319)
@@ -36,6 +36,25 @@
                        }
                        document.login.submit();
                }
+
+
+               function new_user()
+               {
+                       var url_new_user = '{url_new_user}';
+                       
+                       url_new_user += '?logindomain=' + 
document.getElementById("logindomain").value;
+                       window.open(url_new_user,'_blank');
+               }
+
+               function lost_password()
+               {
+                       var url_lost_password = '{url_lost_password}';
+                       
+                       url_lost_password += '&logindomain=' + 
document.getElementById("logindomain").value;
+                       window.open(url_lost_password,'_blank');
+               }
+
+
        </script>
 
 </head>
@@ -97,7 +116,7 @@
                                                                </p>
                                                                <!-- END 
loging_block -->
                                                                <!-- BEGIN 
domain_from_host -->
-                                                                       
@{logindomain}<input type="hidden" name="logindomain" value="{logindomain}">
+                                                                       
@{logindomain}<input type="hidden" id="logindomain" name="logindomain" 
value="{logindomain}">
                                                                <!-- END 
domain_from_host -->
                                                                <br>
                                                                <!-- BEGIN 
login_additional_info -->
@@ -164,10 +183,10 @@
 
                                        <p>{instruction}</p>
                                        <p >
-                                               <a href="{url_new_user}" 
target="_blank">{lang_new_user}</a>
+                                               <a 
href="javascript:new_user();">{lang_new_user}</a>
                                        </p>
                                        </p>
-                                               <a 
href="{url_forgotten_password}" target="_blank">{lang_forgotten_password}</a>.
+                                               <a 
href="javascript:lost_password();">{lang_forgotten_password}</a>.
                                         </p>
 
                                        <div id="lock"></div>