From a9b5a6c3a63d8500f3c512574fd802d40b562661 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 19 Apr 2015 10:57:41 +0200
Subject: Split the plugin names and plugin folders to avoid confusing them.

Ref.: http://forum.mc-server.org/showthread.php?tid=1877
---
 MCServer/Plugins/APIDump/APIDesc.lua         | 151 -----------
 MCServer/Plugins/APIDump/Classes/Plugins.lua | 204 +++++++++++++++
 MCServer/webadmin/(original).html            | 375 ---------------------------
 MCServer/webadmin/template.lua               |  20 +-
 MCServer/webadmin/template_orig.lua          | 137 ----------
 5 files changed, 215 insertions(+), 672 deletions(-)
 create mode 100644 MCServer/Plugins/APIDump/Classes/Plugins.lua
 delete mode 100644 MCServer/webadmin/(original).html
 delete mode 100644 MCServer/webadmin/template_orig.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 671a044e0..b4424203c 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1917,157 +1917,6 @@ a_Player:OpenWindow(Window);
 			Inherits = "cPawn",
 		},  -- cPlayer
 
-		cPlugin =
-		{
-			Desc = [[cPlugin describes a Lua plugin. This page is dedicated to new-style plugins and contain their functions. Each plugin has its own Plugin object.
-]],
-			Functions =
-			{
-				Call = { Params = "Function name, [All the parameters divided with commas]", Notes = "(<b>OBSOLETE</b>) This function allows you to call a function from another plugin. It can only use pass: integers, booleans, strings and usertypes (cPlayer, cEntity, cCuboid, etc.).<br /><br /><b>This function is obsolete and unsafe, use {{cPluginManager}}:CallPlugin() instead!</b>" },
-				GetDirectory = { Return = "string", Notes = "Returns the name of the folder where the plugin's files are. (APIDump)" },
-				GetLocalDirectory = { Notes = "OBSOLETE use GetLocalFolder instead." },
-				GetLocalFolder = { Return = "string", Notes = "Returns the path where the plugin's files are. (Plugins/APIDump)" },
-				GetName = { Return = "string", Notes = "Returns the name of the plugin." },
-				SetName = { Params = "string", Notes = "Sets the name of the Plugin." },
-				GetVersion = { Return = "number", Notes = "Returns the version of the plugin." },
-				SetVersion = { Params = "number", Notes = "Sets the version of the plugin." },
-				GetFileName = { Return = "string" },
-				CreateWebPlugin = { Notes = "{{cWebPlugin|cWebPlugin}}" },
-			},
-		},  -- cPlugin
-
-		cPluginLua =
-		{
-			Desc = "",
-			Functions = {},
-			Inherits = "cPlugin",
-		},  -- cPluginLua
-
-		cPluginManager =
-		{
-			Desc = [[
-				This class is used for generic plugin-related functionality. The plugin manager has a list of all
-				plugins, can enable or disable plugins, manages hooks and in-game console commands.</p>
-				<p>
-				There is one instance of cPluginManager in MCServer, to get it, call either
-				{{cRoot|cRoot}}:Get():GetPluginManager() or cPluginManager:Get() function.</p>
-				<p>
-				Note that some functions are "static", that means that they are called using a dot operator instead
-				of the colon operator. For example:
-<pre class="prettyprint lang-lua">
-cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
-</pre></p>
-			]],
-			Functions =
-			{
-				AddHook =
-				{
-					{ Params = "HookType, [HookFunction]", Return = "", Notes = "(STATIC) Informs the plugin manager that it should call the specified function when the specified hook event occurs. If a function is not specified, a default function name is looked up, based on the hook type" },
-					{ Params = "{{cPlugin|Plugin}}, HookType, [HookFunction]", Return = "", Notes = "(STATIC, <b>DEPRECATED</b>) Informs the plugin manager that it should call the specified function when the specified hook event occurs. If a function is not specified, a default function name is looked up, based on the hook type. NOTE: This format is deprecated and the server outputs a warning if it is used!" },
-				},
-				BindCommand =
-				{
-					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
-					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
-				},
-				BindConsoleCommand =
-				{
-					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
-					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
-				},
-				CallPlugin = { Params = "PluginName, FunctionName, [FunctionArgs...]", Return = "[FunctionRets]", Notes = "(STATIC) Calls the specified function in the specified plugin, passing all the given arguments to it. If it succeeds, it returns all the values returned by that function. If it fails, returns no value at all. Note that only strings, numbers, bools, nils and classes can be used for parameters and return values; tables and functions cannot be copied across plugins." },
-				DisablePlugin = { Params = "PluginName", Return = "bool", Notes = "Disables a plugin specified by its name. Returns true if the plugin was disabled, false if it wasn't found or wasn't active." },
-				ExecuteCommand = { Params = "{{cPlayer|Player}}, CommandStr", Return = "{{cPluginManager#CommandResult|CommandResult}}", Notes = "Executes the command as if given by the specified Player. Checks permissions." },
-				FindPlugins = { Params = "", Return = "", Notes = "Refreshes the list of plugins to include all folders inside the Plugins folder (potentially new disabled plugins)" },
-				ForceExecuteCommand = { Params = "{{cPlayer|Player}}, CommandStr", Return = "{{cPluginManager#CommandResult|CommandResult}}", Notes = "Same as ExecuteCommand, but doesn't check permissions" },
-				ForEachCommand = { Params = "CallbackFn", Return = "bool", Notes = "Calls the CallbackFn function for each command that has been bound using BindCommand(). The CallbackFn has the following signature: <pre class=\"prettyprint lang-lua\">function(Command, Permission, HelpString)</pre>. If the callback returns true, the enumeration is aborted and this API function returns false; if it returns false or no value, the enumeration continues with the next command, and the API function returns true." },
-				ForEachConsoleCommand = { Params = "CallbackFn", Return = "bool", Notes = "Calls the CallbackFn function for each command that has been bound using BindConsoleCommand(). The CallbackFn has the following signature: <pre class=\"prettyprint lang-lua\">function (Command, HelpString)</pre>. If the callback returns true, the enumeration is aborted and this API function returns false; if it returns false or no value, the enumeration continues with the next command, and the API function returns true." },
-				Get = { Params = "", Return = "cPluginManager", Notes = "(STATIC) Returns the single instance of the plugin manager" },
-				GetAllPlugins = { Params = "", Return = "table", Notes = "Returns a table (dictionary) of all plugins, [name => value], where value is a valid {{cPlugin}} if the plugin is loaded, or the bool value false if the plugin is not loaded." },
-				GetCommandPermission = { Params = "Command", Return = "Permission", Notes = "Returns the permission needed for executing the specified command" },
-				GetCurrentPlugin = { Params = "", Return = "{{cPlugin}}", Notes = "Returns the {{cPlugin}} object for the calling plugin. This is the same object that the Initialize function receives as the argument." },
-				GetNumPlugins = { Params = "", Return = "number", Notes = "Returns the number of plugins, including the disabled ones" },
-				GetPlugin = { Params = "PluginName", Return = "{{cPlugin}}", Notes = "(<b>DEPRECATED, UNSAFE</b>) Returns a plugin handle of the specified plugin, or nil if such plugin is not loaded. Note thatdue to multithreading the handle is not guaranteed to be safe for use when stored - a single-plugin reload may have been triggered in the mean time for the requested plugin." },
-				GetPluginsPath = { Params = "", Return = "string", Notes = "Returns the path where the individual plugin folders are located. Doesn't include the path separator at the end of the returned string." },
-				IsCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if in-game Command is already bound (by any plugin)" },
-				IsConsoleCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if console Command is already bound (by any plugin)" },
-				LoadPlugin = { Params = "PluginFolder", Return = "", Notes = "(<b>DEPRECATED</b>) Loads a plugin from the specified folder. NOTE: Loading plugins may be an unsafe operation and may result in a deadlock or a crash. This API is deprecated and might be removed." },
-				LogStackTrace = { Params = "", Return = "", Notes = "(STATIC) Logs a current stack trace of the Lua engine to the server console log. Same format as is used when the plugin fails." },
-				ReloadPlugins = { Params = "", Return = "", Notes = "Reloads all active plugins" },
-			},
-			ConstantGroups=
-			{
-				CommandResult =
-				{
-					Include = "^cr.*",
-					TextBefore = [[
-						Results that the (Force)ExecuteCommand return. This gives information if the command is executed or not and the reason.
-					]],
-				},
-			},
-			Constants =
-			{
-				crBlocked = { Notes = "When a plugin stopped the command using the OnExecuteCommand hook" },
-				crError = { Notes = "When the command handler for the given command results in an error" },
-				crExecuted = { Notes = "When the command is successfully executed." },
-				crNoPermission = { Notes = "When the player doesn't have permission to execute the given command." },
-				crUnknownCommand = { Notes = "When the given command doesn't exist." },
-				HOOK_BLOCK_SPREAD = { Notes = "Called when a block spreads based on world conditions" },
-				HOOK_BLOCK_TO_PICKUPS = { Notes = "Called when a block has been dug and is being converted to pickups. The server has provided the default pickups and the plugins may modify them." },
-				HOOK_CHAT = { Notes = "Called when a client sends a chat message that is not a command. The plugin may modify the chat message" },
-				HOOK_CHUNK_AVAILABLE = { Notes = "Called when a chunk is loaded or generated and becomes available in the {{cWorld|world}}." },
-				HOOK_CHUNK_GENERATED = { Notes = "Called after a chunk is generated. A plugin may do last modifications on the generated chunk before it is handed of to the {{cWorld|world}}." },
-				HOOK_CHUNK_GENERATING = { Notes = "Called before a chunk is generated. A plugin may override some parts of the generation algorithm." },
-				HOOK_CHUNK_UNLOADED = { Notes = "Called after a chunk has been unloaded from a {{cWorld|world}}." },
-				HOOK_CHUNK_UNLOADING = { Notes = "Called before a chunk is unloaded from a {{cWorld|world}}. The chunk has already been saved." },
-				HOOK_COLLECTING_PICKUP = { Notes = "Called when a player is about to collect a pickup." },
-				HOOK_CRAFTING_NO_RECIPE = { Notes = "Called when a player has items in the crafting slots and the server cannot locate any recipe. Plugin may provide a recipe." },
-				HOOK_DISCONNECT = { Notes = "Called after the player has disconnected." },
-				HOOK_EXECUTE_COMMAND = { Notes = "Called when a client sends a chat message that is recognized as a command, before handing that command to the regular command handler. A plugin may stop the command from being handled. This hook is called even when the player doesn't have permissions for the command." },
-				HOOK_EXPLODED = { Notes = "Called after an explosion has been processed in a {{cWorld|world}}." },
-				HOOK_EXPLODING = { Notes = "Called before an explosion is processed in a {{cWorld|world}}. A plugin may alter the explosion parameters or cancel the explosion altogether." },
-				HOOK_HANDSHAKE = { Notes = "Called when a Handshake packet is received from a client." },
-				HOOK_HOPPER_PULLING_ITEM = { Notes = "Called when a hopper is pulling an item from the container above it." },
-				HOOK_HOPPER_PUSHING_ITEM = { Notes = "Called when a hopper is pushing an item into the container it is aimed at." },
-				HOOK_KILLING = { Notes = "Called when an entity has just been killed. A plugin may resurrect the entity by setting its health to above zero." },
-				HOOK_LOGIN = { Notes = "Called when a Login packet is sent to the client, before the client is queued for authentication." },
-				HOOK_PLAYER_ANIMATION = { Notes = "Called when a client send the Animation packet." },
-				HOOK_PLAYER_BREAKING_BLOCK = { Notes = "Called when a player is about to break a block. A plugin may cancel the event." },
-				HOOK_PLAYER_BROKEN_BLOCK = { Notes = "Called after a player has broken a block." },
-				HOOK_PLAYER_EATING = { Notes = "Called when the player starts eating a held item. Plugins may abort the eating." },
-				HOOK_PLAYER_FISHED = { Notes = "Called when the player reels the fishing rod back in, after the server decides the player's fishing reward." },
-				HOOK_PLAYER_FISHING = { Notes = "Called when the player reels the fishing rod back in, plugins may alter the fishing reward." },
-				HOOK_PLAYER_JOINED = { Notes = "Called when the player entity has been created. It has not yet been fully initialized." },
-				HOOK_PLAYER_LEFT_CLICK = { Notes = "Called when the client sends the LeftClick packet." },
-				HOOK_PLAYER_MOVING = { Notes = "Called when the player has moved and the movement is now being applied." },
-				HOOK_PLAYER_PLACED_BLOCK = { Notes = "Called when the player has just placed a block" },
-				HOOK_PLAYER_PLACING_BLOCK = { Notes = "Called when the player is about to place a block. A plugin may cancel the event." },
-				HOOK_PLAYER_RIGHT_CLICK = { Notes = "Called when the client sends the RightClick packet." },
-				HOOK_PLAYER_RIGHT_CLICKING_ENTITY = { Notes = "Called when the client sends the UseEntity packet." },
-				HOOK_PLAYER_SHOOTING = { Notes = "Called when the player releases the mouse button to fire their bow." },
-				HOOK_PLAYER_SPAWNED = { Notes = "Called after the player entity has been created. The entity is fully initialized and is spawning in the {{cWorld|world}}." },
-				HOOK_PLAYER_TOSSING_ITEM = { Notes = "Called when the player is tossing the held item (keypress Q)" },
-				HOOK_PLAYER_USED_BLOCK = { Notes = "Called after the player has right-clicked a block" },
-				HOOK_PLAYER_USED_ITEM = { Notes = "Called after the player has right-clicked with a usable item in their hand." },
-				HOOK_PLAYER_USING_BLOCK = { Notes = "Called when the player is about to use (right-click) a block" },
-				HOOK_PLAYER_USING_ITEM = { Notes = "Called when the player is about to right-click with a usable item in their hand." },
-				HOOK_POST_CRAFTING = { Notes = "Called after a valid recipe has been chosen for the current contents of the crafting grid. Plugins may modify the recipe." },
-				HOOK_PRE_CRAFTING = { Notes = "Called before a recipe is searched for the current contents of the crafting grid. Plugins may provide a recipe and cancel the built-in search." },
-				HOOK_SERVER_PING = { Notes = "Called when a client pings the server from the server list. Plugins may change the favicon, server description, players online and maximum players values." },
-				HOOK_SPAWNED_ENTITY = { Notes = "Called after an entity is spawned in a {{cWorld|world}}. The entity is already part of the world." },
-				HOOK_SPAWNED_MONSTER = { Notes = "Called after a mob is spawned in a {{cWorld|world}}. The mob is already part of the world." },
-				HOOK_SPAWNING_ENTITY = { Notes = "Called just before an entity is spawned in a {{cWorld|world}}." },
-				HOOK_SPAWNING_MONSTER = { Notes = "Called just before a mob is spawned in a {{cWorld|world}}." },
-				HOOK_TAKE_DAMAGE = { Notes = "Called when an entity is taking any kind of damage. Plugins may modify the damage value, effects, source or cancel the damage." },
-				HOOK_TICK = { Notes = "Called when the main server thread ticks - 20 times a second." },
-				HOOK_UPDATED_SIGN = { Notes = "Called after a {{cSignEntity|sign}} text has been updated, either by a player or by any external means." },
-				HOOK_UPDATING_SIGN = { Notes = "Called before a {{cSignEntity|sign}} text is updated, either by a player or by any external means." },
-				HOOK_WEATHER_CHANGED = { Notes = "Called after the weather has changed." },
-				HOOK_WEATHER_CHANGING = { Notes = "Called just before the weather changes" },
-				HOOK_WORLD_TICK = { Notes = "Called in each world's tick thread when the game logic is about to tick (20 times a second)." },
-			},
-		},  -- cPluginManager
-
 		cRankManager =
 		{
 			Desc = [[
diff --git a/MCServer/Plugins/APIDump/Classes/Plugins.lua b/MCServer/Plugins/APIDump/Classes/Plugins.lua
new file mode 100644
index 000000000..20e2afe23
--- /dev/null
+++ b/MCServer/Plugins/APIDump/Classes/Plugins.lua
@@ -0,0 +1,204 @@
+return
+{
+	cPlugin =
+	{
+		Desc = [[cPlugin describes a Lua plugin. This page is dedicated to new-style plugins and contain their functions. Each plugin has its own Plugin object.
+]],
+		Functions =
+		{
+			GetDirectory = { Return = "string", Notes = "<b>OBSOLETE</b>, use GetFolderName() instead!" },
+			GetFolderName = { Params = "", Return = "string", Notes = "Returns the name of the folder where the plugin's files are. (APIDump)" },
+			GetLoadError = { Params = "", Return = "string", Notes = "If the plugin failed to load, returns the error message for the failure." },
+			GetLocalDirectory = { Notes = "<b>OBSOLETE</b>, use GetLocalFolder instead." },
+			GetLocalFolder = { Return = "string", Notes = "Returns the path where the plugin's files are. (Plugins/APIDump)" },
+			GetName = { Return = "string", Notes = "Returns the name of the plugin." },
+			GetStatus = { Params = "", Return = "{{cPluginManager#PluginStatus|PluginStatus}}", Notes = "Returns the status of the plugin (loaded, disabled, unloaded, error, not found)" },
+			GetVersion = { Return = "number", Notes = "Returns the version of the plugin." },
+			IsLoaded = { Params = "", Return = "", Notes = "" },
+			SetName = { Params = "string", Notes = "Sets the name of the Plugin." },
+			SetVersion = { Params = "number", Notes = "Sets the version of the plugin." },
+		},
+	},  -- cPlugin
+
+	cPluginLua =
+	{
+		Desc = "",
+		Functions =
+		{
+			AddWebTab = { Params = "", Return = "", Notes = "Adds a new webadmin tab" },
+		},
+		Inherits = "cPlugin",
+	},  -- cPluginLua
+
+	cPluginManager =
+	{
+		Desc = [[
+			This class is used for generic plugin-related functionality. The plugin manager has a list of all
+			plugins, can enable or disable plugins, manages hooks and in-game console commands.</p>
+			<p>
+			Plugins can be identified by either the PluginFolder or PluginName. Note that these two can differ,
+			refer to <a href="http://forum.mc-server.org/showthread.php?tid=1877">the forum</a> for detailed discussion.
+			<p>
+			There is one instance of cPluginManager in MCServer, to get it, call either
+			{{cRoot|cRoot}}:Get():GetPluginManager() or cPluginManager:Get() function.</p>
+			<p>
+			Note that some functions are "static", that means that they are called using a dot operator instead
+			of the colon operator. For example:
+<pre class="prettyprint lang-lua">
+cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
+</pre></p>
+		]],
+		Functions =
+		{
+			AddHook =
+			{
+				{ Params = "{{cPluginManager#Hooks|HookType}}, [HookFunction]", Return = "", Notes = "(STATIC) Informs the plugin manager that it should call the specified function when the specified hook event occurs. If a function is not specified, a default global function name is looked up, based on the hook type" },
+				{ Params = "{{cPlugin|Plugin}}, {{cPluginManager#Hooks|HookType}}, [HookFunction]", Return = "", Notes = "(STATIC, <b>DEPRECATED</b>) Informs the plugin manager that it should call the specified function when the specified hook event occurs. If a function is not specified, a default function name is looked up, based on the hook type. NOTE: This format is deprecated and the server outputs a warning if it is used!" },
+			},
+			BindCommand =
+			{
+				{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
+				{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
+			},
+			BindConsoleCommand =
+			{
+				{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
+				{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
+			},
+			CallPlugin = { Params = "PluginName, FunctionName, [FunctionArgs...]", Return = "[FunctionRets]", Notes = "(STATIC) Calls the specified function in the specified plugin, passing all the given arguments to it. If it succeeds, it returns all the values returned by that function. If it fails, returns no value at all. Note that only strings, numbers, bools, nils and classes can be used for parameters and return values; tables and functions cannot be copied across plugins." },
+			ExecuteCommand = { Params = "{{cPlayer|Player}}, CommandStr", Return = "{{cPluginManager#CommandResult|CommandResult}}", Notes = "Executes the command as if given by the specified Player. Checks permissions." },
+			FindPlugins = { Params = "", Return = "", Notes = "<b>OBSOLETE</b>, use RefreshPluginList() instead"},
+			ForceExecuteCommand = { Params = "{{cPlayer|Player}}, CommandStr", Return = "{{cPluginManager#CommandResult|CommandResult}}", Notes = "Same as ExecuteCommand, but doesn't check permissions" },
+			ForEachCommand = { Params = "CallbackFn", Return = "bool", Notes = "Calls the CallbackFn function for each command that has been bound using BindCommand(). The CallbackFn has the following signature: <pre class=\"prettyprint lang-lua\">function(Command, Permission, HelpString)</pre>. If the callback returns true, the enumeration is aborted and this API function returns false; if it returns false or no value, the enumeration continues with the next command, and the API function returns true." },
+			ForEachConsoleCommand = { Params = "CallbackFn", Return = "bool", Notes = "Calls the CallbackFn function for each command that has been bound using BindConsoleCommand(). The CallbackFn has the following signature: <pre class=\"prettyprint lang-lua\">function (Command, HelpString)</pre>. If the callback returns true, the enumeration is aborted and this API function returns false; if it returns false or no value, the enumeration continues with the next command, and the API function returns true." },
+			ForEachPlugin = { Params = "CallbackFn", Return = "bool", Notes = "Calls the CallbackFn function for each command that has been bound using BindConsoleCommand(). The CallbackFn has the following signature: <pre class=\"prettyprint lang-lua\">function ({{cPlugin|Plugin}})</pre>. If the callback returns true, the enumeration is aborted and this API function returns false; if it returns false or no value, the enumeration continues with the next command, and the API function returns true." },
+			Get = { Params = "", Return = "cPluginManager", Notes = "(STATIC) Returns the single instance of the plugin manager" },
+			GetAllPlugins = { Params = "", Return = "table", Notes = "Returns a table (dictionary) of all plugins, [name => value], where value is a valid {{cPlugin}} if the plugin is loaded, or the bool value false if the plugin is not loaded." },
+			GetCommandPermission = { Params = "Command", Return = "Permission", Notes = "Returns the permission needed for executing the specified command" },
+			GetCurrentPlugin = { Params = "", Return = "{{cPlugin}}", Notes = "Returns the {{cPlugin}} object for the calling plugin. This is the same object that the Initialize function receives as the argument." },
+			GetNumLoadedPlugins = { Params = "", Return = "number", Notes = "Returns the number of loaded plugins (psLoaded only)" },
+			GetNumPlugins = { Params = "", Return = "number", Notes = "Returns the number of plugins, including the disabled, errored, unloaded and not-found ones" },
+			GetPlugin = { Params = "PluginName", Return = "{{cPlugin}}", Notes = "(<b>DEPRECATED, UNSAFE</b>) Returns a plugin handle of the specified plugin, or nil if such plugin is not loaded. Note thatdue to multithreading the handle is not guaranteed to be safe for use when stored - a single-plugin reload may have been triggered in the mean time for the requested plugin." },
+			GetPluginsPath = { Params = "", Return = "string", Notes = "Returns the path where the individual plugin folders are located. Doesn't include the path separator at the end of the returned string." },
+			IsCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if in-game Command is already bound (by any plugin)" },
+			IsConsoleCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if console Command is already bound (by any plugin)" },
+			LoadPlugin = { Params = "PluginFolder", Return = "", Notes = "(<b>DEPRECATED</b>) Loads a plugin from the specified folder. NOTE: Loading plugins may be an unsafe operation and may result in a deadlock or a crash. This API is deprecated and might be removed." },
+			LogStackTrace = { Params = "", Return = "", Notes = "(STATIC) Logs a current stack trace of the Lua engine to the server console log. Same format as is used when the plugin fails." },
+			RefreshPluginList = { Params = "", Return = "", Notes = "Refreshes the list of plugins to include all folders inside the Plugins folder (potentially new disabled plugins)" },
+			ReloadPlugins = { Params = "", Return = "", Notes = "Reloads all active plugins" },
+			UnloadPlugin = { Params = "PluginName", Return = "", Notes = "Queues the specified plugin to be unloaded. To avoid deadlocks, the unloading happens in the main tick thread asynchronously." },
+		},
+		ConstantGroups=
+		{
+			CommandResult =
+			{
+				Include = "^cr.*",
+				TextBefore = [[
+					Results that the (Force)ExecuteCommand return. This gives information if the command is executed or not and the reason.
+				]],
+			},
+		},
+		Constants =
+		{
+			crBlocked = { Notes = "When a plugin stopped the command using the OnExecuteCommand hook" },
+			crError = { Notes = "When the command handler for the given command results in an error" },
+			crExecuted = { Notes = "When the command is successfully executed." },
+			crNoPermission = { Notes = "When the player doesn't have permission to execute the given command." },
+			crUnknownCommand = { Notes = "When the given command doesn't exist." },
+			HOOK_BLOCK_SPREAD = { Notes = "Called when a block spreads based on world conditions" },
+			HOOK_BLOCK_TO_PICKUPS = { Notes = "Called when a block has been dug and is being converted to pickups. The server has provided the default pickups and the plugins may modify them." },
+			HOOK_CHAT = { Notes = "Called when a client sends a chat message that is not a command. The plugin may modify the chat message" },
+			HOOK_CHUNK_AVAILABLE = { Notes = "Called when a chunk is loaded or generated and becomes available in the {{cWorld|world}}." },
+			HOOK_CHUNK_GENERATED = { Notes = "Called after a chunk is generated. A plugin may do last modifications on the generated chunk before it is handed of to the {{cWorld|world}}." },
+			HOOK_CHUNK_GENERATING = { Notes = "Called before a chunk is generated. A plugin may override some parts of the generation algorithm." },
+			HOOK_CHUNK_UNLOADED = { Notes = "Called after a chunk has been unloaded from a {{cWorld|world}}." },
+			HOOK_CHUNK_UNLOADING = { Notes = "Called before a chunk is unloaded from a {{cWorld|world}}. The chunk has already been saved." },
+			HOOK_COLLECTING_PICKUP = { Notes = "Called when a player is about to collect a pickup." },
+			HOOK_CRAFTING_NO_RECIPE = { Notes = "Called when a player has items in the crafting slots and the server cannot locate any recipe. Plugin may provide a recipe." },
+			HOOK_DISCONNECT = { Notes = "Called after the player has disconnected." },
+			HOOK_ENTITY_ADD_EFFECT = { Notes = "Called when an effect is being added to an {{cEntity|entity}}. Plugin may refuse the effect." },
+			HOOK_ENTITY_TELEPORT = { Notes = "Called when an {{cEntity|entity}} is being teleported. Plugin may refuse the teleportation." },
+			HOOK_EXECUTE_COMMAND = { Notes = "Called when a client sends a chat message that is recognized as a command, before handing that command to the regular command handler. A plugin may stop the command from being handled. This hook is called even when the player doesn't have permissions for the command." },
+			HOOK_EXPLODED = { Notes = "Called after an explosion has been processed in a {{cWorld|world}}." },
+			HOOK_EXPLODING = { Notes = "Called before an explosion is processed in a {{cWorld|world}}. A plugin may alter the explosion parameters or cancel the explosion altogether." },
+			HOOK_HANDSHAKE = { Notes = "Called when a Handshake packet is received from a client." },
+			HOOK_HOPPER_PULLING_ITEM = { Notes = "Called when a hopper is pulling an item from the container above it." },
+			HOOK_HOPPER_PUSHING_ITEM = { Notes = "Called when a hopper is pushing an item into the container it is aimed at." },
+			HOOK_KILLING = { Notes = "Called when an entity has just been killed. A plugin may resurrect the entity by setting its health to above zero." },
+			HOOK_LOGIN = { Notes = "Called when a Login packet is sent to the client, before the client is queued for authentication." },
+			HOOK_PLAYER_ANIMATION = { Notes = "Called when a client send the Animation packet." },
+			HOOK_PLAYER_BREAKING_BLOCK = { Notes = "Called when a player is about to break a block. A plugin may cancel the event." },
+			HOOK_PLAYER_BROKEN_BLOCK = { Notes = "Called after a player has broken a block." },
+			HOOK_PLAYER_DESTROYED = { Notes = "Called when the {{cPlayer}} object is destroyed - a player has disconnected." },
+			HOOK_PLAYER_EATING = { Notes = "Called when the player starts eating a held item. Plugins may abort the eating." },
+			HOOK_PLAYER_FISHED = { Notes = "Called when the player reels the fishing rod back in, after the server decides the player's fishing reward." },
+			HOOK_PLAYER_FISHING = { Notes = "Called when the player reels the fishing rod back in, plugins may alter the fishing reward." },
+			HOOK_PLAYER_FOOD_LEVEL_CHANGE = { Notes = "Called when the player's food level is changing. Plugins may refuse the change." },
+			HOOK_PLAYER_JOINED = { Notes = "Called when the player entity has been created. It has not yet been fully initialized." },
+			HOOK_PLAYER_LEFT_CLICK = { Notes = "Called when the client sends the LeftClick packet." },
+			HOOK_PLAYER_MOVING = { Notes = "Called when the player has moved and the movement is now being applied." },
+			HOOK_PLAYER_PLACED_BLOCK = { Notes = "Called when the player has just placed a block" },
+			HOOK_PLAYER_PLACING_BLOCK = { Notes = "Called when the player is about to place a block. A plugin may cancel the event." },
+			HOOK_PLAYER_RIGHT_CLICK = { Notes = "Called when the client sends the RightClick packet." },
+			HOOK_PLAYER_RIGHT_CLICKING_ENTITY = { Notes = "Called when the client sends the UseEntity packet." },
+			HOOK_PLAYER_SHOOTING = { Notes = "Called when the player releases the mouse button to fire their bow." },
+			HOOK_PLAYER_SPAWNED = { Notes = "Called after the player entity has been created. The entity is fully initialized and is spawning in the {{cWorld|world}}." },
+			HOOK_PLAYER_TOSSING_ITEM = { Notes = "Called when the player is tossing the held item (keypress Q)" },
+			HOOK_PLAYER_USED_BLOCK = { Notes = "Called after the player has right-clicked a block" },
+			HOOK_PLAYER_USED_ITEM = { Notes = "Called after the player has right-clicked with a usable item in their hand." },
+			HOOK_PLAYER_USING_BLOCK = { Notes = "Called when the player is about to use (right-click) a block" },
+			HOOK_PLAYER_USING_ITEM = { Notes = "Called when the player is about to right-click with a usable item in their hand." },
+			HOOK_PLUGINS_LOADED = { Notes = "Called after all plugins have loaded." },
+			HOOK_PLUGIN_MESSAGE = { Notes = "Called when a PluginMessage packet is received from a client." },
+			HOOK_POST_CRAFTING = { Notes = "Called after a valid recipe has been chosen for the current contents of the crafting grid. Plugins may modify the recipe." },
+			HOOK_PRE_CRAFTING = { Notes = "Called before a recipe is searched for the current contents of the crafting grid. Plugins may provide a recipe and cancel the built-in search." },
+			HOOK_PROJECTILE_HIT_BLOCK = { Notes = "Called when a {{cProjectileEntity|projectile}} hits a block." },
+			HOOK_PROJECTILE_HIT_ENTITY = { Notes = "Called when a {{cProjectileEntity|projectile}} hits an {{cEntity|entity}}." },
+			HOOK_SERVER_PING = { Notes = "Called when a client pings the server from the server list. Plugins may change the favicon, server description, players online and maximum players values." },
+			HOOK_SPAWNED_ENTITY = { Notes = "Called after an entity is spawned in a {{cWorld|world}}. The entity is already part of the world." },
+			HOOK_SPAWNED_MONSTER = { Notes = "Called after a mob is spawned in a {{cWorld|world}}. The mob is already part of the world." },
+			HOOK_SPAWNING_ENTITY = { Notes = "Called just before an entity is spawned in a {{cWorld|world}}." },
+			HOOK_SPAWNING_MONSTER = { Notes = "Called just before a mob is spawned in a {{cWorld|world}}." },
+			HOOK_TAKE_DAMAGE = { Notes = "Called when an entity is taking any kind of damage. Plugins may modify the damage value, effects, source or cancel the damage." },
+			HOOK_TICK = { Notes = "Called when the main server thread ticks - 20 times a second." },
+			HOOK_UPDATED_SIGN = { Notes = "Called after a {{cSignEntity|sign}} text has been updated, either by a player or by any external means." },
+			HOOK_UPDATING_SIGN = { Notes = "Called before a {{cSignEntity|sign}} text is updated, either by a player or by any external means." },
+			HOOK_WEATHER_CHANGED = { Notes = "Called after the weather has changed." },
+			HOOK_WEATHER_CHANGING = { Notes = "Called just before the weather changes" },
+			HOOK_WORLD_STARTED = { Notes = "Called when a world has been started." },
+			HOOK_WORLD_TICK = { Notes = "Called in each world's tick thread when the game logic is about to tick (20 times a second)." },
+			
+			psDisabled = { Notes = "The plugin is not enabled in settings.ini" },
+			psError = { Notes = "The plugin is enabled in settings.ini, but it has run into an error while loading. Use {{cPlugin}}:GetLoadError() to identify the error." },
+			psLoaded = { Notes = "The plugin is enabled and loaded." },
+			psNotFound = { Notes = "The plugin has been loaded, but is no longer present on disk." },
+			psUnloaded = { Notes = "The plugin is enabled in settings.ini, but it has been unloaded (by a command)." },
+		},  -- constants
+		
+		ConstantGroups =
+		{
+			Hooks =
+			{
+				Include = {"HOOK_.*"},
+				TextBefore = [[
+					These constants identify individual hooks. To register the plugin to receive notifications on hooks, use the
+					cPluginManager:AddHook() function. For detailed description of each hook, see the <a href='index.html#hooks'>
+					hooks reference</a>.]],
+			},
+			PluginStatus =
+			{
+				Include = {"ps.*"},
+				TextBefore = [[
+					These constants are used to report status of individual plugins. Use {{cPlugin}}:GetStatus() to query the
+					status of a plugin; use cPluginManager::ForEachPlugin() to iterate over plugins.]],
+			},
+			CommandResult =
+			{
+				Include = {"cr.*"},
+				TextBefore = [[
+					These constants are returned by the ExecuteCommand() function to identify the exact outcome of the
+					operation.]],
+			},
+		},
+	},  -- cPluginManager
+}
diff --git a/MCServer/webadmin/(original).html b/MCServer/webadmin/(original).html
deleted file mode 100644
index 673a93ada..000000000
--- a/MCServer/webadmin/(original).html
+++ /dev/null
@@ -1,375 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="icon" href="files/favicon.ico">
-<title>{TITLE}</title>
-
-<style type="text/css" media="screen">
-
-	/* reset CSS */
-	
-	html, body, div, span, applet, object, iframe,
-	h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-	a, abbr, acronym, address, big, cite, code,
-	del, dfn, em, font, img, ins, kbd, q, s, samp,
-	small, strike, strong, sub, sup, tt, var,
-	b, u, i, center,
-	dl, dt, dd, ol, ul, li,
-	fieldset, form, label, legend,
-	table, caption, tbody, tfoot, thead, tr, th, td {
-		margin: 0;
-		padding: 0;
-		border: 0;
-		outline: 0;
-		font-size: 100%;
-		vertical-align: baseline;
-		background: transparent;
-	}
-	body {
-		line-height: 1;
-	}
-	ol, ul {
-		list-style: none;
-	}
-	blockquote, q {
-		quotes: none;
-	}
-
-	/* remember to define focus styles! */
-	:focus {
-		outline: 0;
-	}
-
-	/* remove textarea resize at Safari */
-	textarea { 
-		resize: none;
-	}
-
-	/* remember to highlight inserts somehow! */
-	ins {
-		text-decoration: none;
-	}
-	del {
-		text-decoration: line-through;
-	}
-
-	/* tables still need 'cellspacing="0"' in the markup */
-	table {
-		border-collapse: collapse;
-		border-spacing: 0;
-	}
-
-
-	/*
-		Origional from http://www.perspectived.com/
-		Modified by Ben Phelps
-		Made for FakeTruth - MCServer
-	*/
-
-	/* Basic  ---------------------------------------- */
-
-	.clear { clear: both; }
-
-	body {
-		background: white;
-		font-family: Arial, Helvetica, sans-serif;
-		font-size: 12px;
-		color: #646464;
-		text-align: center;
-	}
-
-	#wrapper {
-		text-align: left;
-		width: 930px;
-		margin: 0 auto;
-	}
-
-	/* Logo  ---------------------------------------- */
-
-	h1 {
-		margin: 15px 0 10px 5px;
-		width: 180px;
-		height: 36px;
-		background: url(files/logo.png) no-repeat left top;
-	}
-
-	h1 a {
-		display: block;
-		width: 225px;
-		height: 28px;
-	}
-
-	h1 span { display: none; }
-
-	a {
-		color: #646464;
-	}
-
-	/* Container ---------------------------------------- */
-
-	#containerHolder {
-		background: #eee;
-		padding: 5px;
-	}
-
-
-	#container {
-		background: #fff url(files/background.gif) repeat-y left top;
-		border: 1px solid #ddd;
-		width: 918px;
-
-	}
-
-	#connectHolder {
-		background: #eee;
-		padding: 5px;
-		margin-bottom:8px;
-	}
-
-
-	#connect {
-		border: 1px solid #ddd;
-		background-color: #fff;
-		padding:5px;
-		width: 908px;
-	}
-
-	.pics {  
-	    height:  375px;
-	    width:   600px;
-	} 
-
-	.pics img {  
-	    padding: 5px;  
-	    border:  1px solid #ddd;  
-	    background-color: #eee;  
-	    width:  600px; 
-	    height: 375px;
-		margin-left: 15px;
-	}
-
-	/* Login -------------------------------------- */
-
-	#loginLogo {
-		margin: 0 auto;
-		margin-top:100px;
-		width: 180px;
-		height: 36px;
-		background-image: url(files/logo.png);
-	}
-
-	#loginHolder {
-		background: #eee;
-		padding: 5px;
-		width: 310px;
-		margin: 0 auto;
-		height: 90px;
-		margin-top:20px;
-	}
-
-	#login {
-		padding:10px;
-		width: 288px;
-		height: 68px;
-		border: 1px solid #ddd;
-		background:#fff;
-		text-align: left;
-	}
-
-
-	/* Sidebar ---------------------------------------- */
-
-	#sidebar {
-		width: 179px;
-		float: left;
-	}
-
-	#sidebar .sideNav { width: 179px; }
-
-	#sidebar .sideNav li { border-bottom: 1px solid #ddd; width: 179px; }
-
-	#sidebar .sideNav li a {
-		display: block;
-		color: #646464;
-		background: #f6f6f6;
-		text-decoration: none;
-		height: 29px;
-		line-height: 29px;
-		padding: 0 19px;
-		width: 141px;
-	}
-
-	#sidebar .sideNav li a:hover { background: #fdfcf6; }
-
-	#sidebar .sideNav li a.active, #sidebar .sideNav li a.active:hover {
-		background: #f0f7fa;
-		color: #c66653;
-	}
-
-	/* Breadcrumb ---------------------------------------- */
-
-	h2 {
-		width: 718px;
-		float: right;
-		color: #646464;
-		font-size: 16px;
-		line-height: 16px;
-		font-weight: bold;
-		margin: 20px 0 0 0;
-		padding: 0 0 10px 0;
-		border-bottom: 1px solid #ddd;
-	}
-
-	h2 a {
-		color: #646464;
-		text-decoration: none;
-	}
-
-	h2 a.active { color: #c66653; }
-
-	h2 a:hover { text-decoration: underline; }
-
-	/* Content ---------------------------------------- */
-
-	#main {
-		width: 700px;
-		float: right;
-		padding: 0 19px 0 0;
-	}
-
-	#main p {
-
-		padding: 10px;
-
-	}
-
-	h3 {
-		font-size: 14px;
-		line-height: 14px;
-		font-weight: bold;
-		color: #5494af;
-		padding: 0 0 0 10px;
-		margin: 20px 0 10px;
-	}
-	
-	h4 {
-		padding: 0 0 0 10px;
-		margin: 20px 0 10px;
-	}
-	
-	#main ul {
-		padding: 0 0 0 10px;
-		list-style-type: circle;
-		list-style-position: inside;
-	}
-
-	#main table {
-		border-top: 1px solid #ddd;
-		width: 700px;
-	}
-
-	#main table tr th {
-		text-align: left;
-		background: #f6f6f6;
-		padding: 0px 20px;
-		height: 20px;
-		line-height: 20px;
-		border-bottom: 1px solid #ddd;
-	}
-	
-	#main table tr td {
-		background: #f6f6f6;
-		padding: 0px 20px;
-		height: 29px;
-		line-height: 29px;
-		border-bottom: 1px solid #ddd;
-	}
-
-	#main table tr.odd td {
-		background: #fbfbfb;
-	}
-
-	#main table tr:hover td { background: #fdfcf6; }
-
-	#main table .action {
-		text-align: right;
-		padding: 0 20px 0 10px;
-	}
-
-	#main table tr .action a { margin: 0 0 0 10px; text-decoration: none; color: #9b9b9b; }
-	#main table tr:hover .action .edit { color: #c5a059; }
-	#main table tr:hover .action .delete { color: #a02b2b; }
-	#main table tr:hover .action .view { color: #55a34a; }
-
-	#main table tr:hover .action a:hover { text-decoration: underline; }
-
-	fieldset {
-		border: 1px solid #ddd;
-		padding: 19px;
-		margin: 0 0 20px 0;
-		background: #fbfbfb;
-	}
-
-	form p { margin: 0 0 14px 0; float: left; width: 100%;  }
-
-	label {
-		display: block;
-		width: 100%;
-		margin: 0 0 7px 0;
-		line-height: 12px;
-	}
-	
-	/* Footer ---------------------------------------- */
-
-	#footer {
-		margin: 10px 0 30px 0;
-		font-size: 11px;
-		line-height: 11px;
-		color: #9B9B9B;
-		padding: 0 0 0 5px;
-	}
-
-	#footer a { color: #9B9B9B; }
-
-	#footer a:hover { text-decoration: none; }
-</style>
-
-</head>
-
-<body>
-	<div id="wrapper">
-    	<!-- h1 tag stays for the logo, you can use the a tag for linking the index page -->
-    	<h1><a href="./"><span>{TITLE}</span></a></h1>
-       
-        <div id="containerHolder">
-			<div id="container">
-        		<div id="sidebar">
-                	<ul class="sideNav">
-                    	{MENU}
-                    </ul>
-                    <!-- // .sideNav -->
-                </div>    
-                <!-- // #sidebar -->
-                
-                <!-- h2 stays for breadcrumbs -->
-                <h2>Welcome {USERNAME}</h2>
-                
-                <div id="main">
-					<h3>{PLUGIN_NAME}</h3>
-					
-					{CONTENT}
-					
-				</div>
-                <!-- // #main -->
-                
-                <div class="clear"></div>
-            </div>
-            <!-- // #container -->
-        </div>	
-        <!-- // #containerHolder -->
-        
-        <p id="footer">MCServer is using: {MEM}MB of memory; Current chunk count: {NUMCHUNKS} </p>
-    </div>
-    <!-- // #wrapper -->
-</body>
-</html>
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index 6ea7b69bc..9d0f860db 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -30,20 +30,22 @@ function GetDefaultPage()
 	Content = Content .. "<p>" .. cRoot:Get():GetServer():GetServerID() .. "</p>"
 	
 	Content = Content .. "<h4>Plugins:</h4><ul>"
-	local AllPlugins = PM:GetAllPlugins()
-	for key,value in pairs(AllPlugins) do
-		if( value ~= nil and value ~= false ) then
-			Content = Content ..  "<li>" .. key .. " (version " .. value:GetVersion() .. ")</li>"
+	PM:ForEachPlugin(
+		function (a_CBPlugin)
+			if (a_CBPlugin:IsLoaded()) then
+				Content = Content ..  "<li>" .. a_CBPlugin:GetName() .. " (version " .. a_CBPlugin:GetVersion() .. ")</li>"
+			end
 		end
-	end
+	)
 	
 	Content = Content .. "</ul>"
 	Content = Content .. "<h4>Players:</h4><ul>"
 	
-	local AddPlayerToTable = function( Player )
-		Content = Content .. "<li>" .. Player:GetName() .. "</li>"
-	end
-	cRoot:Get():ForEachPlayer( AddPlayerToTable )
+	cRoot:Get():ForEachPlayer(
+		function(a_CBPlayer)
+			Content = Content .. "<li>" .. Player:GetName() .. "</li>"
+		end
+	)
 	
 	Content = Content .. "</ul><br>";
 
diff --git a/MCServer/webadmin/template_orig.lua b/MCServer/webadmin/template_orig.lua
deleted file mode 100644
index a7480f83e..000000000
--- a/MCServer/webadmin/template_orig.lua
+++ /dev/null
@@ -1,137 +0,0 @@
--- Use a table for fast concatenation of strings
-local SiteContent = {}
-function Output(String)
-	table.insert(SiteContent, String)
-end
-
-
-
-
-
-function GetTableSize(Table)
-	local Size = 0
-	for key,value in pairs(Table) do
-		Size = Size + 1
-	end
-	return Size
-end
-
-
-
-
-
-function GetDefaultPage()
-	local PM = cRoot:Get():GetPluginManager()
-
-	local SubTitle = "Current Game"
-	local Content = ""
-	
-	Content = Content .. "<h4>Server Name:</h4>"
-	Content = Content .. "<p>" .. cRoot:Get():GetServer():GetServerID() .. "</p>"
-	
-	Content = Content .. "<h4>Plugins:</h4><ul>"
-	local AllPlugins = PM:GetAllPlugins()
-	for key,value in pairs(AllPlugins) do
-		if( value ~= nil and value ~= false ) then
-			Content = Content ..  "<li>" .. key .. " V." .. value:GetVersion() .. "</li>"
-		end
-	end
-	
-	Content = Content .. "</ul>"
-	Content = Content .. "<h4>Players:</h4><ul>"
-	
-	local AddPlayerToTable = function( Player )
-		Content = Content .. "<li>" .. Player:GetName() .. "</li>"
-	end
-	cRoot:Get():ForEachPlayer( AddPlayerToTable )
-	
-	Content = Content .. "</ul><br>";
-
-	return Content, SubTitle
-end
-
-
-
-
-
-function ShowPage(WebAdmin, TemplateRequest)
-	SiteContent = {}
-	local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
-	local Title = "MCServer WebAdmin"
-	local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage()
-	local NumChunks = cRoot:Get():GetTotalChunkCount()
-	local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
-	local PageContent = PluginPage.Content
-	local SubTitle = PluginPage.PluginName
-	if (PluginPage.TabName ~= "") then
-		SubTitle = PluginPage.PluginName .. " - " .. PluginPage.TabName
-	end
-	if (PageContent == "") then
-		PageContent, SubTitle = GetDefaultPage()
-	end
-	
-	Output([[
-<!DOCTYPE html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="icon" href="/favicon.ico">
-<title>]] .. Title .. [[</title>
-<link rel="stylesheet" type="text/css" media="screen" href="/style.css">
-</head>
-
-<body>
-	<div id="wrapper">
-		<!-- h1 tag stays for the logo, you can use the a tag for linking the index page -->
-		<h1>
-			<a href="]] .. BaseURL .. [["><span>MCServer</span></a>
-		</h1>
-		<div id="containerHolder">
-			<div id="container">
-				<div id="sidebar">
-					<ul class="sideNav">
-	]])
-
-
-	local AllPlugins = WebAdmin:GetPlugins()
-	for key,value in pairs(AllPlugins) do
-		local PluginWebTitle = value:GetWebTitle()
-		local TabNames = value:GetTabNames()
-		if (GetTableSize(TabNames) > 0) then
-			Output("<li>"..PluginWebTitle.."</li>\n");
-			
-			for webname,prettyname in pairs(TabNames) do
-				Output("<li><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
-			end
-		end
-	end
-
-	
-	Output([[
-					</ul>
-					<!-- // .sideNav -->
-				</div>    
-				<!-- // #sidebar -->
-				<!-- h2 stays for breadcrumbs -->
-				<h2>Welcome ]] .. TemplateRequest.Request.Username .. [[</h2>
-				<div id="main">
-					<h3>]] .. SubTitle .. [[</h3>
-					]] .. PageContent .. [[
-				</div>
-				<!-- // #main -->
-				
-				<div class="clear"></div>
-				
-			</div>
-			<!-- // #container -->
-		</div>	
-		<!-- // #containerHolder -->
-	    
-		<p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
-	</div>
-	<!-- // #wrapper -->
-</body>
-</html>
-	]])
-	
-	return table.concat(SiteContent)
-end
-- 
cgit v1.2.3


From 206932b94dad2546d2ef8e18bc9e4cf90839d7a4 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 19 Apr 2015 17:23:59 +0200
Subject: APIDump: Documented cPluginManager:IsPluginLoaded().

---
 MCServer/Plugins/APIDump/Classes/Plugins.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Classes/Plugins.lua b/MCServer/Plugins/APIDump/Classes/Plugins.lua
index 20e2afe23..fa502ccfc 100644
--- a/MCServer/Plugins/APIDump/Classes/Plugins.lua
+++ b/MCServer/Plugins/APIDump/Classes/Plugins.lua
@@ -82,6 +82,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 			GetPluginsPath = { Params = "", Return = "string", Notes = "Returns the path where the individual plugin folders are located. Doesn't include the path separator at the end of the returned string." },
 			IsCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if in-game Command is already bound (by any plugin)" },
 			IsConsoleCommandBound = { Params = "Command", Return = "bool", Notes = "Returns true if console Command is already bound (by any plugin)" },
+			IsPluginLoaded = { Params = "PluginName", Return = "", Notes = "Returns true if the specified plugin is loaded." },
 			LoadPlugin = { Params = "PluginFolder", Return = "", Notes = "(<b>DEPRECATED</b>) Loads a plugin from the specified folder. NOTE: Loading plugins may be an unsafe operation and may result in a deadlock or a crash. This API is deprecated and might be removed." },
 			LogStackTrace = { Params = "", Return = "", Notes = "(STATIC) Logs a current stack trace of the Lua engine to the server console log. Same format as is used when the plugin fails." },
 			RefreshPluginList = { Params = "", Return = "", Notes = "Refreshes the list of plugins to include all folders inside the Plugins folder (potentially new disabled plugins)" },
-- 
cgit v1.2.3