Changeset 251 for binary-improvements/MapRendering/Web/WebPermissions.cs

Timestamp:

Oct 28, 2015, 7:51:20 PM (9 years ago)

Author:

peter.souza

Message:

Enemies (zombies and hostile animal entities) are now shown on the map as Hostiles and require permission level 'webapi.gethostilelocation' for web viewers to see.

Animals (non-hostile entities) are now shown on the map as Animals and require permission level 'webapi.getanimalslocation' for web viewers to see.

Permission level for 'webapi.viewallclaims' is now required for a viewer to see all claims, otherwise the permission level for 'webapi.getlandclaims' will only show viewer-owned claims. A viewer requires both 'webapi.getlandclaims' and 'webapi.viewallclaims' to be set for all claims to show (you can't just set 'webapi.viewallclaims').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Permission level for 'webapi.viewallplayers' is now required for a viewer to see all players, otherwise the permission level for 'webapi.getplayerslocation' will only show the player for the currently-authenticated viewer. A viewer requires both 'webapi.getplayerslocation' and 'webapi.viewallplayers' to be set for all players to show (you can't just set 'webapi.viewallplayers').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Banned players are now hidden from the web map.
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=320702&viewfull=1#post320702

Items using 'CustomIcon' and 'CustomIconTint' are now supported (although the exact tinting may not be perfectly the same as the game).
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317117&viewfull=1#post317117
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317679&viewfull=1#post317679

Map marker icons for players, hostiles, and animals have been updated.

File:

• binary-improvements/MapRendering/Web/WebPermissions.cs (modified) (2 diffs)

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -99 +99 @@
                         if (!string.IsNullOrEmpty (_module)) {
                                 lock (this) {
-                                        knownModules.Add (_module, new WebModulePermission (_module, 0));
+                    if (!IsKnownModule( _module)) {
+                                            knownModules.Add (_module, new WebModulePermission (_module, 0));
+                    }
                                 }
                         }
@@ -269 +271 @@
 
                         using (StreamWriter sw = new StreamWriter(GetFullPath ())) {
-                                sw.WriteLine ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-                                sw.WriteLine ("<webpermissions>");
-                                sw.WriteLine ("    <admintokens>");
-                                sw.WriteLine ("        <!-- <token name=\"adminuser1\" token=\"supersecrettoken\" permission_level=\"0\" /> -->");
-                                foreach (AdminToken at in admintokens.Values) {
-                                        sw.WriteLine (string.Format ("        <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", at.name, at.token, at.permissionLevel));
-                                }
-                                sw.WriteLine ("    </admintokens>");
-                                sw.WriteLine ();
-                                sw.WriteLine ("    <permissions>");
-                                sw.WriteLine ("        <!-- <permission module=\"webapi.executeconsolecommand\" permission_level=\"0\" /> -->");
-                                sw.WriteLine ("        <!-- <permission module=\"webapi.getplayersonline\" permission_level=\"1\" /> -->");
-                                sw.WriteLine ("        <!-- <permission module=\"web.map\" permission_level=\"1000\" /> -->");
-                                foreach (WebModulePermission wap in modules.Values) {
-                                        sw.WriteLine (string.Format ("        <permission module=\"{0}\" permission_level=\"{1}\" />", wap.module, wap.permissionLevel));
-                                }
-                                sw.WriteLine ("    </permissions>");
-                                sw.WriteLine ();
-                                sw.WriteLine ("</webpermissions>");
-                        
+                sw.WriteLine ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+                sw.WriteLine ("<webpermissions>");
+                sw.WriteLine  ();
+                sw.WriteLine (" <admintokens>");
+                sw.WriteLine ("         <!-- <token name=\"adminuser1\" token=\"supersecrettoken\" permission_level=\"0\" /> -->");
+                foreach (AdminToken at in admintokens.Values) {
+                    sw.WriteLine (string.Format ("              <token name=\"{0}\" token=\"{1}\" permission_level=\"{2}\" />", at.name, at.token, at.permissionLevel));
+                }
+                sw.WriteLine (" </admintokens>");
+                sw.WriteLine ();
+                sw.WriteLine (" <permissions>");
+                foreach (WebModulePermission wap in modules.Values) {
+                    sw.WriteLine (string.Format ("              <permission module=\"{0}\" permission_level=\"{1}\" />", wap.module, wap.permissionLevel));
+                }
+                sw.WriteLine ("         <!-- <permission module=\"web.map\" permission_level=\"1000\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getlog\" permission_level=\"0\" /> -->");
+                sw.WriteLine ("         <!-- <permission module=\"webapi.executeconsolecommand\" permission_level=\"0\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getstats\" permission_level=\"1000\" /> -->");
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getplayersonline\" permission_level=\"1000\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getplayerslocation\" permission_level=\"1000\" /> -->");
+                sw.WriteLine ("         <!-- <permission module=\"webapi.viewallplayers\" permission_level=\"1\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getlandclaims\" permission_level=\"1000\" /> -->");
+                sw.WriteLine ("         <!-- <permission module=\"webapi.viewallclaims\" permission_level=\"1\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getplayerinventory\" permission_level=\"1\" /> -->");
+                sw.WriteLine ();
+                sw.WriteLine ("         <!-- <permission module=\"webapi.gethostilelocation\" permission_level=\"1\" /> -->");
+                sw.WriteLine ("         <!-- <permission module=\"webapi.getanimalslocation\" permission_level=\"1\" /> -->");
+                sw.WriteLine (" </permissions>");
+                sw.WriteLine ();
+                sw.WriteLine ("</webpermissions>");
+
                                 sw.Flush ();
                                 sw.Close ();