[Fmsystem-commits] [11311] property: more on registration

[Sigurd Nes]

Revision: 11311
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11311
Author:   sigurdne
Date:     2013-09-23 11:20:39 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
property: more on registration

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/templates/base/login.tpl
    trunk/registration/inc/class.uireg.inc.php
    trunk/registration/main.php
    trunk/registration/setup/phpgw_no.lang
    trunk/registration/templates/base/lostpw_select.tpl

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-20 11:31:50 UTC 
(rev 11310)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2013-09-23 11:20:39 UTC 
(rev 11311)
@@ -478,6 +478,17 @@
                        $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']}";
+
+                       $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'])
+                                               );
+                       
+                       $this->tmpl->set_var('url_forgotten_password', 
$url_forgotten_password);
+
                        $this->tmpl->set_var('website_title', 
isset($GLOBALS['phpgw_info']['server']['site_title'])
                                                                ? 
$GLOBALS['phpgw_info']['server']['site_title'] 
                                                                : 'phpGroupWare'

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2013-09-20 11:31:50 UTC (rev 
11310)
+++ trunk/phpgwapi/templates/base/login.tpl     2013-09-23 11:20:39 UTC (rev 
11311)
@@ -164,10 +164,10 @@
 
                                        <p>{instruction}</p>
                                        <p >
-                                               <a href="registration/main.php" 
target="_blank">{lang_new_user}</a>
+                                               <a href="{url_new_user}" 
target="_blank">{lang_new_user}</a>
                                        </p>
                                        </p>
-                                               <a 
href="registration/main.php?menuaction=registration.uireg.lostpw1" 
target="_blank">{lang_forgotten_password}</a>.
+                                               <a 
href="{url_forgotten_password}" target="_blank">{lang_forgotten_password}</a>.
                                         </p>
 
                                        <div id="lock"></div>

Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php  2013-09-20 11:31:50 UTC (rev 
11310)
+++ trunk/registration/inc/class.uireg.inc.php  2013-09-23 11:20:39 UTC (rev 
11311)
@@ -58,10 +58,14 @@
                        $this->template->set_block('_layout','footer');
                }
 
-               function header()
+               function header($sub = '')
                {
+                       if(!$sub)
+                       {
+                               $sub = lang('Account registration');
+                       }
                        $this->set_header_footer_blocks();
-                       $this->template->set_var('lang_header', 
$GLOBALS['phpgw_info']['server']['system_name'] . ' - ' . lang('Account 
registration'));
+                       $this->template->set_var('lang_header', 
$GLOBALS['phpgw_info']['server']['system_name'] . ' :: ' . $sub);
                        $this->template->pfp('out','header');
                }
 
@@ -301,7 +305,8 @@
                //
                function lostpw1($errors = '',$r_reg = '')
                {
-                       $this->header();
+                       $sub = lang('lost password');
+                       $this->header($sub);
                        $this->template->set_file(array(
                                '_lostpw_select' => 'lostpw_select.tpl'
                        ));

Modified: trunk/registration/main.php
===================================================================
--- trunk/registration/main.php 2013-09-20 11:31:50 UTC (rev 11310)
+++ trunk/registration/main.php 2013-09-23 11:20:39 UTC (rev 11311)
@@ -105,7 +105,7 @@
                        $lang_denied = lang('Anonymous access not correctly 
configured');
                        if($GLOBALS['phpgw']->session->reason)
                        {
-                               $lang_denied = 
$GLOBALS['phpgw']->session->reason;
+       //                      $lang_denied = 
$GLOBALS['phpgw']->session->reason;
                        }
                        echo <<<HTML
                                <div class="error">$lang_denied</div>

Modified: trunk/registration/setup/phpgw_no.lang
===================================================================
--- trunk/registration/setup/phpgw_no.lang      2013-09-20 11:31:50 UTC (rev 
11310)
+++ trunk/registration/setup/phpgw_no.lang      2013-09-23 11:20:39 UTC (rev 
11311)
@@ -1,4 +1,5 @@
-account password retrieval     registration    no      Bruker passord re-set
+lost password  registration    no      Glemt passord
+account password retrieval     registration    no      Sett nytt passord
 account registration   registration    no      Ny bruker
 address        registration    no      Adresse
 after you enter your username, instructions to change your password will be 
sent to you by e-mail to the address you gave when you registered. registration 
   no      Etter at du angir ditt brukernavn, vil du få en e-post til den 
adressen du oppga ved registrering for å resette passordet

Modified: trunk/registration/templates/base/lostpw_select.tpl
===================================================================
--- trunk/registration/templates/base/lostpw_select.tpl 2013-09-20 11:31:50 UTC 
(rev 11310)
+++ trunk/registration/templates/base/lostpw_select.tpl 2013-09-23 11:20:39 UTC 
(rev 11311)
@@ -15,4 +15,4 @@
   </tr>
  </table>
 </form>
-<!-- END form -->
\ No newline at end of file
+<!-- END form -->