Skip to content

Spuds' update to 0.0.4 for ElkArte 1.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
artixnous wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Spuds' update to 0.0.4 for ElkArte 1.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19ad53f
Create GAnalytics.french.php
Oct 30, 2017
1e264b5
Spuds' update to 0.0.4
Oct 30, 2017
d29db58
update to 0.0.4 for elk-1.1
Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions GAnalytics.french.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php
/**
* Google Analytics tracking
*/

$txt['ga_tracking_code'] = 'Code de suivi Google Analytics.';
$txt['ga_tracking_code_description'] = 'Le code de suivi est une partie du code javascript fourni par Google qui ressemble à <strong>UA-1234567-1</strong>';

$txt['ga_tracking_adminpages'] = 'Ajouter le code aux pages d\'administation.';
$txt['ga_tracking_only_guests'] = 'Suivre uniquement les invités.';
59 changes: 45 additions & 14 deletions GAnalytics.integrate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,56 @@
<?php
/**
* Google Analytics tracking
*
* @author emanuele
* @license BSD http://opensource.org/licenses/BSD-3-Clause
*
* @version 0.0.4
*/

if (!defined('ELK'))
die('No access...');

class GAnalytics_Integrate
{
/**
* @var string
*/
const TRACKREGEX = 'UA-\d{7,9}-\d{1,2}';

public function __construct()
{
}

public static function load_theme()
{
global $modSettings, $user_info;

// No tracking code on xml or api requests
if (isset($_REQUEST['xml']) || isset($_REQUEST['api']))
{
return;
}

// As well as if the tracking code is not set
if (empty($modSettings['ga_tracking_code']))
{
return;
}

if (!empty($modSettings['ga_tracking_only_guests']) && !$user_info['is_guest'])
{
return;
}

if (empty($modSettings['ga_tracking_adminpages']) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
{
return;
}

addInlineJavascript('
(function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,\'script\',\'//www.google-analytics.com/analytics.js\',\'ga\');

window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga(\'create\', \'' . $modSettings['ga_tracking_code'] . '\', \'auto\');
ga(\'send\', \'pageview\');', true);

loadJavascriptFile('https://www.google-analytics.com/analytics.js', array('defer' => true, 'async' => 'true'));
}

public static function general_mod_settings(&$config_vars)
Expand All @@ -51,8 +68,9 @@ public static function general_mod_settings(&$config_vars)
var val = $(this).val();
if (val.indexOf("<script") !== -1)
{
var regex = /UA-\d{7}-\d/;
var match = regex.exec(val)
var regex = /' . self::TRACKREGEX . '/,
match = regex.exec(val);

$(this).val(match);
}
});
Expand All @@ -65,23 +83,36 @@ public static function save_general_mod_settings()
{
// I doubt this will ever happen, because Elk strips the script tag
if (strpos('<script', $_POST['ga_tracking_code']) !== false)
{
$clean_tracking = self::extractUA($_POST['ga_tracking_code']);
}
else
{
$clean_tracking = preg_replace('~[^\w\d\-]~', '', $_POST['ga_tracking_code']);
if (preg_match('~^UA-\d{7}-\d$~', $clean_tracking) === 0)
}

if (preg_match('~^' . self::TRACKREGEX . '$~', $clean_tracking) === 0)
{
unset($_POST['ga_tracking_code']);
}
else
{
$_POST['ga_tracking_code'] = $clean_tracking;
}
}
}

protected static function extractUA($val)
{
preg_match('~\'(UA-\d{7}-\d)\'~', $val, $matches);
print_r($matches);die();
preg_match('~' . self::TRACKREGEX . '~', $val, $matches);

if (isset($matches[1]))
{
return $matches[1];
}
else
{
return '';
}
}
}
}
11 changes: 6 additions & 5 deletions package-info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@
* @author emanuele
* @license BSD http://opensource.org/licenses/BSD-3-Clause
*
* @version 0.0.1
* @version 0.0.4
*/
]]></license>
<id>emanuele:ga_tracking</id>
<name>Google Analytics tracking</name>
<version>0.0.1</version>
<version>0.0.4</version>
<type>modification</type>
<install for="1.0 - 1.0.99">
<install for="1.0 - 1.1">
<require-file name="GAnalytics.integrate.php" destination="SOURCEDIR" />
<require-file name="GAnalytics.english.php" destination="LANGUAGEDIR/english" />
<hook hook="integrate_load_theme" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::load_theme" />
<hook hook="integrate_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::general_mod_settings" />
<hook hook="integrate_save_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::save_general_mod_settings" />
<redirect url="?action=admin;area=addonsettings;sa=general" timeout="5000"></redirect>
</install>
<uninstall for="1.0 - 1.0.99">
<uninstall for="1.0 - 1.1">
<remove-file name="SOURCEDIR/GAnalytics.integrate.php" />
<remove-file name="LANGUAGEDIR/english/GAnalytics.english.php" />
<hook reverse="true" hook="integrate_load_theme" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::load_theme" />
<hook reverse="true" hook="integrate_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::general_mod_settings" />
<hook reverse="true" hook="integrate_save_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::save_general_mod_settings" />
</uninstall>
</package-info>
</package-info>