Basic Zeus Support

addons/armaos/CfgVehicles.hpp

@@ -35,12 +35,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
@@ -169,12 +163,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
@@ -303,12 +291,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";

addons/armaos/functions/fnc_computer_addGames.sqf

@@ -2,6 +2,7 @@
  * PUBLIC
  *
  * Adds selected games to a given computer. Currently only Snake supported.
+ * Needs to run on server.
  *
  * Arguments:
  * 1: Computer <OBJECT>
@@ -17,6 +18,8 @@
 
 params ["_computer", "_isSnake"];
 
+if (!isServer) exitWith {};
+
 if (_isSnake) then
 {
     //--- add all games to all synced computers

addons/armaos/functions/fnc_computer_addSecurityCommands.sqf

@@ -2,6 +2,7 @@
  * PUBLIC
  *
  * Adds selected security commands to a given computer.
+ * Needs to run on server.
  *
  * Arguments:
  * 1: Computer <OBJECT>
@@ -18,6 +19,8 @@
 
 params ["_computer", "_isCrypto", "_isCrack"];
 
+if (!isServer) exitWith {};
+
 if (_isCrypto) then
 {
     //--- add 'crypto' command to all synced computers

addons/armaos/functions/fnc_computer_addUser.sqf

@@ -2,6 +2,7 @@
  * PUBLIC
  *
  * Adds a user to a given computer by providing username and password. Also a user directory will be created.
+ * Needs to run on server.
  *
  * Arguments:
  * 1: Computer <OBJECT>
@@ -18,6 +19,8 @@
 
 params ["_computer", "_username", "_password"];
 
+if (!isServer) exitWith {};
+
 // Get userlist and filesystem from computer
 private _userlist = _computer getVariable ["AE3_Userlist", createHashMap];
 private _filesystem = _computer getVariable ["AE3_filesystem", []];
@@ -38,6 +41,7 @@ if(!(_username isEqualTo "root")) then
         if (_normalizedException isEqualTo (localize "STR_AE3_Filesystem_Exception_AlreadyExists")) then
         {
             diag_log format ["AE3 exception: %1", _exception];
+            ["AE3 exception: %1", _exception] call BIS_fnc_error;
         }
         else
         {

addons/armaos/functions/fnc_module_addGames.sqf

@@ -17,25 +17,28 @@
 
 params["_module", "_syncedUnits", "_activated"];
 
-// if triggered in zeus/curator mode, don't run; Could happen in hosted multiplayer
-if (!isNull curatorCamera) exitWith {};
+// ignore this function if module is placed by curator/zeus
+if (_module getvariable ["BIS_fnc_moduleInit_isCuratorPlaced", false]) exitWith {};
 
 if(!isServer) exitWith {};
 
-[_module, _syncedUnits] spawn
+if (_activated) then 
 {
-	params["_module", "_syncedUnits"];
+	[_module, _syncedUnits] spawn
+	{
+		params["_module", "_syncedUnits"];
 
-	waitUntil { !isNil "BIS_fnc_init" };
+		waitUntil { !isNil "BIS_fnc_init" };
 
-	//--- Extract the user defined module arguments
-	private _isSnake = _module getVariable ["AE3_ModuleAddSecurityCommands_IsSnake", ""];
+		//--- Extract the user defined module arguments
+		private _isSnake = _module getVariable ["AE3_ModuleAddGames_IsSnake", ""];
 
-	{
-		[_x, _isSnake] call AE3_armaos_fnc_computer_addGames;
-	} foreach _syncedUnits;
-};
+		{
+			[_x, _isSnake] call AE3_armaos_fnc_computer_addGames;
+		} foreach _syncedUnits;
 
-deleteVehicle _module;
+		deleteVehicle _module;
+	};
+};
 
 true;

addons/armaos/functions/fnc_module_addSecurityCommands.sqf

@@ -17,26 +17,29 @@
 
 params["_module", "_syncedUnits", "_activated"];
 
-// if triggered in zeus/curator mode, don't run; Could happen in hosted multiplayer
-if (!isNull curatorCamera) exitWith {};
+// ignore this function if module is placed by curator/zeus
+if (_module getvariable ["BIS_fnc_moduleInit_isCuratorPlaced", false]) exitWith {};
 
 if(!isServer) exitWith {};
 
-[_module, _syncedUnits] spawn
+if (_activated) then 
 {
-	params["_module", "_syncedUnits"];
+	[_module, _syncedUnits] spawn
+	{
+		params["_module", "_syncedUnits"];
 
-	waitUntil { !isNil "BIS_fnc_init" };
-
-	//--- Extract the user defined module arguments
-	private _isCrypto = _module getVariable ["AE3_ModuleAddSecurityCommands_IsCrypto", ""];
-	private _isCrack = _module getVariable ["AE3_ModuleAddSecurityCommands_IsCrack", ""];
+		waitUntil { !isNil "BIS_fnc_init" };
+		
+		//--- Extract the user defined module arguments
+		private _isCrypto = _module getVariable ["AE3_ModuleAddSecurityCommands_IsCrypto", ""];
+		private _isCrack = _module getVariable ["AE3_ModuleAddSecurityCommands_IsCrack", ""];
 
-	{
-		[_x, _isCrypto, _isCrack] call AE3_armaos_fnc_computer_addSecurityCommands;
-	} foreach _syncedUnits;
-};
+		{
+			[_x, _isCrypto, _isCrack] call AE3_armaos_fnc_computer_addSecurityCommands;
+		} foreach _syncedUnits;
 
-deleteVehicle _module;
+		deleteVehicle _module;
+	};
+};
 
 true;

addons/armaos/functions/fnc_module_addUser.sqf

@@ -11,36 +11,43 @@
  * 3: Activated <BOOL> currently unused in this function
  *
  * Results:
- * None
+ * 1: Success <BOOL> true = success and false = error
  *
  */
 
 params["_module", "_syncedUnits", "_activated"];
 
-// if triggered in zeus/curator mode, don't run; Could happen in hosted multiplayer
-if (!isNull curatorCamera) exitWith {};
+// ignore this function if module is placed by curator/zeus
+if (_module getvariable ["BIS_fnc_moduleInit_isCuratorPlaced", false]) exitWith { false; };
 
 if (!isServer) exitWith {};
 
-[_module, _syncedUnits] spawn
+if (_activated) then 
 {
-	params["_module", "_syncedUnits"];
+	[_module, _syncedUnits] spawn
+	{
+		params["_module", "_syncedUnits"];
 
-	waitUntil { !isNil "BIS_fnc_init" };
+		waitUntil { !isNil "BIS_fnc_init" };
 
-	//--- Extract the user defined module arguments
-	private _username = _module getVariable ["AE3_ModuleUserlist_User", ""];
-	private _password = _module getVariable ["AE3_ModuleUserlist_Password", ""];
+		//--- Extract the user defined module arguments
+		private _username = _module getVariable ["AE3_ModuleUserlist_User", ""];
+		private _password = _module getVariable ["AE3_ModuleUserlist_Password", ""];
 
-	if ("_username" isEqualTo "") exitWith {};
-	if ("_password" isEqualTo "") exitWith {};
+		// check for empty username or password
+		if (_username isEqualTo "") exitWith { deleteVehicle _module; false; };
+		if (_password isEqualTo "") exitWith { deleteVehicle _module; false; };
 
-	{
-		//--- Add user to every synced computer
-		[_x, _username, _password] call AE3_armaos_fnc_computer_addUser;
-	} foreach _syncedUnits;
-};
+		// check for not allowed spaces in username
+		if((_username find " ") != -1) exitWith { deleteVehicle _module; false; };
 
-deleteVehicle _module;
+		{
+			//--- Add user to every synced computer
+			[_x, _username, _password] call AE3_armaos_fnc_computer_addUser;
+		} foreach _syncedUnits;
+
+		deleteVehicle _module;
+	};
+};
 
 true;

addons/filesystem/CfgVehicles.hpp

@@ -35,7 +35,7 @@ class CfgVehicles
 		// Name of function triggered once conditions are met
 		function = "AE3_filesystem_fnc_module_addFile";
 		// Execution priority, modules with lower number are executed first. 0 is used when the attribute is undefined
-		functionPriority = 1;
+		functionPriority = 3;
 		// 0 for server only execution, 1 for global execution, 2 for persistent global execution
 		isGlobal = 1;
 		// 1 for module waiting until all synced triggers are activated
@@ -236,7 +236,7 @@ class CfgVehicles
 		// Name of function triggered once conditions are met
 		function = "AE3_filesystem_fnc_module_addDir";
 		// Execution priority, modules with lower number are executed first. 0 is used when the attribute is undefined
-		functionPriority = 1;
+		functionPriority = 2;
 		// 0 for server only execution, 1 for global execution, 2 for persistent global execution
 		isGlobal = 1;
 		// 1 for module waiting until all synced triggers are activated

addons/filesystem/functions/fnc_device_addDir.sqf

@@ -2,6 +2,8 @@
  * PUBLIC
  *
  * Adds a directory to a given Device. Device could be a comupter or a flash drive.
+ * Logs and displays an error message if dir already exists; On other errors it throws an exception.
+ * Needs to run on server.
  *
  * Arguments:
  * 1: Device <OBJECT>
@@ -10,7 +12,7 @@
  * 4: Permissions <[ARRAY]>
  *
  * Results:
- * Logs if dir already exists; On other errors it throws an exception
+ * none
  *
  * Example:
  * [_device, "/tmp/new", "root", [[true, true, true], [true, true, true]]] call AE3_filesystem_fnc_device_addDir;
@@ -22,6 +24,8 @@
 
 params ["_device", "_path", "_owner", "_permissions"];
 
+if (!isServer) exitWith {};
+
 private _filesystem = _device getVariable "AE3_filesystem";
 
 // throws exception if directory already exists
@@ -42,6 +46,7 @@ catch
     if (_normalizedException isEqualTo (localize "STR_AE3_Filesystem_Exception_AlreadyExists")) then
     {
         diag_log format ["AE3 exception: %1", _exception];
+        ["AE3 exception: %1", _exception] call BIS_fnc_error;
     }
     else
     {

addons/filesystem/functions/fnc_device_addFile.sqf

@@ -2,6 +2,8 @@
  * PUBLIC
  *
  * Adds a file to a given Device. Device could be a comupter or a flash drive.
+ * Logs and displays an error message if file already exists; On other errors it throws an exception.
+ * Needs to run on server.
  *
  * Arguments:
  * 1: Device <OBJECT>
@@ -15,7 +17,7 @@
  * 9: encryptionKey <STRING> Optional
  *
  * Results:
- * Logs if file already exists; On other errors it throws an exception
+ * none
  *
  * Examples:
  * [_device, "/tmp/new/example.txt", "Lorem ipsum dolor sit amet", false, "root", [[false, true, true], [false, true, true]]] call AE3_filesystem_fnc_device_addFile;
@@ -28,6 +30,8 @@
 
 params ["_computer", "_path", "_content", "_isCode", "_owner", "_permissions", ["_isEncrypted", false], ["_encryptionAlgorithm", nil], ["_encryptionKey", nil]];
 
+if (!isServer) exitWith {};
+
 private _filesystem = _computer getVariable "AE3_filesystem";
 
 if(_isCode) then
@@ -104,6 +108,7 @@ catch
     if (_normalizedException isEqualTo (localize "STR_AE3_Filesystem_Exception_AlreadyExists")) then
     {
         diag_log format ["AE3 exception: %1", _exception];
+		["AE3 exception: %1", _exception] call BIS_fnc_error;
     }
     else
     {