FINAL suepr merge step : added all modules to this super repos

This commit is contained in:
Bachir Soussi Chiadmi
2015-04-19 16:46:59 +02:00
7585 changed files with 1723356 additions and 18 deletions

View 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.

View File

@@ -0,0 +1,34 @@
EMAIL REQUIRED:
========================
This module is for site owners that do not want to require that users
validate their email address when creating an account - because we all
know that's extremely annoying for users to do. But, we still want to
try to minimize spam as much as possible.
With this module enabled, you should not be requiring email verification
upon user registration. This module allows you to set any number of
page paths that will require the user to verify their email address in
order to access. Some examples could be node/add/* or messages/new, etc.
If the user has not yet verfied their email address, when they navigate
to those pages, they will be redirected to a page where they can request
a verification link.
Clicking that sends a tokenized link to the user's email address. Once
clicked, the user now has a validated email address. They will never have
to do this again, unless they change their email address.
*Be aware* that anonymous users will never get redirected because we
can't verify their email address. The purpose of this module is to limit
features that authenticated users can use until they verify their email
address. Act accordingly!
----
To get set up, install the module and configure it at:
admin/config/people/email-required
There are permissions available that can allow you to exclude certain
roles from having to verify.
See email_recurring.api.php for API functions.

View File

@@ -0,0 +1,44 @@
<?php
/**
* The admin settings form
*/
function email_required_admin_settings($form) {
$form['settings'] = array(
'#type' => 'fieldset',
'#title' => t('Settings'),
);
$form['settings']['email_required_paths'] = array(
'#type' => 'textarea',
'#title' => t('Paths that require a verified email address'),
'#description' => t('Supply a list of page paths on different lines which will require a user have a verified email addess in order to access.'),
'#default_value' => variable_get('email_required_paths', NULL),
);
// Email text defaults
$text = _email_required_email_text();
$form['email'] = array(
'#type' => 'fieldset',
'#title' => t('Email template'),
'#description' => t('Create a template for email verification messages.'),
);
$form['email']['email_required_email_subject'] = array(
'#type' => 'textfield',
'#title' => t('Subject'),
'#default_value' => $text['subject'],
);
$form['email']['email_required_email_body'] = array(
'#type' => 'textarea',
'#title' => t('Body'),
'#default_value' => $text['body'],
'#description' => t('Use !link to place the verification link.'),
);
$form['email']['email_required_token_tree'] = array(
'#theme' => 'token_tree',
'#token_types' => array('user'),
);
return system_settings_form($form);
}

View File

@@ -0,0 +1,22 @@
<?php
/**
* Implements hook_email_required_access_alter().
*
* Alter which users are considered to have verified email addresses
*
* @see
* email_required_user_is_validated()
*
* @param $account
* The user account, or uid, we're checking
* @param $admin
* TRUE if users with adequate permissions should be allowed to bypass
* @param &$access
* The current access status for this user. Modify this.
*/
function hook_email_required_access_alter($account, $admin, &$access) {
if ($account->uid == 5) {
$access = FALSE;
}
}

View File

@@ -0,0 +1,11 @@
name = "Email required"
description = "Forces email validation only for certain page paths."
core = "7.x"
dependencies[] = "token"
; Information added by drupal.org packaging script on 2012-04-28
version = "7.x-1.0"
core = "7.x"
project = "email_required"
datestamp = "1335587755"

View File

@@ -0,0 +1,54 @@
<?php
/**
* Implements of hook_schema().
*/
function email_required_schema() {
$schema = array();
$schema['email_required'] = array(
'description' => 'Track which users have validated their email address.',
'fields' => array(
'uid' => array(
'description' => 'The unique ID of the content, such as either the {cid}, {uid}, or {nid}.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'hash' => array(
'description' => 'The hash that will be needed to verify the email',
'type' => 'varchar',
'length' => '255',
'not null' => TRUE,
'default' => '',
),
'created' => array(
'description' => 'The UNIX time stamp representing when the hash was made.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'verified' => array(
'description' => 'The UNIX time stamp representing when the email was verified.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
),
'primary key' => array('uid'),
);
return $schema;
}
/**
* Implements hook_uninstall().
*/
function email_required_uninstall() {
variable_del('email_required_paths');
variable_del('email_required_email_subject');
variable_del('email_required_email_body');
}

View File

@@ -0,0 +1,358 @@
<?php
/**
* Implements hook_menu().
*/
function email_required_menu() {
$items = array();
$items['email/verify'] = array(
'title' => 'Email verifications',
'description' => 'Form to submit for email verification',
'page callback' => 'drupal_get_form',
'page arguments' => array('email_required_verification_form'),
'access callback' => 'email_required_verification_form_access',
'file' => 'email_required.pages.inc',
'type' => MENU_CALLBACK,
);
$items['email/verify/%user/%'] = array(
'title' => 'Email verification',
'description' => 'Path to verify your email address',
'page callback' => 'email_required_verification_page',
'page arguments' => array(2, 3),
'access callback' => 'email_required_verification_page_access',
'access arguments' => array(2, 3),
'file' => 'email_required.pages.inc',
'type' => MENU_CALLBACK,
);
$items['admin/config/people/email-required'] = array(
'title' => 'Email verification',
'description' => 'Configure when users will need to verify their email address',
'page callback' => 'drupal_get_form',
'page arguments' => array('email_required_admin_settings'),
'access arguments' => array('administer email required'),
'file' => 'email_required.admin.inc',
'type' => MENU_NORMAL_ITEM,
);
return $items;
}
/**
* Implements hook_init().
*/
function email_required_init() {
// If authenticated
if (user_is_logged_in()) {
// See if we have paths to enforce a required email
if ($paths = variable_get('email_required_paths', NULL)) {
// Determine the current path
$path = drupal_strtolower(drupal_get_path_alias($_GET['q']));
// See if we have a match
if (drupal_match_path($path, $paths)) {
// See if the user has to validate their email
if (!email_required_user_is_validated()) {
// See if we can capture the referred page
$options = array();
if (isset($_SERVER['HTTP_REFERER']) && $referer = $_SERVER['HTTP_REFERER']) {
$referer = str_replace(url('<front>', array('absolute' => TRUE)), '', $referer);
$options['query'] = array('destination' => $referer);
}
// Redirect to the verify form
drupal_goto('email/verify', $options);
}
}
}
}
}
/**
* Implements hook_mail().
*/
function email_required_mail($key, &$message, $params) {
global $user;
// Get email text
$text = _email_required_email_text();
// Inject a verification link
$text['body'] = str_replace('!link', email_required_generate_link($user, TRUE), $text['body']);
// Attach to the message, and replace tokens
$message['subject'] = token_replace($text['subject'], array('user' => $user));
$message['body'] = array(token_replace($text['body'], array('user' => $user)));
}
/**
* Implements hook_permission().
*/
function email_required_permission() {
return array(
'administer email required' => array(
'title' => t('Administer email required'),
'description' => t('Configure the settings for this module.'),
),
'bypass email required' => array(
'title' => t('Bypass email verification'),
'description' => t('These users will not have to verify their email. Anonyous users will never have to.'),
),
);
}
/**
* Implements hook_user_presave().
*/
function email_required_user_presave(&$edit, $account, $category) {
// See if the user exists yet
if ($account->uid) {
// See if the email address has changed
if (strtolower($edit['mail']) != strtolower($account->mail)) {
// Mark this user as no longer having a verified email address
email_required_delete_hash($account);
}
}
}
/**
* Generate a URL to verify an email address
*
* @param $user
* A user object or uid
* @param $absolute
* TRUE if the link should be absolute.
* @return
* A link to verify an email address, or FALSE if one cannot be made.
*/
function email_required_generate_link($user = NULL, $absolute = FALSE) {
// Get the uid
$uid = _email_required_get_uid($user);
// Get the hash string
if ($hash = email_required_load_hash($user, TRUE)) {
// Provide the link
return url("email/verify/{$uid}/{$hash->hash}", array('absolute' => $absolute));
}
return FALSE;
}
/**
* Delete a hash entry for a given user
*
* @param $user
* A user object or uid
*/
function email_required_delete_hash($user = NULL) {
// Delete the hash entry
db_delete('email_required')
->condition('uid', _email_required_get_uid($user))
->execute();
}
/**
* Create a hash entry for a given user
*
* This will delete any existing entries so call with caution
*
* @param $user
* A user object
* @return
* A hash object
*/
function email_required_create_hash($user = NULL) {
if (!$user) {
global $user;
}
// Create the hash object
$hash = array(
'uid' => _email_required_get_uid($user),
'hash' => _email_required_hash($user),
'created' => REQUEST_TIME,
'verified' => 0,
);
// Delete any existing hashes for this user
email_required_delete_hash($user);
// Insert it
db_insert('email_required')
->fields($hash)
->execute();
return $hash;
}
/**
* Validate a user's hash
*
* @param $user
* A user object or uid
*/
function email_required_validate_hash($user = NULL) {
// Delete the hash entry
db_update('email_required')
->fields(array('verified' => REQUEST_TIME))
->condition('uid', _email_required_get_uid($user))
->execute();
}
/**
* Get a user's hash object
*
* @param $user
* A user object or uid
* @param $reset
* TRUE if the static cache should be skipped, otherwise FALSE.
* @return
* A hash object
*/
function email_required_load_hash($user = NULL, $reset = FALSE) {
static $hashes = array();
// Determine the uid
$uid = _email_required_get_uid($user);
// Check the cache
if ($reset || !isset($hashes[$uid])) {
// Fetch the hash entry
$hashes[$uid] =
db_select('email_required', 'e')
->fields('e', array('uid', 'hash', 'created', 'verified'))
->condition('uid', $uid)
->execute()
->fetchObject();
}
return $hashes[$uid];
}
/**
* Determine if a given user has validated their email
*
* @param $user
* A user object or uid
* @param $admin
* TRUE if users with adequate permissions will be considered
* validated regardless
* @return
* TRUE if the user is validated, otherwise FALSE.
*/
function email_required_user_is_validated($user = NULL, $admin = TRUE) {
static $validated = array();
// Determine the uid
$uid = _email_required_get_uid($user);
// Generate a cache key
$key = $uid . ($admin ? ':admins' : '');
// Check the cache
if (!isset($validated[$key])) {
// Assume false
$validated[$key] = FALSE;
// Check higher permissions first, if desired
if ($admin && (user_access('administer email required') || user_access('bypass email required'))) {
$validated[$key] = TRUE;
}
// Load the hash to check
else if ($hash = email_required_load_hash($user)) {
if ($hash->verified) {
$validated[$key] = TRUE;
}
}
// Allow modules to alter this
drupal_alter('email_required_validated', $user, $admin, $validated[$key]);
}
return $validated[$key];
}
/**
* Access callback for the verification form
*/
function email_required_verification_form_access() {
global $user;
// No anonymous allowed
if (!$user->uid) {
return FALSE;
}
return email_required_user_is_validated($user) ? FALSE : TRUE;
}
/**
* Access callback for the verification page
*
* @param $account
* A user object specified in the link
* @param $string
* The hash string on the URL
*/
function email_required_verification_page_access($account, $string) {
global $user;
// If the user is logged in, they can only verify themselves
if ($user->uid && ($account->uid != $user->uid)) {
return FALSE;
}
// We'll check for the existance of a hash, and the validity of it
// in the page callback, because we don't want a 403 if the hash
// has been purged
return TRUE;
}
/**
* Wrapper for user_pass_rehash()
*
* Generate a a hash that will be used in the verification URL
*
* @param $user
* A user object or ID
* @return
* A hash
*/
function _email_required_hash($user) {
return user_pass_rehash($user->pass, REQUEST_TIME, $user->name);
}
/**
* Helper function to determine the user id to use
*
* @param $user
* A user object, or user ID, or NULL if you want to use
* the current user.
* @return
* A user ID
*/
function _email_required_get_uid($user = NULL) {
if (!$user) {
global $user;
}
return is_object($user) ? $user->uid : $user;
}
/**
* Helper function to return email strings
*
* @return
* An array containing the 'subject' and 'body for the
* verification email
*/
function _email_required_email_text() {
// Load the defaults
$text = array(
'subject' => variable_get('email_required_subject', NULL),
'body' => variable_get('email_required_body', NULL),
);
// See if we need a subject
if (!$text['subject']) {
$text['subject'] = '[[site:name]] ' . t('Verify your email address');
}
// See if we need a body
if (!$text['body']) {
$text['body'] = '[user:name],' . "\n\n";
$text['body'] .= t('You have requested to have your email address validated at !sitename.', array('!sitename' => '[site:name]')) . "\n\n";
$text['body'] .= t('Click the link below to validate your email address:') . "\n\n";
$text['body'] .= '!link' . "\n\n";
$text['body'] .= t('You will never have to validate your email address again, unless you change it.') . "\n\n";
$text['body'] .= '- [site:name]';
}
return $text;
}

View File

@@ -0,0 +1,86 @@
<?php
/**
* Form to submit for an email verification
*/
function email_required_verification_form($form, &$form_state) {
global $user;
drupal_set_title(t('You must verify your email address to continue'));
$form['warning'] = array(
'#type' => 'item',
'#markup' => t('The page you requested requires that you first verify your email address. Clicking the button below will send an email to the address associated with your account. It will contain a link that, when clicked, will verify your email address. You will only have to do this once.'),
);
$form['email'] = array(
'#type' => 'item',
'#markup' => t('Your current email address is %email. !link to change it before verifying.', array('%email' => $user->mail, '!link' => l(t('Click here'), "user/{$user->uid}/edit", array('query' => array('destination' => 'email/verify'))))),
);
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Send the verification email'),
);
return $form;
}
/**
* Submit handler for the email verification form
*/
function email_required_verification_form_submit(&$form, &$form_state) {
global $user;
// Insert a new hash
email_required_create_hash($user);
// Send the email
drupal_mail('email_required', 'verification', $user->mail, user_preferred_language($user));
// Set a message
drupal_set_message(t('A verification email has been sent to you.'));
// Log the action
watchdog('email_required', 'Verification email sent to !user (!uid)', array('!user' => $user->name, '!uid' => $user->uid));
// Go home
$form_state['redirect'] = '<front>';
}
/**
* Page callback for verification hash links
*
* @param $account
* A user object specified in the link
* @param $string
* The hash string on the URL
*/
function email_required_verification_page($account, $string) {
global $user;
$output = '';
// See if the user is already validated
if (email_required_user_is_validated($account)) {
$output .= t('You have already validated your email address.');
}
// Load the hash for this user and see if it's a match
else if (($hash = email_required_load_hash($account)) && ($hash->hash == $string)) {
// Verify the email address
email_required_validate_hash($account);
// Log the action
watchdog('email_required', '!user (!uid) has validated their email address.', array('!user' => $account->name, '!uid' => $account->uid));
// Set a message
$output = t('Your email address has been verified.');
// Set the title
drupal_set_title(t('Verified!'));
}
else {
$output .= t('Invalid verification link. It is possible that this link has expired. !link to have another one emailed to you.', array('!link' => l(t('Click here'), 'email/verify')));
}
$output .= "<br/><br/>" . l(t('Return to the homepage'), '<front>');
return $output;
}