Squash-merge 'Add getAccountID & getAccountByID'

Squashed commit of the following:

commit 7f3c6f00fca2f628b6371d1db02f8fa882bf929a
Author: Jusonex <[email protected]>
Date:   Fri Jun 22 22:23:23 2018 +0200

    Fix bugs in getAccountID and getAccountByID

commit 122f929ea23b76e78a2827ef3a621539cc9b8ea3
Merge: 4f3fdc5 6a048ee
Author: Jusonex <[email protected]>
Date:   Fri Jun 22 21:56:11 2018 +0200

    Merge branch 'AccountID' of git://github.com/emre1702/mtasa-blue into emre1702-AccountID

commit 6a048ee
Merge: 42752d4 15f99b2
Author: Emre Kara <[email protected]>
Date:   Mon Jun 18 22:50:25 2018 +0200

    Merge branch 'master' into AccountID

commit 42752d4
Author: Emre Kara <[email protected]>
Date:   Wed Nov 15 18:41:42 2017 +0100

    Add getAccountID & getAccountByID

Author: emre1702

Server/mods/deathmatch/logic/CAccountManager.cpp

@@ -912,6 +912,21 @@ void CAccountManager::GetAccountsByIP(const SString& strIP, std::vector<CAccount
     }
 }
 
+CAccount* CAccountManager::GetAccountByID(int ID)
+{
+    CRegistryResult result;
+    m_pDatabaseManager->QueryWithResultf(m_hDbConnection, &result, "SELECT name FROM accounts WHERE id = ?", SQLITE_INTEGER, ID);
+
+    for (CRegistryResultIterator iter = result->begin(); iter != result->end(); ++iter)
+    {
+        const auto& row = *iter;
+
+        return Get(reinterpret_cast<const char*>(row[0].pVal));
+    }
+
+    return nullptr;
+}
+
 void CAccountManager::GetAccountsByData(const SString& dataName, const SString& value, std::vector<CAccount*>& outAccounts)
 {
     Save();

Server/mods/deathmatch/logic/CAccountManager.h

@@ -140,6 +140,7 @@ class CAccountManager
 
     void GetAccountsBySerial(const SString& strSerial, std::vector<CAccount*>& outAccounts);
     void GetAccountsByIP(const SString& strIP, std::vector<CAccount*>& outAccounts);
+    CAccount* GetAccountByID(int ID);
     void GetAccountsByData(const SString& dataName, const SString& value, std::vector<CAccount*>& outAccounts);
 
     CAccount* AddGuestAccount(const SString& strName);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -10907,6 +10907,21 @@ bool CStaticFunctionDefinitions::GetAccountsBySerial(const SString& strSerial, s
     return true;
 }
 
+bool CStaticFunctionDefinitions::GetAccountID(CAccount* pAccount, int& ID)
+{
+    bool bRegistered = pAccount->IsRegistered();
+    if (bRegistered)
+        ID = pAccount->GetID();
+
+    return bRegistered;
+}
+
+bool CStaticFunctionDefinitions::GetAccountByID(int ID, CAccount*& outAccount)
+{
+    outAccount = m_pAccountManager->GetAccountByID(ID);
+    return true;
+}
+
 bool CStaticFunctionDefinitions::GetAccountIP(CAccount* pAccount, SString& strIP)
 {
     bool bRegistered = pAccount->IsRegistered();

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -651,6 +651,8 @@ class CStaticFunctionDefinitions
     static bool                          GetAccountsByData(const SString& dataName, const SString& value, std::vector<CAccount*>& outAccounts);
     static bool                          GetAccountSerial(CAccount* pAccount, SString& strSerial);
     static bool                          GetAccountsBySerial(const SString& strSerial, std::vector<CAccount*>& outAccounts);
+    static bool                          GetAccountID(CAccount* pAccount, int& ID);
+    static bool                          GetAccountByID(int ID, CAccount*& outAccount);
     static bool                          GetAccountIP(CAccount* pAccount, SString& strIP);
     static bool                          GetAccountsByIP(const SString& strIP, std::vector<CAccount*>& outAccounts);
 

Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp

@@ -28,6 +28,8 @@ void CLuaAccountDefs::LoadFunctions()
     CLuaCFunctions::AddFunction("getAccountsByData", GetAccountsByData);
     CLuaCFunctions::AddFunction("getAccountSerial", GetAccountSerial);
     CLuaCFunctions::AddFunction("getAccountsBySerial", GetAccountsBySerial);
+    CLuaCFunctions::AddFunction("getAccountID", GetAccountID);		
+    CLuaCFunctions::AddFunction("getAccountByID", GetAccountByID);
     CLuaCFunctions::AddFunction("getAccountIP", GetAccountIP);
     CLuaCFunctions::AddFunction("getAccountsByIP", GetAccountsByIP);
 
@@ -62,6 +64,7 @@ void CLuaAccountDefs::AddClass(lua_State* luaVM)
 
     lua_classfunction(luaVM, "getSerial", "getAccountSerial");
     lua_classfunction(luaVM, "getIP", "getAccountIP");
+    lua_classfunction(luaVM, "getID", "getAccountID");
     lua_classfunction(luaVM, "getData", "getAccountData");
     lua_classfunction(luaVM, "getAllData", "getAllAccountData");
     lua_classfunction(luaVM, "getName", "getAccountName");
@@ -70,6 +73,7 @@ void CLuaAccountDefs::AddClass(lua_State* luaVM)
 
     lua_classvariable(luaVM, "serial", NULL, "getAccountSerial");
     lua_classvariable(luaVM, "name", "setAccountName", "getAccountName");
+    lua_classvariable(luaVM, "id", NULL, "getAccountID");
     lua_classvariable(luaVM, "ip", NULL, "getAccountIP");
     lua_classvariable(luaVM, "player", NULL, "getAccountPlayer");
     lua_classvariable(luaVM, "guest", NULL, "isGuestAccount");
@@ -345,7 +349,7 @@ int CLuaAccountDefs::GetAccountIP(lua_State* luaVM)
 
 int CLuaAccountDefs::GetAccountsByIP(lua_State* luaVM)
 {
-    //  table getAccountsByIP ( string ip )
+    // table getAccountsByIP ( string ip )
     SString strIP;
 
     CScriptArgReader argStream(luaVM);
@@ -372,6 +376,54 @@ int CLuaAccountDefs::GetAccountsByIP(lua_State* luaVM)
     return 1;
 }
 
+int CLuaAccountDefs::GetAccountID(lua_State* luaVM)
+{
+    // int getAccountID ( account theAccount )
+    CAccount* pAccount;
+		
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pAccount);
+
+    if (!argStream.HasErrors())
+    {
+        int ID;
+        if (CStaticFunctionDefinitions::GetAccountID(pAccount, ID))
+        {
+            lua_pushnumber(luaVM, ID);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+		
+int CLuaAccountDefs::GetAccountByID(lua_State* luaVM)
+{
+    // account getAccountByID ( int ID )
+    int ID;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadNumber(ID);
+
+    if (!argStream.HasErrors())
+    {
+        CAccount* account;
+        if (CStaticFunctionDefinitions::GetAccountByID(ID, account) && account)
+        {
+            lua_pushaccount(luaVM, account);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaAccountDefs::AddAccount(lua_State* luaVM)
 {
     //  account addAccount ( string name, string pass[, bool allowCaseVariations = false ] )

Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h

@@ -33,6 +33,8 @@ class CLuaAccountDefs : public CLuaDefs
     LUA_DECLARE(GetAccountsByData);
     LUA_DECLARE(GetAccountSerial);
     LUA_DECLARE(GetAccountsBySerial);
+    LUA_DECLARE(GetAccountID);		
+    LUA_DECLARE(GetAccountByID);
     LUA_DECLARE(GetAccountIP);
     LUA_DECLARE(GetAccountsByIP);