[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14604] registration
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14604] registration |
|
Date: |
Wed, 16 Dec 2015 13:05:38 +0000 |
Revision: 14604
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14604
Author: sigurdne
Date: 2015-12-16 13:05:36 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
registration
Modified Paths:
--------------
branches/dev-syncromind/registration/inc/class.boreg.inc.php
branches/dev-syncromind/registration/inc/class.uireg.inc.php
branches/dev-syncromind/registration/templates/base/layout.tpl
branches/dev-syncromind/registration/templates/base/loginid_select.tpl
Modified: branches/dev-syncromind/registration/inc/class.boreg.inc.php
===================================================================
--- branches/dev-syncromind/registration/inc/class.boreg.inc.php
2015-12-15 10:42:51 UTC (rev 14603)
+++ branches/dev-syncromind/registration/inc/class.boreg.inc.php
2015-12-16 13:05:36 UTC (rev 14604)
@@ -50,7 +50,7 @@
$so = createobject('registration.soreg');
- if (! $r_reg['loginid'] &&
!$this->config['username_is'] == 'email')
+ if (! $r_reg['loginid'] && $this->config['username_is']
!= 'email')
{
$errors[] = lang('You must enter a username');
}
@@ -67,7 +67,7 @@
}
else
{
- if(!$this->config['username_is'] == 'email')
+ if($this->config['username_is'] != 'email')
{
$GLOBALS['phpgw']->session->appsession('loginid','registration',$r_reg['loginid']);
}
Modified: branches/dev-syncromind/registration/inc/class.uireg.inc.php
===================================================================
--- branches/dev-syncromind/registration/inc/class.uireg.inc.php
2015-12-15 10:42:51 UTC (rev 14603)
+++ branches/dev-syncromind/registration/inc/class.uireg.inc.php
2015-12-16 13:05:36 UTC (rev 14604)
@@ -65,6 +65,9 @@
$sub = lang('Account registration');
}
$this->set_header_footer_blocks();
+ $GLOBALS['phpgw_info']['server']['no_jscombine']=true;
+ $this->template->set_var('css',
$GLOBALS['phpgw']->common->get_css());
+ $this->template->set_var('javascript',
$GLOBALS['phpgw']->common->get_javascript());
$this->template->set_var('lang_header',
$GLOBALS['phpgw_info']['server']['system_name'] . ' :: ' . $sub);
$this->template->pfp('out','header');
}
@@ -80,6 +83,7 @@
{
$this->simple_screen ('error_general.tpl',
$GLOBALS['phpgw']->common->error_list ($errors));
}
+ phpgwapi_jquery::formvalidator_generate(array('date',
'security'));
$show_username_prompt = True;
/* Note that check_select_username() may not return */
Modified: branches/dev-syncromind/registration/templates/base/layout.tpl
===================================================================
--- branches/dev-syncromind/registration/templates/base/layout.tpl
2015-12-15 10:42:51 UTC (rev 14603)
+++ branches/dev-syncromind/registration/templates/base/layout.tpl
2015-12-16 13:05:36 UTC (rev 14604)
@@ -1,4 +1,9 @@
<!-- BEGIN header -->
+<header>
+ {javascript}
+ {css}
+</header>
+
<body bgcolor="#FFFFFF" marginheight="0" marginwidth="0" leftmargin="0"
rightmargin="0" topmargin="0" bottommargin="0">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr bgcolor="#486591">
Modified: branches/dev-syncromind/registration/templates/base/loginid_select.tpl
===================================================================
--- branches/dev-syncromind/registration/templates/base/loginid_select.tpl
2015-12-15 10:42:51 UTC (rev 14603)
+++ branches/dev-syncromind/registration/templates/base/loginid_select.tpl
2015-12-16 13:05:36 UTC (rev 14604)
@@ -2,7 +2,7 @@
<center>{errors}</center>
<!-- BEGIN input -->
-<form action="{form_action}" method="POST">
+<form action="{form_action}" method="POST" id="form">
<table border="0" width="40%" align="center">
<tr>
@@ -10,7 +10,8 @@
</tr>
<tr>
<td>{lang_username}</td>
- <td>{domain_from_host}<input name="r_reg[loginid]"
value="{value_username}"></td>
+ <td>{domain_from_host}<input name="r_reg[loginid]" value="{value_username}"
data-validation="length alphanumeric" data-validation-length="3-10"/>
+ </td>
</tr>
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14604] registration,
Sigurd Nes <=