FINAL suepr merge step : added all modules to this super repos
This commit is contained in:
Bachir Soussi Chiadmi
339
sites/all/modules/contrib/users/email_registration/LICENSE.txt
Normal file
339
sites/all/modules/contrib/users/email_registration/LICENSE.txt
Normal file
@@ -0,0 +1,339 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
@@ -0,0 +1,44 @@
|
||||
Email Registration allows users to register and login with their e-mail address
|
||||
instead of using a separate username in addition to the e-mail address. It will
|
||||
automatically generate a username based on the e-mail address but that behavior
|
||||
can be overridden with a custom hook implementation in a site specific module.
|
||||
|
||||
INSTALLATION
|
||||
============
|
||||
|
||||
Required step:
|
||||
|
||||
1. Enable the module as you normally would.
|
||||
|
||||
|
||||
Optional steps:
|
||||
|
||||
2. You will probably want to change the welcome e-mail
|
||||
(Administer -> User Management -> User Settings) and replace instances of
|
||||
the token !username with !mailto
|
||||
|
||||
3. This automatically generated username is still displayed name for posts,
|
||||
comments, etc. You can allow your useres to change their username by
|
||||
going to: (Administer -> User Management -> Access Control) and granting
|
||||
the permission to "change own username"
|
||||
This privilege allows a user to change their username in "My Account".
|
||||
|
||||
4. If a user enters an invalid email or password they will see a message:
|
||||
"Sorry, unrecognized username or password. Have you forgotten your password?"
|
||||
That message is confusing because it mentions username when all other
|
||||
language on the page mentions entering their E-mail. This can be easily
|
||||
overridden in your settings.php file with an entry like this:
|
||||
|
||||
$conf['locale_custom_strings_en'][''] = array(
|
||||
'Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>' => 'Sorry, unrecognized e-mail or password. <a href="@password">Have you forgotten your password?</a>',
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
BUGS, FEATURES, QUESTIONS
|
||||
=========================
|
||||
Post any bugs, features or questions to the issue queue:
|
||||
|
||||
http://drupal.org/project/issues/email_registration
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Documentation for email_registration API.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @addtogroup hooks
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implement this hook to generate a username for email_registration module.
|
||||
*
|
||||
* Other modules may implement hook_email_registration_name($edit, $account)
|
||||
* to generate a username (return a string to be used as the username, NULL
|
||||
* to have email_registration generate it).
|
||||
*
|
||||
* @param $edit
|
||||
* The array of form values submitted by the user.
|
||||
* @param $account
|
||||
* The user object on which the operation is being performed.
|
||||
*
|
||||
* @return
|
||||
* A string defining a generated username.
|
||||
*/
|
||||
function hook_email_registration_name($edit, $account) {
|
||||
return 'u' . $account->uid;
|
||||
}
|
||||
|
||||
/**
|
||||
* @} End of "addtogroup hooks".
|
||||
*/
|
||||
@@ -0,0 +1,11 @@
|
||||
name = Email Registration
|
||||
description = Allows users to register with an e-mail address as their username.
|
||||
files[] = email_registration.test
|
||||
core = 7.x
|
||||
|
||||
; Information added by drupal.org packaging script on 2013-01-19
|
||||
version = "7.x-1.1"
|
||||
core = "7.x"
|
||||
project = "email_registration"
|
||||
datestamp = "1358554303"
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Checks requirements for the email_registration.module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_requirements().
|
||||
*/
|
||||
function email_registration_requirements() {
|
||||
$t = get_t();
|
||||
$requirements = array();
|
||||
|
||||
if (module_exists('logintoboggan') && variable_get('logintoboggan_login_with_email', 0)) {
|
||||
$requirements['email_registration'] = array(
|
||||
'title' => $t('Email Registration / LoginToboggan Conflict'),
|
||||
'value' => $t('Conflict'),
|
||||
'description' => $t('There is a conflict between %email_registration and %logintoboggan. You should disable the "Allow users to login using their e-mail address" option from %logintoboggan.', array('%email_registration' => 'Email registration', '%logintoboggan' => 'Login Toboggan')),
|
||||
'severity' => REQUIREMENT_ERROR,
|
||||
);
|
||||
}
|
||||
|
||||
return $requirements;
|
||||
}
|
||||
@@ -0,0 +1,151 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Allows users to register with an e-mail address as their username.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_user_insert().
|
||||
*/
|
||||
function email_registration_user_insert(&$edit, &$account, $category = NULL) {
|
||||
// Don't create a new username if one is already set.
|
||||
if (!empty($account->name) && strpos($account->name, 'email_registration_') !== 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Other modules may implement hook_email_registration_name($edit, $account)
|
||||
// to generate a username (return a string to be used as the username, NULL
|
||||
// to have email_registration generate it).
|
||||
$names = module_invoke_all('email_registration_name', $edit, $account);
|
||||
// Remove any empty entries.
|
||||
$names = array_filter($names);
|
||||
|
||||
if (empty($names)) {
|
||||
// Strip off everything after the @ sign.
|
||||
$new_name = preg_replace('/@.*$/', '', $edit['mail']);
|
||||
}
|
||||
else {
|
||||
// One would expect a single implementation of the hook, but if there
|
||||
// are multiples out there use the last one.
|
||||
$new_name = array_pop($names);
|
||||
}
|
||||
|
||||
// Ensure whatever name we have is unique.
|
||||
$new_name = email_registration_unique_username($new_name, $account->uid);
|
||||
|
||||
// Replace with generated username.
|
||||
db_update('users')
|
||||
->fields(array('name' => $new_name))
|
||||
->condition('uid', $account->uid)
|
||||
->execute();
|
||||
|
||||
$edit['name'] = $new_name;
|
||||
$account->name = $new_name;
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a starting point for a Drupal username (e.g. the name portion of an
|
||||
* email address) return a legal, unique Drupal username. This function is
|
||||
* designed to work on the results of the /user/register or /admin/people/create
|
||||
* forms which have already called user_validate_name, valid_email_address
|
||||
* or a similar function. If your custom code is creating users, you should
|
||||
* ensure that the email/name is already validated using something like that.
|
||||
*
|
||||
* @param $name
|
||||
* A name from which to base the final user name. May contain illegal characters; these will be stripped.
|
||||
*
|
||||
* @param $uid
|
||||
* (optional) Uid to ignore when searching for unique user (e.g. if we update the username after the
|
||||
* {users} row is inserted)
|
||||
*
|
||||
* @return
|
||||
* A unique user name based on $name.
|
||||
*
|
||||
* @see user_validate_name().
|
||||
*
|
||||
*/
|
||||
function email_registration_unique_username($name, $uid = 0) {
|
||||
// Strip illegal characters.
|
||||
$name = preg_replace('/[^\x{80}-\x{F7} a-zA-Z0-9@_.\'-]/', '', $name);
|
||||
|
||||
// Strip leading and trailing spaces.
|
||||
$name = trim($name);
|
||||
|
||||
// Convert any other series of spaces to a single underscore.
|
||||
$name = preg_replace('/ +/', '_', $name);
|
||||
|
||||
// If there's nothing left use a default.
|
||||
$name = ('' === $name) ? t('user') : $name;
|
||||
|
||||
// Truncate to reasonable size.
|
||||
$name = (drupal_strlen($name) > (USERNAME_MAX_LENGTH - 10)) ? drupal_substr($name, 0, USERNAME_MAX_LENGTH - 11) : $name;
|
||||
|
||||
// Iterate until we find a unique name.
|
||||
$i = 0;
|
||||
do {
|
||||
$new_name = empty($i) ? $name : $name . '_' . $i;
|
||||
$found = db_query_range("SELECT uid from {users} WHERE uid <> :uid AND name = :name", 0, 1, array(':uid' => $uid, ':name' => $new_name))->fetchAssoc();
|
||||
$i++;
|
||||
} while (!empty($found));
|
||||
|
||||
return $new_name;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*/
|
||||
function email_registration_form_user_register_form_alter(&$form, &$form_state) {
|
||||
$form['account']['name']['#type'] = 'value';
|
||||
$form['account']['name']['#value'] = 'email_registration_' . user_password();
|
||||
$form['account']['mail']['#title'] = t('E-mail');
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*/
|
||||
function email_registration_form_user_pass_alter(&$form, &$form_state) {
|
||||
$form['name']['#title'] = t('E-mail');
|
||||
$form['name']['#description'] = t('A password reset message will be sent to your e-mail address.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*/
|
||||
function email_registration_form_user_login_alter(&$form, &$form_state) {
|
||||
$form['name']['#title'] = t('E-mail');
|
||||
$form['name']['#description'] = t('Enter your e-mail address.');
|
||||
$form['name']['#element_validate'][] = 'email_registration_user_login_validate';
|
||||
$form['pass']['#description'] = t('Enter the password that accompanies your e-mail.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*/
|
||||
function email_registration_form_user_login_block_alter(&$form, &$form_state) {
|
||||
$form['name']['#title'] = t('E-mail');
|
||||
$form['name']['#element_validate'][] = 'email_registration_user_login_validate';
|
||||
}
|
||||
|
||||
/**
|
||||
* Form element validation handler for the user login form.
|
||||
* Allows users to authenticate by email, which is our preferred method.
|
||||
*/
|
||||
function email_registration_user_login_validate($form, &$form_state) {
|
||||
if (isset($form_state['values']['name'])) {
|
||||
// Keep the email value in form state for furher validation.
|
||||
$form_state['values']['email'] = $form_state['values']['name'];
|
||||
if ($name = db_query('SELECT name FROM {users} WHERE LOWER(mail) = LOWER(:name)', array(':name' => $form_state['values']['name']))->fetchField()) {
|
||||
$form_state['values']['name'] = $name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter().
|
||||
*/
|
||||
function email_registration_form_user_profile_form_alter($form, &$form_state) {
|
||||
$form['account']['name']['#title'] = t('Display name');
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* email registration simpletest
|
||||
*/
|
||||
|
||||
class EmailRegistrationTestCase extends DrupalWebTestCase {
|
||||
/**
|
||||
* Implementation of getInfo().
|
||||
*/
|
||||
public static function getInfo() {
|
||||
return array(
|
||||
'name' => t('Email registration.'),
|
||||
'description' => t('Test the email registration module.'),
|
||||
'group' => t('Email registration'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of setUp().
|
||||
*/
|
||||
function setUp() {
|
||||
parent::setUp('email_registration');
|
||||
|
||||
// Configure to allow set password.
|
||||
variable_set('user_email_verification', FALSE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test various behaviors for anonymous users.
|
||||
*/
|
||||
function testRegistration() {
|
||||
variable_set('user_register', USER_REGISTER_VISITORS);
|
||||
// Try to register a user.
|
||||
$name = $this->randomName();
|
||||
$pass = $this->randomName(10);
|
||||
$register = array(
|
||||
'mail' => $name . '@example.com',
|
||||
'pass[pass1]' => $pass,
|
||||
'pass[pass2]' => $pass,
|
||||
);
|
||||
$this->drupalPost('/user/register', $register, t('Create new account'));
|
||||
$this->drupalLogout();
|
||||
|
||||
$login = array(
|
||||
'name' => $name . '@example.com',
|
||||
'pass' => $pass,
|
||||
);
|
||||
$this->drupalPost('user/login', $login, t('Log in'));
|
||||
|
||||
// Really basic confirmation that the user was created and logged in.
|
||||
$this->assertRaw('<title>' . $name . ' | Drupal</title>', t('User properly created, logged in.'));
|
||||
|
||||
// Now try the immediate login.
|
||||
$this->drupalLogout();
|
||||
variable_set('user_email_verification', 0);
|
||||
$name = $this->randomName();
|
||||
$pass = $this->randomName(10);
|
||||
$register = array(
|
||||
'mail' => $name . '@example.com',
|
||||
'pass[pass1]' => $pass,
|
||||
'pass[pass2]' => $pass,
|
||||
);
|
||||
$this->drupalPost('/user/register', $register, t('Create new account'));
|
||||
$this->assertRaw('Registration successful. You are now logged in.', t('User properly created, immediately logged in.'));
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user