* some if inversions and added {}'s for readability

This commit is contained in:
lbsa71
2008-09-08 14:30:35 +00:00
parent f2de15bffc
commit 8388fe0669
7 changed files with 92 additions and 61 deletions

View File

@@ -71,8 +71,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_configSource = openSim.ConfigSource.Source;
try
{
if (m_configSource.Configs["RemoteAdmin"] != null &&
m_configSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
if (m_configSource.Configs["RemoteAdmin"] == null ||
!m_configSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
{
// No config or disabled
}
else
{
m_config = m_configSource.Configs["RemoteAdmin"];
m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
@@ -110,8 +114,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
checkStringParameters(request, new string[] { "password", "regionID" });
if (requiredPassword != String.Empty &&
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
(!requestData.Contains("password") || (string)requestData["password"] != requiredPassword))
{
throw new Exception("wrong password");
}
UUID regionID = new UUID((string) requestData["regionID"]);