[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9022] registration: domain select, translations
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9022] registration: domain select, translations |
|
Date: |
Wed, 21 Mar 2012 20:43:05 +0000 |
Revision: 9022
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9022
Author: sigurdne
Date: 2012-03-21 20:43:05 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
registration: domain select, translations
Modified Paths:
--------------
trunk/registration/inc/class.boreg.inc.php
trunk/registration/inc/class.soreg.inc.php
trunk/registration/inc/class.uireg.inc.php
trunk/registration/main.php
trunk/registration/templates/base/loginid_select.tpl
Added Paths:
-----------
trunk/registration/setup/phpgw_no.lang
Modified: trunk/registration/inc/class.boreg.inc.php
===================================================================
--- trunk/registration/inc/class.boreg.inc.php 2012-03-21 20:41:51 UTC (rev
9021)
+++ trunk/registration/inc/class.boreg.inc.php 2012-03-21 20:43:05 UTC (rev
9022)
@@ -217,7 +217,7 @@
else
{
// Redirect them so they don't hit refresh and
make a mess
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php','menuaction=registration.uireg.ready_to_activate®_id='
. $reg_id));
+
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'
=> 'registration.uireg.ready_to_activate', 'reg_id' => $reg_id, 'logindomain'
=> $_REQUEST['logindomain'])));
}
}
@@ -278,7 +278,7 @@
else
{
// Redirect them so they don't hit refresh and
make a mess
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php',
array('menuaction' => 'registration.uireg.email_sent_lostpw')));
+
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php',
array('menuaction' => 'registration.uireg.email_sent_lostpw','logindomain' =>
$_REQUEST['logindomain'])));
}
}
@@ -363,7 +363,7 @@
}
else
{
- $GLOBALS['phpgw']->redirect
($GLOBALS['phpgw']->link ('/registration/main.php',
'menuaction=registration.boreg.step1&r_reg[loginid]=' .
$_SERVER['PHP_AUTH_USER']));
+ $GLOBALS['phpgw']->redirect
($GLOBALS['phpgw']->link ('/registration/main.php', array('menuaction' =>
'registration.boreg.step1', 'r_reg[loginid]'=> $_SERVER['PHP_AUTH_USER'],
'logindomain' => $_REQUEST['logindomain'])));
}
}
Modified: trunk/registration/inc/class.soreg.inc.php
===================================================================
--- trunk/registration/inc/class.soreg.inc.php 2012-03-21 20:41:51 UTC (rev
9021)
+++ trunk/registration/inc/class.soreg.inc.php 2012-03-21 20:43:05 UTC (rev
9022)
@@ -78,7 +78,7 @@
}
- $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.step4', 'reg_id'=> $this->reg_id),false,true);
+ $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.step4', 'reg_id'=> $this->reg_id, 'logindomain' =>
$_REQUEST['logindomain']),false,true);
$GLOBALS['phpgw']->template->set_var('activate_url',"</br><a
href='$url'>Link.</a></br>");
if ($this->config['support_email'])
@@ -155,7 +155,7 @@
'message' => 'lostpw_email.tpl'
));
- $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.lostpw2', 'reg_id'=> $reg_id),false,true);
+ $url =
$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>
'registration.boreg.lostpw2', 'reg_id'=> $reg_id,'logindomain' =>
$_REQUEST['logindomain']),false,true);
$GLOBALS['phpgw']->template->set_var('firstname',$info['firstname']);
$GLOBALS['phpgw']->template->set_var('lastname',$info['lastname']);
$GLOBALS['phpgw']->template->set_var('activate_url',"</br><a
href='$url'>Link.</a></br>");
Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php 2012-03-21 20:41:51 UTC (rev
9021)
+++ trunk/registration/inc/class.uireg.inc.php 2012-03-21 20:43:05 UTC (rev
9022)
@@ -90,10 +90,58 @@
$this->template->set_var('errors',$GLOBALS['phpgw']->common->error_list($errors));
}
-
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step1')));
+
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step1',
'logindomain' => $_REQUEST['logindomain'] )));
$this->template->set_var('lang_username',lang('Username'));
$this->template->set_var('lang_submit',lang('Submit'));
+ if(
$GLOBALS['phpgw_info']['server']['domain_from_host']
+ &&
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
+ {
+ $this->template->set_var(
+ array(
+ 'domain_selects'
=> '',
+ 'logindomain'
=> $_SERVER['SERVER_NAME']
+ )
+ );
+ $this->template->parse('domain_from_hosts',
'domain_from_host');
+ }
+ elseif(
$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
+ {
+ $options = '';
+ foreach($GLOBALS['_phpgw_domain'] as
$domain_name => $domain_vars)
+ {
+ $selected = '';
+ if (isset($_REQUEST['logindomain']) &&
$_REQUEST['logindomain'] == $domain_name)
+ {
+ $selected = 'selected =
"selected"';
+ }
+
+ $domain_display_name = str_replace('_',
' ', $domain_name);
+ $options .= <<<HTML
+ <option
value='{$domain_name}'{$selected}>{$domain_display_name}</option>
+HTML;
+ }
+
+ $this->template->set_var('domain_options',
$options);
+
+ $this->template->set_var(
+ array(
+ 'domain_from_hosts'
=> '',
+ 'lang_domain'
=> lang('domain')
+ )
+ );
+ }
+ else
+ {
+ $this->template->set_var(
+ array(
+ 'domain_selects'
=> '',
+ 'domain_from_hosts'
=> ''
+ )
+ );
+
+ }
+
$this->template->pfp('out','form');
$this->footer();
@@ -150,7 +198,7 @@
}
}
-
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step2')));
+
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step2','logindomain'
=> $_REQUEST['logindomain'])));
$this->template->set_var('lang_password',lang('Password'));
$this->template->set_var('lang_reenter_password',lang('Re-enter password'));
$this->template->set_var('lang_submit',lang('Submit'));
@@ -181,7 +229,7 @@
if ($this->config['display_tos'])
{
-
$this->template->set_var('tos_link',$GLOBALS['phpgw']->link('/registration/main.php',
array('menuaction' => 'registration.uireg.tos')));
+
$this->template->set_var('tos_link',$GLOBALS['phpgw']->link('/registration/main.php',
array('menuaction' => 'registration.uireg.tos','logindomain' =>
$_REQUEST['logindomain'])));
$this->template->set_var('lang_tos_agree',lang('I have
read the terms and conditions and agree by them.'));
if ($r_reg['tos_agree'])
{
@@ -213,7 +261,7 @@
$this->template->set_var('errors',$GLOBALS['phpgw']->common->error_list($errors));
}
-
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.lostpw1')));
+
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.lostpw1','logindomain'
=> $_REQUEST['logindomain'])));
$this->template->set_var('lang_explain',lang('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.'));
$this->template->set_var('lang_username',lang('Username'));
$this->template->set_var('lang_submit',lang('Submit'));
@@ -238,7 +286,7 @@
$this->template->set_var('errors',$GLOBALS['phpgw']->common->error_list($errors));
}
-
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.lostpw3')));
+
$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.lostpw3','logindomain'
=> $_REQUEST['logindomain'])));
$this->template->set_var('value_username', $lid);
$this->template->set_var('lang_changepassword',lang("Change password for
user"));
$this->template->set_var('lang_enter_password',lang('Enter your new password'));
@@ -400,7 +448,7 @@
else
{
/* ($this->config['activate_account'] ==
'immediately') */
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step4',
'reg_id' => $reg_id)));
+
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/registration/main.php',array('menuaction'=>'registration.boreg.step4',
'reg_id' => $reg_id,'logindomain' => $_REQUEST['logindomain'])));
}
}
Modified: trunk/registration/main.php
===================================================================
--- trunk/registration/main.php 2012-03-21 20:41:51 UTC (rev 9021)
+++ trunk/registration/main.php 2012-03-21 20:43:05 UTC (rev 9022)
@@ -22,7 +22,7 @@
// Note: This is current not a drop in install, it requires some manual
installation
// Take a look at the README file
- $domain = 'default';
+ $domain = isset($_REQUEST['logindomain']) &&
$_REQUEST['logindomain'] ? $_REQUEST['logindomain'] : 'default';
$template_set = 'checkwithmom';
@@ -42,6 +42,7 @@
unset($GLOBALS['phpgw_info']['flags']['noapi']);
$_domain_info = isset($GLOBALS['phpgw_domain'][$_GET['domain']]) ?
$GLOBALS['phpgw_domain'][$_GET['domain']] : '';
+ $GLOBALS['_phpgw_domain'] = $GLOBALS['phpgw_domain'];
if(!$_domain_info)
{
Added: trunk/registration/setup/phpgw_no.lang
===================================================================
--- trunk/registration/setup/phpgw_no.lang (rev 0)
+++ trunk/registration/setup/phpgw_no.lang 2012-03-21 20:43:05 UTC (rev
9022)
@@ -0,0 +1,38 @@
+account password retrieval registration no Bruker passord re-set
+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
+change password for user registration no Bytt passord for user
+checkbox registration no Checkbox
+current fields: registration no Gjeldende felt:
+dropdown registration no Dropdown
+enter your new password registration no Skriv inn ditt nye
passord
+gender registration no Kjønn
+i have read the terms and conditions and agree by them. registration
no Jeg har lest og godkjent betingelsene.
+name (blank unless text, textarea, dropdown, checkbox; else alphanumeric only)
registration no Navn (blank dersom ikke Text, Textarea, Dropdown,
Checkbox; ellers bare alfanumerisk)
+order registration no Sortering
+phone registration no Telefon
+phpgroupware - account registration registration no Portico Estate
- Bruker registrering
+re-enter password registration no skriv passordet på nytt
+re-enter your password registration no skriv ditt passord på nytt
+registration common no Registration
+remove registration no Slett
+report all problems and abuse to registration no Rapporter
problemer og misbruk til
+required registration no Required
+sorry, that username does not exist. registration no Beklager, det
brukernavnet finnes ikke.
+sorry, that username is already taken. registration no Beklager, det
brukernavnet er allerede brukt.
+textarea registration no Tekstfelt
+the passwords you entered don't match registration no Passordene du
anga er ikke like
+the two passwords are not the same registration no Passordene er
ikke de samme
+type registration no Type
+update/add registration no Update/Add
+Username registration no Brukernavn
+values (for dropdown only; comma separated) registration no Verdi
(bare for Dropdown; comma separert)
+wrong session registration no Feil session
+you have entered an invalid birthday registration no Du har angitt
en ugyldig fødselsdag
+you have entered an invalid email address registration no Du har
angitt en ugyldig e-post adresse
+you must enter a password registration no Du må angi et passord
+you must enter a username registration no Du må angi et brukernavn
+you must fill in all of the required fields registration no Alle
obligatoriske felt må fylles ut
+you specified a value for registration no Du anga en verdi for
+zip/postal registration no PostNr
Modified: trunk/registration/templates/base/loginid_select.tpl
===================================================================
--- trunk/registration/templates/base/loginid_select.tpl 2012-03-21
20:41:51 UTC (rev 9021)
+++ trunk/registration/templates/base/loginid_select.tpl 2012-03-21
20:43:05 UTC (rev 9022)
@@ -1,8 +1,17 @@
<!-- BEGIN form -->
<center>{errors}</center>
+
<!-- BEGIN input -->
<form action="{form_action}" method="POST">
<table border="0" width="40%" align="center">
+ <tr >
+ <td>{lang_domain}</td>
+ <td>
+ <select name="logindomain" id="logindomain"
class="inputbox">
+ {domain_options}
+ </select>
+ </td>
+ </tr>
<tr>
<td>{lang_username}</td>
<td><input name="r_reg[loginid]" value="{value_username}"></td>
@@ -14,4 +23,4 @@
</table>
</form>
<!-- END input -->
-<!-- END form -->
\ No newline at end of file
+<!-- END form -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9022] registration: domain select, translations,
Sigurd Nes <=