Changeset 94 for trunk

Timestamp:

11/19/08 13:34:57 (17 years ago)

Author:

yumileroy

Message:

[svn] * Use ObjectMgr/AccountMgr? functions rather than DB queries. Source mangos

Original author: KingPin?
Date: 2008-10-21 19:07:16-05:00

Location:

trunk/src/game

Files:

• Level3.cpp (modified) (1 diff)
• ObjectMgr.cpp (modified) (1 diff)
• ObjectMgr.h (modified) (1 diff)
• World.cpp (modified) (3 diffs)

trunk/src/game/Level3.cpp

@@ -4825 +4825 @@
             }
 
-            loginDatabase.escape_string(nameOrIP);
-            QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'", nameOrIP.c_str());
-            if (!result)
+            accountid = objmgr.GetPlayerAccountIdByPlayerName (nameOrIP);
+            if (!accountid)
             {
                 PSendSysMessage(LANG_BANINFO_NOCHARACTER);
                 return true;
             }
-            fields = result->Fetch();
-            accountid = fields[0].GetUInt32();
-            delete result;
-            result = loginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", accountid);
-            if (!result)
+            
+            if (!accmgr.GetName (accountid,accountname))
             {
                 PSendSysMessage(LANG_BANINFO_NOCHARACTER);
                 return true;
             }
-            fields = result->Fetch();
-            accountname = fields[0].GetCppString();
-            delete result;
         }
         else

trunk/src/game/ObjectMgr.cpp

@@ -1356 +1356 @@
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE guid = '%u'", GUID_LOPART(guid));
+    if(result)
+    {
+        uint32 acc = (*result)[0].GetUInt32();
+        delete result;
+        return acc;
+    }
+
+    return 0;
+}
+
+uint32 ObjectMgr::GetPlayerAccountIdByPlayerName(std::string name) const
+{
+    QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'", name.c_str());
     if(result)
     {

trunk/src/game/ObjectMgr.h

@@ -414 +414 @@
         uint32 GetPlayerTeamByGUID(const uint64 &guid) const;
         uint32 GetPlayerAccountIdByGUID(const uint64 &guid) const;
+        uint32 GetPlayerAccountIdByPlayerName(std::string name) const;
 
         uint32 GetNearestTaxiNode( float x, float y, float z, uint32 mapid );

trunk/src/game/World.cpp

@@ -37 +37 @@
 #include "SkillDiscovery.h"
 #include "World.h"
+#include "AccountMgr.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -2338 +2339 @@
         if(type == "account")
         {
-            //NO SQL injection as name is escaped
-            loginDatabase.escape_string(nameOrIP);
-            QueryResult *resultAccounts = loginDatabase.PQuery("SELECT id FROM account WHERE username = '%s'",nameOrIP.c_str());
-            if(!resultAccounts)
+            if (!AccountMgr::normilizeString (nameOrIP))
                 return false;
-            Field* fieldsAccount = resultAccounts->Fetch();
-            account = fieldsAccount->GetUInt32();
-
-            delete resultAccounts;
+            
+            account = accmgr.GetId (nameOrIP);
         }
         else if(type == "character")
@@ -2353 +2349 @@
                 return false;
 
-            //NO SQL injection as name is escaped
-            loginDatabase.escape_string(nameOrIP);
-            QueryResult *resultAccounts = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'",nameOrIP.c_str());
-            if(!resultAccounts)
-                return false;
-            Field* fieldsAccount = resultAccounts->Fetch();
-            account = fieldsAccount->GetUInt32();
-
-            delete resultAccounts;
+            account = objmgr.GetPlayerAccountIdByPlayerName (nameOrIP);
         }
         if(!account)
             return false;
+            
         //NO SQL injection as account is uint32
         loginDatabase.PExecute("UPDATE account_banned SET active = '0' WHERE id = '%u'",account);