Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
provision
Commits
ed327644
Commit
ed327644
authored
Feb 27, 2019
by
ergonlogic
Committed by
llamech
Mar 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#3034235
by llamech, ergonlogic: Use alias redirection target in install login links.
parent
03a72e65
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
8 deletions
+34
-8
platform/drupal/install_6.inc
platform/drupal/install_6.inc
+8
-2
platform/drupal/install_7.inc
platform/drupal/install_7.inc
+10
-4
platform/drupal/install_8.inc
platform/drupal/install_8.inc
+7
-2
provision.drush.inc
provision.drush.inc
+9
-0
No files found.
platform/drupal/install_6.inc
View file @
ed327644
...
...
@@ -366,8 +366,14 @@ function install_main() {
$client_email
=
install_validate_client_email
(
drush_get_option
(
'client_email'
,
FALSE
));
$account
=
install_create_admin_user
(
$client_email
);
$onetime
=
user_pass_reset_url
(
$account
);
// Store the one time login link in an option so the front end can direct the user to their new site.
// If a redirect is defined, the symlink to the alias needs to exist before
// we generate the login link, below.
_provision_drupal_maintain_aliases
();
// Store the one time login link in an option so the front end can direct the
// user to their new site.
$onetime
=
provision_generate_login_reset
();
drush_set_option
(
'login_link'
,
$onetime
.
'/login'
);
drush_log
(
dt
(
'Login url: !onetime'
,
array
(
'!onetime'
=>
$onetime
.
'/login'
)),
'success'
);
...
...
platform/drupal/install_7.inc
View file @
ed327644
...
...
@@ -158,10 +158,16 @@ function install_main() {
_provision_drupal_create_directories
();
$account
=
user_load
(
1
);
$onetime
=
user_pass_reset_url
(
$account
);
// Store the one time login link in an option so the front end can direct the user to their new site.
drush_set_option
(
'login_link'
,
$onetime
.
'/login'
);
drush_log
(
dt
(
'Login url: !onetime'
,
array
(
'!onetime'
=>
$onetime
.
'/login'
)),
'success'
);
// If a redirect is defined, the symlink to the alias needs to exist before
// we generate the login link, below.
_provision_drupal_maintain_aliases
();
// Store the one time login link in an option so the front end can direct the
// user to their new site.
$onetime
=
provision_generate_login_reset
();
drush_set_option
(
'login_link'
,
$onetime
);
drush_log
(
dt
(
'Login url: !onetime'
,
array
(
'!onetime'
=>
$onetime
)),
'success'
);
if
(
drush_get_option
(
'client_email'
,
FALSE
))
{
install_send_welcome_mail
(
$url
,
$account
,
$install_locale
,
$client_email
,
$onetime
);
...
...
platform/drupal/install_8.inc
View file @
ed327644
...
...
@@ -159,8 +159,13 @@ function install_main() {
$account
=
user_load
(
1
);
$onetime
=
user_pass_reset_url
(
$account
);
// Store the one time login link in an option so the front end can direct the user to their new site.
// If a redirect is defined, the symlink to the alias needs to exist before
// we generate the login link, below.
_provision_drupal_maintain_aliases
();
// Store the one time login link in an option so the front end can direct the
// user to their new site.
$onetime
=
provision_generate_login_reset
();
drush_set_option
(
'login_link'
,
$onetime
);
drush_log
(
dt
(
'Login url: !onetime'
,
array
(
'!onetime'
=>
$onetime
)),
'message'
);
...
...
provision.drush.inc
View file @
ed327644
...
...
@@ -491,3 +491,12 @@ function provision_hosting_feature_enabled($feature) {
return
array_key_exists
(
$feature
,
$features
)
&&
$features
[
$feature
];
}
/**
* Generate one-time login link
*/
function
provision_generate_login_reset
()
{
$uri
=
d
()
->
redirection
?:
d
()
->
uri
;
$result
=
drush_invoke_process
(
d
()
->
name
,
'user-login'
,
array
(),
array
(
'uri'
=>
$uri
,
'no-browser'
=>
TRUE
));
return
$result
[
'output'
];
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment