Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use getToken()

Browse Source 
[MAILPOET-2340]
This commit is contained in:
Amine Ben hammou
2019-09-19 16:57:34 +01:00
committed by Jack Kitterhing
parent ab63bde9ed
commit 692ff1ed22
13 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Models/Subscriber.php
View File

@ -3,6 +3,7 @@ namespace MailPoet\Models;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
use MailPoet\WP\Functions as WPFunctions;
@ -106,15 +107,6 @@ class Subscriber extends Model {
return (bool)$this->is_woocommerce_user;
}
function getLinkToken() {
if ($this->link_token === null) {
$this->link_token = self::generateToken($this->email);
// `$this->save()` fails if the subscriber has subscriptions, segments or custom fields
\ORM::rawExecute(sprintf('UPDATE %s SET link_token = ? WHERE email = ?', self::$_table), [$this->link_token, $this->email]);
}
return $this->link_token;
}
static function getCurrentWPUser() {
$wp_user = WPFunctions::get()->wpGetCurrentUser();
if (empty($wp_user->ID)) {
@ -138,7 +130,7 @@ class Subscriber extends Model {
}
function verifyToken($token) {
$database_token = $this->getLinkToken();
$database_token = (new LinkTokens)->getToken($this);
$request_token = substr($token, 0, strlen($database_token));
return call_user_func(
'hash_equals',