Convert JS objects to JSON for easier handling

Author: Groruk

web/includes/sb-callback.php

@@ -2106,6 +2106,9 @@ function EditGroup($gid, $web_flags, $srv_flags, $type, $name, $overrides, $newO
 			$GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_admins` SET `srv_group` = ? WHERE `aid` = '" . (int)$o['aid'] . "'", array($name));
 		}
 
+        $overrides = json_decode(html_entity_decode($overrides, ENT_QUOTES), true);
+        $newOverride = json_decode(html_entity_decode($newOverride, ENT_QUOTES), true);
+
 		// Update group overrides
 		if(!empty($overrides))
 		{
@@ -2136,12 +2139,6 @@ function EditGroup($gid, $web_flags, $srv_flags, $type, $name, $overrides, $newO
 			}
 		}
 
-        $newOverride = explode(';', $newOverride);
-        foreach ($newOverride as $input) {
-            $input = explode('::', $input);
-            $newOverride[$input[0]] = $input[1];
-        }
-
 		// Add a new override
 		if(!empty($newOverride))
 		{

web/scripts/sourcebans.js

@@ -755,18 +755,18 @@ function ProcessEditGroup(type, name)
 			if($type(override_access) == "element")
 				override_access = [override_access];
 
-			overrides = new Array(override_id.length);
+			overrides = {};
 
 			for(var i=0;i<override_id.length;i++)
 			{
 				overrides[i] = {'id': override_id[i].value, 'type': override_type[i][override_type[i].selectedIndex].value, 'name': override_name[i].value, 'access': override_access[i][override_access[i].selectedIndex].value};
 			}
 		}
 
-		new_override = {'type::': $('new_override_type')[$('new_override_type').selectedIndex].value, ';name::': $('new_override_name').value, ';access::': $('new_override_access')[$('new_override_access').selectedIndex].value};
+		new_override = {'type': $('new_override_type')[$('new_override_type').selectedIndex].value, 'name': $('new_override_name').value, 'access': $('new_override_access')[$('new_override_access').selectedIndex].value};
 	}
 
-	xajax_EditGroup(group, Mask, srvMask, type, name, overrides, new_override);
+	xajax_EditGroup(group, Mask, srvMask, type, name, JSON.stringify(overrides), JSON.stringify(new_override));
 }
 
 function update_server()