This doesn't seem right:

  '!uri_brief' => drupal_substr($base_url, drupal_strlen('http://')),

$base_url could have the https:// protocol specifier.

CommentFileSizeAuthor
#10 password_policy-7.x-1.x-use_d7_tokens-2464779-10.patch13.94 KBaohrvetpv
#8 password_policy-7.x-1.x-use_d7_tokens-2464779-8.patch9.16 KBaohrvetpv
#5 password_policy-7.x-1.x-use_d7_tokens-2464779-5.patch6.66 KBaohrvetpv
#3 password_policy-7.x-1.x-use_d7_tokens-2464779-3.patch6.66 KBaohrvetpv

Comments

aohrvetpv’s picture

aohrvetpv commented
Title: !uri_brief won't work for HTTPS sites » !uri_brief won't work for HTTPS $base_url
aohrvetpv’s picture

aohrvetpv commented
Title: !uri_brief won't work for HTTPS $base_url » 7.x-1.x using D6-style tokens

This looks to be a more general problem: The token code is incompletely upgraded from D6. !foo style tokens are no longer used, in favor of [foo:bar] style tokens. Upgrading the token support should fix the original bug reported in this issue.

aohrvetpv’s picture

aohrvetpv commented
Status: Active » Needs review
StatusFileSize
new password_policy-7.x-1.x-use_d7_tokens-2464779-3.patch6.66 KB

Patch switches to using D7 tokens.

Still need update code to convert D6 tokens to D7 tokens.

Status: Needs review » Needs work

The last submitted patch, 3: password_policy-7.x-1.x-use_d7_tokens-2464779-3.patch, failed testing.

aohrvetpv’s picture

aohrvetpv commented
Status: Needs work » Needs review
StatusFileSize
new password_policy-7.x-1.x-use_d7_tokens-2464779-5.patch6.66 KB

Fix syntax error.

aohrvetpv’s picture

aohrvetpv commented
Related issues: +#2461665: Add tests for expiration e-mails
aohrvetpv’s picture

aohrvetpv commented
Status: Needs review » Needs work

Still need update code to convert D6 tokens to D7 tokens.

aohrvetpv’s picture

aohrvetpv commented
Status: Needs work » Needs review
StatusFileSize
new password_policy-7.x-1.x-use_d7_tokens-2464779-8.patch9.16 KB

Add update code.

aohrvetpv’s picture

aohrvetpv commented
Status: Needs review » Needs work

Needs test method(s).

aohrvetpv’s picture

aohrvetpv commented
Status: Needs work » Needs review
StatusFileSize
new password_policy-7.x-1.x-use_d7_tokens-2464779-10.patch13.94 KB

- Add token [password-policy:password-edit-url]. The previous patches were incorrectly using [user:edit-url] in the warning e-mails, which is the wrong URL when the Password Change Tab submodule is enabled.
- Add test method.

  • AohRveTPV committed 0b73a8a on 7.x-1.x 
    Issue #2464779 by AohRveTPV: 7.x-1.x using D6-style tokens
aohrvetpv’s picture

aohrvetpv commented
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.