Minor cookie consent cleanup

PTFS-Europe · Oct 1, 2024 · 15a3dc3 · 15a3dc3
1 parent 59f625d
commit 15a3dc3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/code/web/Drivers/CloudLibraryDriver.php b/code/web/Drivers/CloudLibraryDriver.php
@@ -776,8 +776,7 @@ private function callCloudLibraryUrl(CloudLibrarySetting $settings, string $apiP
 	public function trackUserUsageOfCloudLibrary($user): void {
 		require_once ROOT_DIR . '/sys/CloudLibrary/UserCloudLibraryUsage.php';
 		global $library;
-		$userObj = UserAccount::getActiveUserObj();
-		$userCloudLibraryTracking = $userObj->userCookiePreferenceLocalAnalytics;
+		$userCloudLibraryTracking = $user->userCookiePreferenceLocalAnalytics;
 		$userUsage = new UserCloudLibraryUsage();
 		$userUsage->userId = $user->id;
 		$userUsage->year = date('Y');

diff --git a/code/web/Drivers/HooplaDriver.php b/code/web/Drivers/HooplaDriver.php
@@ -683,9 +683,8 @@ public function trackUserUsageOfHoopla($user): void {
 		require_once ROOT_DIR . '/sys/Hoopla/UserHooplaUsage.php';
 		global $library;
 		$userUsage = new UserHooplaUsage();
-		$userObj = UserAccount::getActiveUserObj();
 
-		$userHooplaTracking = $userObj->userCookiePreferenceLocalAnalytics;
+		$userHooplaTracking = $user->userCookiePreferenceLocalAnalytics;
 		global $aspenUsage;
 		$userUsage->instance = $aspenUsage->getInstance();
 		$userUsage->userId = $user->id;

diff --git a/code/web/Drivers/OverDriveDriver.php b/code/web/Drivers/OverDriveDriver.php
@@ -1622,8 +1622,7 @@ function renewCheckout($patron, $recordId, $itemId = null, $itemIndex = null) {
 	public function trackUserUsageOfOverDrive($user): void {
 		require_once ROOT_DIR . '/sys/OverDrive/UserOverDriveUsage.php';
 		$userUsage = new UserOverDriveUsage();
-		$userObj = UserAccount::getActiveUserObj();
-		$userOverDriveTracking = $userObj->userCookiePreferenceLocalAnalytics;
+		$userOverDriveTracking = $user->userCookiePreferenceLocalAnalytics;
 		global $aspenUsage;
 		global $library;
 		$userUsage->instance = $aspenUsage->getInstance();

diff --git a/code/web/Drivers/PalaceProjectDriver.php b/code/web/Drivers/PalaceProjectDriver.php
@@ -748,9 +748,8 @@ private function getSettings(User $user = null) {
 	public function trackUserUsageOfPalaceProject($user): void {
 		require_once ROOT_DIR . '/sys/PalaceProject/UserPalaceProjectUsage.php';
 		$userUsage = new UserPalaceProjectUsage();
-		$userObj = UserAccount::getActiveUserObj();
 
-		$userPalaceProjectTracking = $userObj->userCookiePreferenceLocalAnalytics;
+		$userPalaceProjectTracking = $user->userCookiePreferenceLocalAnalytics;
 		$userUsage->userId = $user->id;
 		$userUsage->year = date('Y');
 		$userUsage->month = date('n');

diff --git a/code/web/services/Record/AccessOnline.php b/code/web/services/Record/AccessOnline.php
@@ -92,16 +92,17 @@ function trackRecordUsage(int $sideLoadId, string $recordId): void {
 	public function trackUserUsageOfSideLoad(int $sideLoadId): void {
 		require_once ROOT_DIR . '/sys/Indexing/UserSideLoadUsage.php';
 		$userUsage = new UserSideLoadUsage();
-		$userObj = UserAccount::getActiveUserObj();
-		$userSideLoadTracking = $userObj->userCookiePreferenceLocalAnalytics;
+
 		global $aspenUsage;
-		global $library;
 		$userUsage->instance = $aspenUsage->getInstance();
+		$userSideLoadTracking = true;
 		if (UserAccount::getActiveUserId() == false) {
 			//User is not logged in
 			$userUsage->userId = -1;
 		} else {
 			$userUsage->userId = UserAccount::getActiveUserId();
+			$userObj = UserAccount::getActiveUserObj();
+			$userSideLoadTracking = $userObj->userCookiePreferenceLocalAnalytics;
 		}
 		$userUsage->sideLoadId = $sideLoadId;
 		$userUsage->year = date('Y');