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

Add referral id to global JS variables

Browse Source 
[MAILPOET-2182]
This commit is contained in:
Rostislav Wolny
2019-08-07 13:33:01 +02:00
committed by M. Shull
parent ebbcbc2015
commit e21515c460
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AdminPages/PageRenderer.php
View File

@@ -4,6 +4,8 @@ namespace MailPoet\AdminPages;
use MailPoet\Config\Renderer; use MailPoet\Config\Renderer;
use MailPoet\Features\FeaturesController; use MailPoet\Features\FeaturesController;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Settings\SettingsController;
use MailPoet\WP\Notice as WPNotice; use MailPoet\WP\Notice as WPNotice;
if (!defined('ABSPATH')) exit; if (!defined('ABSPATH')) exit;
@@ -15,9 +17,17 @@ class PageRenderer {
/** @var FeaturesController */ /** @var FeaturesController */
private $features_controller; private $features_controller;
function __construct(Renderer $renderer, FeaturesController $features_controller) { /** @var SettingsController */
private $settings;
function __construct(
Renderer $renderer,
FeaturesController $features_controller,
SettingsController $settings
) {
$this->renderer = $renderer; $this->renderer = $renderer;
$this->features_controller = $features_controller; $this->features_controller = $features_controller;
$this->settings = $settings;
} }
/** /**
@@ -28,6 +38,7 @@ class PageRenderer {
function displayPage($template, array $data = []) { function displayPage($template, array $data = []) {
$defaults = [ $defaults = [
'feature_flags' => $this->features_controller->getAllFlags(), 'feature_flags' => $this->features_controller->getAllFlags(),
'referral_id' => $this->settings->get(ReferralDetector::REFERRAL_SETTING_NAME),
]; ];
try { try {
echo $this->renderer->render($template, $data + $defaults); echo $this->renderer->render($template, $data + $defaults);

1
views/layout.html
View File

@@ -60,6 +60,7 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
// RFC 5322 standard; http://emailregex.com/ combined with https://google.github.io/closure-library/api/goog.format.EmailAddress.html#isValid // RFC 5322 standard; http://emailregex.com/ combined with https://google.github.io/closure-library/api/goog.format.EmailAddress.html#isValid
var mailpoet_email_regex = /(?=^[+a-zA-Z0-9_.!#$%&'*\/=?^`{|}~-]+@([a-zA-Z0-9-]+\.)+[a-zA-Z0-9]{2,63}$)(?=^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))/; var mailpoet_email_regex = /(?=^[+a-zA-Z0-9_.!#$%&'*\/=?^`{|}~-]+@([a-zA-Z0-9-]+\.)+[a-zA-Z0-9]{2,63}$)(?=^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))/;
var mailpoet_feature_flags = <%= json_encode(feature_flags) %>; var mailpoet_feature_flags = <%= json_encode(feature_flags) %>;
var mailpoet_referral_id = <%= json_encode(referral_id) %>;
</script> </script>
<!-- javascripts --> <!-- javascripts -->