Changeset 94 for trunk/src/game/World.cpp

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

Files:

• trunk/src/game/World.cpp (modified) (3 diffs)

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);