Skip to content

Commit 734a3cb

Browse files
authored
Merge pull request #112 from ahmedawwad/7.05
v7.05
2 parents 87520a1 + f973e41 commit 734a3cb

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

Federated.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Universal-Federated-Analytics-Min.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Universal-Federated-Analytics.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
Copyright 2024 by Cardinal Path.
1010
Dual Tracking Federated Analytics: Google Analytics Government Wide Site Usage Measurement.
1111
Author: Ahmed Awwad
12-
23/05/2024 Version: 7.04
12+
24/05/2024 Version: 7.05
1313
***********************************************************************************************************/
1414
var tObjectCheck,
1515
_allowedQuerystrings = [],
1616
isSearch = false,
1717
oCONFIG = {
1818
GWT_UAID: ["UA-33523145-1"],
19-
GWT_GA4ID: ["G-CSLL4ZEK4L"],
19+
GWT_GA4ID: ["G-CSLL4ZEK4L"],
2020
FORCE_SSL: !0,
2121
ANONYMIZE_IP: !0,
2222
AGENCY: "",
2323
SUB_AGENCY: "",
24-
VERSION: "20240523 v7.04 - Dual Tracking",
24+
VERSION: "20240524 v7.05 - Dual Tracking",
2525
SITE_TOPIC: "",
2626
SITE_PLATFORM: "",
2727
SCRIPT_SOURCE: "",
@@ -838,7 +838,7 @@ if (oCONFIG.YOUTUBE) {
838838
};
839839
onPlayerReady = function (event) { };
840840
onPlayerError = function (event) {
841-
_sendEvent('video_error', { videotitle: ((event.target.playerInfo !== undefined) ? event.target.playerInfo.title : event.target.getVideoData().title) });
841+
_sendEvent('video_error', { videotitle: ((event.target.playerInfo !== undefined) ? event.target.playerInfo.videoData.title : event.target.getVideoData().title) });
842842
};
843843
cCi = 0;
844844
onPlayerStateChange = function (event) {
@@ -856,7 +856,7 @@ if (oCONFIG.YOUTUBE) {
856856
video_duration: vDuration,
857857
video_percent: ((cTime / vDuration) * 100).toFixed(),
858858
video_provider: "youtube",
859-
video_title: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.title : playerArray[videoIndex].getVideoData().title),
859+
video_title: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoData.title : playerArray[videoIndex].getVideoData().title),
860860
video_id: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoData.video_id : playerArray[videoIndex].getVideoData().video_id),
861861
video_url: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoUrl : playerArray[videoIndex].getVideoUrl())
862862
};
@@ -875,7 +875,7 @@ if (oCONFIG.YOUTUBE) {
875875
video_duration: vDurationP,
876876
video_percent: ((cTimeP / vDurationP) * 100).toFixed(),
877877
video_provider: "youtube",
878-
video_title: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.title : playerArray[videoIndex].getVideoData().title),
878+
video_title: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoData.title : playerArray[videoIndex].getVideoData().title),
879879
video_id: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoData.video_id : playerArray[videoIndex].getVideoData().video_id),
880880
video_url: ((playerArray[videoIndex].playerInfo !== undefined) ? playerArray[videoIndex].playerInfo.videoUrl : playerArray[videoIndex].getVideoUrl())
881881
};
@@ -1046,7 +1046,7 @@ function _piiRedactor(payload, type) {
10461046
_pii.regex = /((full)?(([\-\_])?)?ssn\=)?(\d{3}([\s\.\-\+]|%20)\d{2}([\s\.\-\+]|%20)\d{4})([^\&\s\?\/]*)/ig;
10471047
}
10481048
else if (_pii.name == "DOB") {
1049-
var ra = _pii.regex.toString().replace(/\./g, "\.\\-" ).replace("\/", "") ; _pii.regex = new RegExp(ra.substring(0, ra.length-3));
1049+
var ra = _pii.regex.toString().replace(/\./g, "\\.\\-" ).replace("\/", "") ; _pii.regex = new RegExp(ra.substring(0, ra.length-3));
10501050
new_val = new_val.replace(_pii.regex, '[REDACTED_' + _pii.name + ']');
10511051
_val = ((_val.indexOf("?") > 0 && /dl|dp|dr/.test(_param[0])) ? _val.split("?")[0]+ "?" + new_val : new_val);
10521052
//resetting DOB regex

0 commit comments

Comments
 (0)