*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 51 insertions, 0 deletions

diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp
index d4c4c4aecce..b3c9a76e720 100644
--- a/src/game/AccountMgr.cpp
+++ b/src/game/AccountMgr.cpp
@@ -17,40 +17,53 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #include "Database/DatabaseEnv.h"
 #include "Policies/SingletonImp.h"
+
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "Util.h"
 #include "Auth/Sha1.h"
+
 extern DatabaseType loginDatabase;
+
 INSTANTIATE_SINGLETON_1(AccountMgr);
+
 AccountMgr::AccountMgr()
 {}
+
 AccountMgr::~AccountMgr()
 {}
+
 AccountOpResult AccountMgr::CreateAccount(std::string username, std::string password)
 {
     if(utf8length(username) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;                           // username's too long
+
     normalizeString(username);
     normalizeString(password);
+
     if(GetId(username))
     {
         return AOR_NAME_ALREDY_EXIST;                       // username does already exist
     }
+
     if(!loginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
     loginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL");
+
     return AOR_OK;                                          // everything's fine
 }
+
 AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d'", accid);
     if(!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
+
     result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'",accid);
     if (result)
     {
@@ -59,6 +72,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
             Field *fields = result->Fetch();
             uint32 guidlo = fields[0].GetUInt32();
             uint64 guid = MAKE_NEW_GUID(guidlo, 0, HIGHGUID_PLAYER);
+
             // kick if player currently
             if(Player* p = ObjectAccessor::GetObjectInWorld(guid, (Player*)NULL))
             {
@@ -66,54 +80,76 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
                 s->KickPlayer();                            // mark session to remove at next session list update
                 s->LogoutPlayer(false);                     // logout player without waiting next session list update
             }
+
             Player::DeleteFromDB(guid, accid, false);       // no need to update realm characters
         } while (result->NextRow());
+
         delete result;
     }
+
     // table realm specific but common for all characters of account for realm
     CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'",accid);
+
     loginDatabase.BeginTransaction();
+
     bool res =
         loginDatabase.PExecute("DELETE FROM account WHERE id='%d'", accid) &&
         loginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%d'", accid);
+
     loginDatabase.CommitTransaction();
+
     if(!res)
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error;
+
     return AOR_OK;
 }
+
 AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d'", accid);
     if(!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
+
     if(utf8length(new_uname) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;
+
     if(utf8length(new_passwd) > MAX_ACCOUNT_STR)
         return AOR_PASS_TOO_LONG;
+
     normalizeString(new_uname);
     normalizeString(new_passwd);
+
     std::string safe_new_uname = new_uname;
     loginDatabase.escape_string(safe_new_uname);
+
     if(!loginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%d'", safe_new_uname.c_str(),
                 CalculateShaPassHash(new_uname, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
+
     return AOR_OK;
 }
+
 AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
 {
     std::string username;
+
     if(!GetName(accid, username))
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
+
     if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
         return AOR_PASS_TOO_LONG;
+
     normalizeString(new_passwd);
+
     // also reset s and v to force update at next realmd login
     if(!loginDatabase.PExecute("UPDATE account SET v='0', s='0', sha_pass_hash='%s' WHERE id='%d'",
                 CalculateShaPassHash(username, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
+
     return AOR_OK;
 }
+
 uint32 AccountMgr::GetId(std::string username)
 {
     loginDatabase.escape_string(username);
@@ -127,6 +163,7 @@ uint32 AccountMgr::GetId(std::string username)
         return id;
     }
 }
+
 uint32 AccountMgr::GetSecurity(uint32 acc_id)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT gmlevel FROM account WHERE id = '%u'", acc_id);
@@ -136,8 +173,10 @@ uint32 AccountMgr::GetSecurity(uint32 acc_id)
         delete result;
         return sec;
     }
+
     return 0;
 }
+
 bool AccountMgr::GetName(uint32 acc_id, std::string &name)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", acc_id);
@@ -147,31 +186,41 @@ bool AccountMgr::GetName(uint32 acc_id, std::string &name)
         delete result;
         return true;
     }
+
     return false;
 }
+
 bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
 {
     std::string username;
     if(!GetName(accid, username))
         return false;
+
     normalizeString(passwd);
+
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d' AND sha_pass_hash='%s'", accid, CalculateShaPassHash(username, passwd).c_str());
     if (result)
     {
         delete result;
         return true;
     }
+
     return false;
 }
+
 bool AccountMgr::normalizeString(std::string& utf8str)
 {
     wchar_t wstr_buf[MAX_ACCOUNT_STR+1];
+
     size_t wstr_len = MAX_ACCOUNT_STR;
     if(!Utf8toWStr(utf8str,wstr_buf,wstr_len))
         return false;
+
     std::transform( &wstr_buf[0], wstr_buf+wstr_len, &wstr_buf[0], wcharToUpperOnlyLatin );
+
     return WStrToUtf8(wstr_buf,wstr_len,utf8str);
 }
+
 std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
 {
     Sha1Hash sha;
@@ -180,8 +229,10 @@ std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& pas
     sha.UpdateData(":");
     sha.UpdateData(password);
     sha.Finalize();
+
     std::string encoded;
     hexEncodeByteArray(sha.GetDigest(), sha.GetLength(), encoded);
+
     return encoded;
 }