[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9024] Merge 9020:9023 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9024] Merge 9020:9023 from trunk |
|
Date: |
Thu, 22 Mar 2012 08:41:58 +0000 |
Revision: 9024
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9024
Author: sigurdne
Date: 2012-03-22 08:41:58 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Merge 9020:9023 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/setup/phpgw_en.lang
branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
branches/Version-1_0-branch/registration/main.php
branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
Added Paths:
-----------
branches/Version-1_0-branch/registration/setup/phpgw_no.lang
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2012-03-22 08:41:58 UTC (rev 9024)
@@ -473,6 +473,9 @@
$this->tmpl->set_var('return_sso_login_url',
$variables['additional_url']);
}
+ $this->tmpl->set_var('lang_new_user', lang('new user'));
+ $this->tmpl->set_var('lang_forgotten_password',
lang('forgotten password'));
+
$this->tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title'])
?
$GLOBALS['phpgw_info']['server']['site_title']
: 'phpGroupWare'
Modified: branches/Version-1_0-branch/phpgwapi/setup/phpgw_en.lang
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/phpgw_en.lang 2012-03-22
08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/phpgwapi/setup/phpgw_en.lang 2012-03-22
08:41:58 UTC (rev 9024)
@@ -505,6 +505,8 @@
use button to search for calendarevent common en use Button to search
for Calendarevent
use button to search for project common en use Button to search
for Project
user common en User
+new user login en New User
+forgotten password login en Forgotten Password or Username
user accounts common en user accounts
user groups common en user groups
username common en Username
Modified: branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2012-03-22
08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/phpgwapi/setup/phpgw_no.lang 2012-03-22
08:41:58 UTC (rev 9024)
@@ -125,6 +125,8 @@
todays date, eg. %1 common no Dagens dato, %1
use cookies login no use cookies
username login no Brukernavn
+new user login no Ny bruker
+forgotten password login no Glemt passord eller Brukernavn
use a valid username and password to gain access to %1 login no Angi et
gyldig brukernavn og passord for få tilgang til %1
version common no versjon
you have been successfully logged out login no Du har nå logget ut
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2012-03-22 08:41:58 UTC (rev 9024)
@@ -150,6 +150,12 @@
</div>
<p>{instruction}</p>
+ <p >
+ <a href="registration/main.php"
target="_blank">{lang_new_user}</a>
+ </p>
+ </p>
+ <a
href="registration/main.php?menuaction=registration.boreg.lostpw1"
target="_blank">{lang_forgotten_password}</a>.
+ </p>
<div id="lock"></div>
@@ -172,12 +178,12 @@
</div>
</div>
</div>
-<div id="footer">
- <p class="copyright">
- <a href="http://www.porticoestate.no"; target="_blank">{system}
{version}</a> is Free Software released under the <a href=
- "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL License</a>.
- </p>
- </div>
+<div id="footer">
+ <p class="copyright">
+ <a href="http://www.porticoestate.no"; target="_blank">{system}
{version}</a> is Free Software released under the <a href=
+ "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL
License</a>.
+ </p>
+</div>
</body>
<!-- END login_form -->
</html>
Modified: branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
2012-03-22 08:41:58 UTC (rev 9024)
@@ -24,7 +24,7 @@
{order:1, name:'vendor_id', id:'txt_vendor'},
{order:2, name:'invoice_id', id:'txt_invoice'},
{order:3, name:'loc1', id:'txt_loc1'},
- {order:4, name:'voucher_id', id:'txt_voucher'},
+ {order:4, name:'voucher_id', id:'txt_voucher'}
]
// define Link Buttons
Modified: branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
2012-03-22 08:41:58 UTC (rev 9024)
@@ -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: branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
2012-03-22 08:41:58 UTC (rev 9024)
@@ -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: branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
===================================================================
--- branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
2012-03-22 08:41:58 UTC (rev 9024)
@@ -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: branches/Version-1_0-branch/registration/main.php
===================================================================
--- branches/Version-1_0-branch/registration/main.php 2012-03-22 08:40:10 UTC
(rev 9023)
+++ branches/Version-1_0-branch/registration/main.php 2012-03-22 08:41:58 UTC
(rev 9024)
@@ -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)
{
Copied: branches/Version-1_0-branch/registration/setup/phpgw_no.lang (from rev
9023, trunk/registration/setup/phpgw_no.lang)
===================================================================
--- branches/Version-1_0-branch/registration/setup/phpgw_no.lang
(rev 0)
+++ branches/Version-1_0-branch/registration/setup/phpgw_no.lang
2012-03-22 08:41:58 UTC (rev 9024)
@@ -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:
branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
===================================================================
--- branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
2012-03-22 08:40:10 UTC (rev 9023)
+++ branches/Version-1_0-branch/registration/templates/base/loginid_select.tpl
2012-03-22 08:41:58 UTC (rev 9024)
@@ -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] [9024] Merge 9020:9023 from trunk,
Sigurd Nes <=