From f3986281d9bec8f90eefdcd71f6a7b696f005f66 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Tue, 8 Aug 2023 17:10:53 +0200
Subject: [PATCH] Mission - Update AAR for OCAP Enabled Administrative UI
 setting

---
 addons/cba_settings/cba_settings.sqf |  1 +
 addons/mission/XEH_preInit.sqf       |  8 --------
 addons/mission/functions/fnc_aar.sqf | 15 ---------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/addons/cba_settings/cba_settings.sqf b/addons/cba_settings/cba_settings.sqf
index fb007cfb..5ab92f48 100644
--- a/addons/cba_settings/cba_settings.sqf
+++ b/addons/cba_settings/cba_settings.sqf
@@ -89,6 +89,7 @@ grad_trenches_functions_bigEnvelopeDigTime = 180;
 grad_trenches_functions_giantEnvelopeDigTime = 300;
 
 // OCAP
+ocap_enabledAdministratorUI = false;
 ocap_settings_autoStart = false;
 ocap_settings_saveOnEmpty = false;
 ocap_settings_saveMissionEnded = false;
diff --git a/addons/mission/XEH_preInit.sqf b/addons/mission/XEH_preInit.sqf
index 3820e7f3..0f19cefc 100644
--- a/addons/mission/XEH_preInit.sqf
+++ b/addons/mission/XEH_preInit.sqf
@@ -34,14 +34,6 @@ if (hasInterface) then {
             };
         } forEach _this;
     }] call CBA_fnc_addEventHandler;
-
-    [QGVAR(aar_hideAdmin), {
-        [{
-            ((allDiarySubjects player) findIf {_x select 0 == "ocap_diary_adminControls_subject"}) > -1
-        }, {
-            player removeDiarySubject "ocap_diary_adminControls_subject";
-        }] call CBA_fnc_waitUntilAndExecute;
-    }] call CBA_fnc_addEventHandler;
 };
 
 ADDON = true;
diff --git a/addons/mission/functions/fnc_aar.sqf b/addons/mission/functions/fnc_aar.sqf
index fb62bc3e..68d20890 100644
--- a/addons/mission/functions/fnc_aar.sqf
+++ b/addons/mission/functions/fnc_aar.sqf
@@ -96,18 +96,3 @@ addMissionEventHandler ["MPEnded", {
         call FUNC(stopAAR);
     };
 }];
-
-// Hide Admin Diary controls - we use chat command for more control over recording metadata
-addMissionEventHandler ["OnUserAdminStateChanged", {
-    params ["_networkId", "_loggedIn", "_votedIn"];
-
-    if (_loggedIn && !_votedIn) then {
-        private _unit = (getUserInfo _networkId) select 10;
-        [{
-            if (_this getVariable ["ocap_hasAdminControls", false]) then {
-                [QGVAR(aar_hideAdmin), [], _this] call CBA_fnc_targetEvent;
-                _this setVariable ["ocap_hasAdminControls", false];
-            };
-        }, _unit] call CBA_fnc_execNextFrame; // give OCAP time to set hasAdminControls variable
-    };
-}];