Line ending fix, sorry.

1 files changed, 265 insertions, 265 deletions

diff --git a/src/server/game/Accounts/RBAC.cpp b/src/server/game/Accounts/RBAC.cpp
index 54ef1a34766..74ff060636e 100644
--- a/src/server/game/Accounts/RBAC.cpp
+++ b/src/server/game/Accounts/RBAC.cpp
@@ -1,265 +1,265 @@
-/*

- * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>

- *

- * This program is free software; you can redistribute it and/or modify it

- * under the terms of the GNU General Public License as published by the

- * Free Software Foundation; either version 2 of the License, or (at your

- * option) any later version.

- *

- * This program is distributed in the hope that it will be useful, but WITHOUT

- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for

- * more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with this program. If not, see <http://www.gnu.org/licenses/>.

- */

-

-#include "RBAC.h"

-#include "AccountMgr.h"

-#include "DatabaseEnv.h"

-#include "Log.h"

-

-namespace rbac

-{

-

-std::string GetDebugPermissionString(RBACPermissionContainer const& perms)

-{

-    std::string str = "";

-    if (!perms.empty())

-    {

-        std::ostringstream o;

-        RBACPermissionContainer::const_iterator itr = perms.begin();

-        o << (*itr);

-        for (++itr; itr != perms.end(); ++itr)

-            o << ", " << uint32(*itr);

-        str = o.str();

-    }

-

-    return str;

-}

-

-RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /* = 0*/)

-{

-    // Check if permission Id exists

-    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);

-    if (!perm)

-    {

-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_ID_DOES_NOT_EXISTS;

-    }

-

-    // Check if already added in denied list

-    if (HasDeniedPermission(permissionId))

-    {

-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_IN_DENIED_LIST;

-    }

-

-    // Already added?

-    if (HasGrantedPermission(permissionId))

-    {

-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_CANT_ADD_ALREADY_ADDED;

-    }

-

-    AddGrantedPermission(permissionId);

-

-    // Do not save to db when loading data from DB (realmId = 0)

-    if (realmId)

-    {

-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        SavePermission(permissionId, true, realmId);

-        CalculateNewPermissions();

-    }

-    else

-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-

-    return RBAC_OK;

-}

-

-RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /* = 0*/)

-{

-    // Check if permission Id exists

-    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);

-    if (!perm)

-    {

-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_ID_DOES_NOT_EXISTS;

-    }

-

-    // Check if already added in granted list

-    if (HasGrantedPermission(permissionId))

-    {

-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_IN_GRANTED_LIST;

-    }

-

-    // Already added?

-    if (HasDeniedPermission(permissionId))

-    {

-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_CANT_ADD_ALREADY_ADDED;

-    }

-

-    AddDeniedPermission(permissionId);

-

-    // Do not save to db when loading data from DB (realmId = 0)

-    if (realmId)

-    {

-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        SavePermission(permissionId, false, realmId);

-        CalculateNewPermissions();

-    }

-    else

-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-

-    return RBAC_OK;

-}

-

-void RBACData::SavePermission(uint32 permission, bool granted, int32 realmId)

-{

-    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_RBAC_ACCOUNT_PERMISSION);

-    stmt->setUInt32(0, GetId());

-    stmt->setUInt32(1, permission);

-    stmt->setBool(2, granted);

-    stmt->setInt32(3, realmId);

-    LoginDatabase.Execute(stmt);

-}

-

-RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId /* = 0*/)

-{

-    // Check if it's present in any list

-    if (!HasGrantedPermission(permissionId) && !HasDeniedPermission(permissionId))

-    {

-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        return RBAC_CANT_REVOKE_NOT_IN_LIST;

-    }

-

-    RemoveGrantedPermission(permissionId);

-    RemoveDeniedPermission(permissionId);

-

-    // Do not save to db when loading data from DB (realmId = 0)

-    if (realmId)

-    {

-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_PERMISSION);

-        stmt->setUInt32(0, GetId());

-        stmt->setUInt32(1, permissionId);

-        stmt->setInt32(2, realmId);

-        LoginDatabase.Execute(stmt);

-

-        CalculateNewPermissions();

-    }

-    else

-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",

-                       GetId(), GetName().c_str(), permissionId, realmId);

-

-    return RBAC_OK;

-}

-

-void RBACData::LoadFromDB()

-{

-    ClearData();

-

-    TC_LOG_DEBUG("rbac", "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());

-    // Load account permissions (granted and denied) that affect current realm

-    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_PERMISSIONS);

-    stmt->setUInt32(0, GetId());

-    stmt->setInt32(1, GetRealmId());

-

-    PreparedQueryResult result = LoginDatabase.Query(stmt);

-    if (result)

-    {

-        do

-        {

-            Field* fields = result->Fetch();

-            if (fields[1].GetBool())

-                GrantPermission(fields[0].GetUInt32());

-            else

-                DenyPermission(fields[0].GetUInt32());

-        }

-        while (result->NextRow());

-    }

-

-    // Add default permissions

-    RBACPermissionContainer const& permissions = sAccountMgr->GetRBACDefaultPermissions(_secLevel);

-    for (RBACPermissionContainer::const_iterator itr = permissions.begin(); itr != permissions.end(); ++itr)

-        GrantPermission(*itr);

-

-    // Force calculation of permissions

-    CalculateNewPermissions();

-}

-

-void RBACData::CalculateNewPermissions()

-{

-    TC_LOG_TRACE("rbac", "RBACData::CalculateNewPermissions [Id: %u Name: %s]", GetId(), GetName().c_str());

-

-    // Get the list of granted permissions

-    _globalPerms = GetGrantedPermissions();

-    ExpandPermissions(_globalPerms);

-    RBACPermissionContainer revoked = GetDeniedPermissions();

-    ExpandPermissions(revoked);

-    RemovePermissions(_globalPerms, revoked);

-}

-

-void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)

-{

-    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)

-        permsTo.insert(*itr);

-}

-

-void RBACData::RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)

-{

-    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)

-        permsTo.erase(*itr);

-}

-

-void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)

-{

-    RBACPermissionContainer toCheck = permissions;

-    permissions.clear();

-

-    while (!toCheck.empty())

-    {

-        // remove the permission from original list

-        uint32 permissionId = *toCheck.begin();

-        toCheck.erase(toCheck.begin());

-

-        RBACPermission const* permission = sAccountMgr->GetRBACPermission(permissionId);

-        if (!permission)

-            continue;

-

-        // insert into the final list (expanded list)

-        permissions.insert(permissionId);

-

-        // add all linked permissions (that are not already expanded) to the list of permissions to be checked

-        RBACPermissionContainer const& linkedPerms = permission->GetLinkedPermissions();

-        for (RBACPermissionContainer::const_iterator itr = linkedPerms.begin(); itr != linkedPerms.end(); ++itr)

-            if (permissions.find(*itr) == permissions.end())

-                toCheck.insert(*itr);

-    }

-

-    TC_LOG_DEBUG("rbac", "RBACData::ExpandPermissions: Expanded: %s", GetDebugPermissionString(permissions).c_str());

-}

-

-void RBACData::ClearData()

-{

-    _grantedPerms.clear();

-    _deniedPerms.clear();

-    _globalPerms.clear();

-}

-

-}

+/*
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "RBAC.h"
+#include "AccountMgr.h"
+#include "DatabaseEnv.h"
+#include "Log.h"
+
+namespace rbac
+{
+
+std::string GetDebugPermissionString(RBACPermissionContainer const& perms)
+{
+    std::string str = "";
+    if (!perms.empty())
+    {
+        std::ostringstream o;
+        RBACPermissionContainer::const_iterator itr = perms.begin();
+        o << (*itr);
+        for (++itr; itr != perms.end(); ++itr)
+            o << ", " << uint32(*itr);
+        str = o.str();
+    }
+
+    return str;
+}
+
+RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if permission Id exists
+    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
+    if (!perm)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_ID_DOES_NOT_EXISTS;
+    }
+
+    // Check if already added in denied list
+    if (HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_IN_DENIED_LIST;
+    }
+
+    // Already added?
+    if (HasGrantedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_ADD_ALREADY_ADDED;
+    }
+
+    AddGrantedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        SavePermission(permissionId, true, realmId);
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if permission Id exists
+    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
+    if (!perm)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_ID_DOES_NOT_EXISTS;
+    }
+
+    // Check if already added in granted list
+    if (HasGrantedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_IN_GRANTED_LIST;
+    }
+
+    // Already added?
+    if (HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_ADD_ALREADY_ADDED;
+    }
+
+    AddDeniedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        SavePermission(permissionId, false, realmId);
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+void RBACData::SavePermission(uint32 permission, bool granted, int32 realmId)
+{
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_RBAC_ACCOUNT_PERMISSION);
+    stmt->setUInt32(0, GetId());
+    stmt->setUInt32(1, permission);
+    stmt->setBool(2, granted);
+    stmt->setInt32(3, realmId);
+    LoginDatabase.Execute(stmt);
+}
+
+RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if it's present in any list
+    if (!HasGrantedPermission(permissionId) && !HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_REVOKE_NOT_IN_LIST;
+    }
+
+    RemoveGrantedPermission(permissionId);
+    RemoveDeniedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_PERMISSION);
+        stmt->setUInt32(0, GetId());
+        stmt->setUInt32(1, permissionId);
+        stmt->setInt32(2, realmId);
+        LoginDatabase.Execute(stmt);
+
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+void RBACData::LoadFromDB()
+{
+    ClearData();
+
+    TC_LOG_DEBUG("rbac", "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());
+    // Load account permissions (granted and denied) that affect current realm
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_PERMISSIONS);
+    stmt->setUInt32(0, GetId());
+    stmt->setInt32(1, GetRealmId());
+
+    PreparedQueryResult result = LoginDatabase.Query(stmt);
+    if (result)
+    {
+        do
+        {
+            Field* fields = result->Fetch();
+            if (fields[1].GetBool())
+                GrantPermission(fields[0].GetUInt32());
+            else
+                DenyPermission(fields[0].GetUInt32());
+        }
+        while (result->NextRow());
+    }
+
+    // Add default permissions
+    RBACPermissionContainer const& permissions = sAccountMgr->GetRBACDefaultPermissions(_secLevel);
+    for (RBACPermissionContainer::const_iterator itr = permissions.begin(); itr != permissions.end(); ++itr)
+        GrantPermission(*itr);
+
+    // Force calculation of permissions
+    CalculateNewPermissions();
+}
+
+void RBACData::CalculateNewPermissions()
+{
+    TC_LOG_TRACE("rbac", "RBACData::CalculateNewPermissions [Id: %u Name: %s]", GetId(), GetName().c_str());
+
+    // Get the list of granted permissions
+    _globalPerms = GetGrantedPermissions();
+    ExpandPermissions(_globalPerms);
+    RBACPermissionContainer revoked = GetDeniedPermissions();
+    ExpandPermissions(revoked);
+    RemovePermissions(_globalPerms, revoked);
+}
+
+void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
+{
+    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
+        permsTo.insert(*itr);
+}
+
+void RBACData::RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
+{
+    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
+        permsTo.erase(*itr);
+}
+
+void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
+{
+    RBACPermissionContainer toCheck = permissions;
+    permissions.clear();
+
+    while (!toCheck.empty())
+    {
+        // remove the permission from original list
+        uint32 permissionId = *toCheck.begin();
+        toCheck.erase(toCheck.begin());
+
+        RBACPermission const* permission = sAccountMgr->GetRBACPermission(permissionId);
+        if (!permission)
+            continue;
+
+        // insert into the final list (expanded list)
+        permissions.insert(permissionId);
+
+        // add all linked permissions (that are not already expanded) to the list of permissions to be checked
+        RBACPermissionContainer const& linkedPerms = permission->GetLinkedPermissions();
+        for (RBACPermissionContainer::const_iterator itr = linkedPerms.begin(); itr != linkedPerms.end(); ++itr)
+            if (permissions.find(*itr) == permissions.end())
+                toCheck.insert(*itr);
+    }
+
+    TC_LOG_DEBUG("rbac", "RBACData::ExpandPermissions: Expanded: %s", GetDebugPermissionString(permissions).c_str());
+}
+
+void RBACData::ClearData()
+{
+    _grantedPerms.clear();
+    _deniedPerms.clear();
+    _globalPerms.clear();
+}
+
+}