[Fmsystem-commits] [11721] custom new user url

[Sigurd Nes]

Revision: 11721
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11721
Author:   sigurdne
Date:     2014-02-18 19:44:10 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
custom new user url

Modified Paths:
--------------
    trunk/header.inc.php.template
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/setup/manageheader.php
    trunk/setup/templates/base/manageheader.tpl

Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template       2014-02-18 15:56:40 UTC (rev 11720)
+++ trunk/header.inc.php.template       2014-02-18 19:44:10 UTC (rev 11721)
@@ -132,8 +132,19 @@
 {LOGIN_RIGHT_MESSAGE}
 HTML;
 
+       /**
+       * @global string $phpgw_info['new_user_url']
+        * An otpional url to new user registration
+        */
+       $GLOBALS['phpgw_info']['server']['new_user_url'] = '{NEW_USER_URL}';
 
        /**
+       * @global string $phpgw_info['lost_password_url']
+       * An otpional url to remedy lost passwords
+        */
+       $GLOBALS['phpgw_info']['server']['lost_password_url'] = 
'{LOST_PASSWORD_URL}';
+
+       /**
        * @global boolean $phpgw_info['server']['mcrypt_enabled']
        * This is used to control mcrypt's use
        */

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2014-02-18 15:56:40 UTC 
(rev 11720)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2014-02-18 19:44:10 UTC 
(rev 11721)
@@ -478,13 +478,26 @@
                        $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";
-
+                       
if(isset($GLOBALS['phpgw_info']['server']['new_user_url']) && 
$GLOBALS['phpgw_info']['server']['new_user_url'])
+                       {
+                               $url_new_user = 
$GLOBALS['phpgw_info']['server']['new_user_url'];
+                       }
+                       else
+                       {
+                               $url_new_user = 
"{$webserver_url}/registration/main.php";
+                       }
                        $this->tmpl->set_var('url_new_user', $url_new_user);
 
-                       $url_lost_password = 
"{$webserver_url}/registration/main.php?" . http_build_query(array(
+                       
if(isset($GLOBALS['phpgw_info']['server']['lost_password_url']) && 
$GLOBALS['phpgw_info']['server']['lost_password_url'])
+                       {
+                               $url_lost_password = 
$GLOBALS['phpgw_info']['server']['lost_password_url'];
+                       }
+                       else
+                       {
+                               $url_lost_password = 
"{$webserver_url}/registration/main.php?" . http_build_query(array(
                                                'menuaction'    
=>'registration.uireg.lostpw1')
                                                );
+                       }
                        
                        $this->tmpl->set_var('url_lost_password', 
$url_lost_password);
 

Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php        2014-02-18 15:56:40 UTC (rev 11720)
+++ trunk/setup/manageheader.php        2014-02-18 19:44:10 UTC (rev 11721)
@@ -649,6 +649,8 @@
                        $setup_tpl->set_var('default_lang', 
isset($GLOBALS['phpgw_info']['server']['default_lang']) ? 
$GLOBALS['phpgw_info']['server']['default_lang'] : phpgw::get_var('ConfigLang', 
'string', 'POST'));
                        $setup_tpl->set_var('login_left_message', 
$GLOBALS['phpgw_info']['login_left_message']);
                        $setup_tpl->set_var('login_right_message', 
$GLOBALS['phpgw_info']['login_right_message']);
+                       $setup_tpl->set_var('new_user_url', 
$GLOBALS['phpgw_info']['server']['new_user_url']);
+                       $setup_tpl->set_var('lost_password_url', 
$GLOBALS['phpgw_info']['server']['lost_password_url']);
 
 
 
@@ -751,6 +753,8 @@
                        $setup_tpl->set_var('lang_system_name',lang('System 
name'));
                        
$setup_tpl->set_var('lang_login_left_message',lang('login left message'));
                        
$setup_tpl->set_var('lang_login_right_message',lang('login right message'));
+                       $setup_tpl->set_var('lang_new_user',lang('url new 
user'));
+                       $setup_tpl->set_var('lang_forgotten_password',lang('url 
forgotten password'));
                        $setup_tpl->set_var('lang_dbhost',lang('DB Host'));
                        
$setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server'));
                        $setup_tpl->set_var('lang_dbname',lang('DB Name'));

Modified: trunk/setup/templates/base/manageheader.tpl
===================================================================
--- trunk/setup/templates/base/manageheader.tpl 2014-02-18 15:56:40 UTC (rev 
11720)
+++ trunk/setup/templates/base/manageheader.tpl 2014-02-18 19:44:10 UTC (rev 
11721)
@@ -34,6 +34,13 @@
       <textarea cols="80" rows="4" name="setting[login_right_message]" 
wrap="virtual">{login_right_message}</textarea>
     </td>
   </tr>
+  <tr>
+    <td colspan="2"><b>{lang_new_user}</b><br><input type="text" 
name="setting[new_user_url]" size="80" value="{new_user_url}"></td>
+  </tr>
+  <tr>
+    <td colspan="2"><b>{lang_forgotten_password}</b><br><input type="text" 
name="setting[lost_password_url]" size="80" value="{lost_password_url}"></td>
+  </tr>
+
   <br><br>
   <tr>
     <td><b>{lang_persist}</b><br>