wideangle/wide-angle-analytics-wordpress
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render footer and header with shard generator

Browse source
This commit is contained in:
Jarek Rozanski 2022-01-02 15:29:52 +01:00
parent 065bfe6f25
commit 08ab436f1b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wide-angle-analytics.php
View file

@ -39,6 +39,8 @@ class WideAngleAnalytics {
add_action('admin_init', array( &$this, 'registerPluginSettings' ) ); add_action('admin_init', array( &$this, 'registerPluginSettings' ) );
add_action('admin_menu', array( &$this, 'registerAdminMenu' )); add_action('admin_menu', array( &$this, 'registerAdminMenu' ));
$this->plugin->generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES));
add_action('wp_head', array( &$this, 'renderHeaderScript')); add_action('wp_head', array( &$this, 'renderHeaderScript'));
add_action('wp_footer', array( &$this, 'renderFooterScript')); add_action('wp_footer', array( &$this, 'renderFooterScript'));
} }
@ -48,8 +50,7 @@ class WideAngleAnalytics {
* Inteded to be used with 'wp_head' hook. * Inteded to be used with 'wp_head' hook.
*/ */
function renderHeaderScript() { function renderHeaderScript() {
$generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES)); $this->renderContent($this->plugin->generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
$this->renderContent($generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
} }
/** /**
@ -57,8 +58,7 @@ class WideAngleAnalytics {
* Inteded to be used with 'wp_footer' hook. * Inteded to be used with 'wp_footer' hook.
*/ */
function renderFooterScript() { function renderFooterScript() {
$generator = new WideAngleGenerator(get_option(self::WAA_CONF_ATTRIBUTES)); $this->renderContent($this->plugin->generator->generateFooterScript()); // The Escaping takes place in the WideAngleGenerator::generateFooterScript method.
$this->renderContent($generator->generateHeaderScript()); // The Escaping takes place in the WideAngleGenerator::generateHeaderScript method.
} }
/** /**
@ -129,7 +129,6 @@ class WideAngleAnalytics {
if(count($errors) === 0) { if(count($errors) === 0) {
$attributes = new WideAngleAttributes($waaSiteId->get_value(), $waaTrackerDomain->get_value(), $waaIgnoreHash->get_value(), $waaExclusionPaths->get_value(), $waaIncParams->get_value()); $attributes = new WideAngleAttributes($waaSiteId->get_value(), $waaTrackerDomain->get_value(), $waaIgnoreHash->get_value(), $waaExclusionPaths->get_value(), $waaIncParams->get_value());
update_option(self::WAA_CONF_SITE_ID, $waaSiteId->get_value()); update_option(self::WAA_CONF_SITE_ID, $waaSiteId->get_value());
update_option(self::WAA_CONF_TRACKER_DOMAIN, $waaTrackerDomain->get_value()); update_option(self::WAA_CONF_TRACKER_DOMAIN, $waaTrackerDomain->get_value());
update_option(self::WAA_CONF_IGNORE_HASH, $waaIgnoreHash->get_value()); update_option(self::WAA_CONF_IGNORE_HASH, $waaIgnoreHash->get_value());