adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-30 06:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Normalize variable "sUserName" to "sUsername"

Browse Source 
Fixes #1546
This commit is contained in:
Pierre Gordon
2019-01-01 12:28:03 -05:00
parent 481fdb5a2c
commit 812b27c268
5 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/User.h
+5 -5
View File
@@ -37,7 +37,7 @@ class CServer;
class CUser : private CCoreTranslationMixin {
public:
CUser(const CString& sUserName);
CUser(const CString& sUsername);
~CUser();
CUser(const CUser&) = delete;
@@ -68,8 +68,8 @@ class CUser : private CCoreTranslationMixin {
void ClearAllowedHosts();
bool IsHostAllowed(const CString& sHost) const;
bool IsValid(CString& sErrMsg, bool bSkipPass = false) const;
static bool IsValidUserName(const CString& sUserName);
static CString MakeCleanUserName(const CString& sUserName);
static bool IsValidUserName(const CString& sUsername);
static CString MakeCleanUserName(const CString& sUsername);
// Modules
CModules& GetModules() { return *m_pModules; }
@@ -220,8 +220,8 @@ class CUser : private CCoreTranslationMixin {
// !Getters
protected:
const CString m_sUserName;
const CString m_sCleanUserName;
const CString m_sUsername;
const CString m_sCleanUsername;
CString m_sNick;
CString m_sAltNick;
CString m_sIdent;
modules/controlpanel.cpp
+18 -18
View File
@@ -301,7 +301,7 @@ class CAdminMod : public CModule {
void Set(const CString& sLine) {
const CString sVar = sLine.Token(1).AsLower();
CString sUserName = sLine.Token(2);
CString sUsername = sLine.Token(2);
CString sValue = sLine.Token(3, true);
if (sValue.empty()) {
@@ -309,7 +309,7 @@ class CAdminMod : public CModule {
return;
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) return;
if (sVar == "nick") {
@@ -1207,7 +1207,7 @@ class CAdminMod : public CModule {
}
void ReconnectUser(const CString& sLine) {
CString sUserName = sLine.Token(1);
CString sUsername = sLine.Token(1);
CString sNetwork = sLine.Token(2);
if (sNetwork.empty()) {
@@ -1215,7 +1215,7 @@ class CAdminMod : public CModule {
return;
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) {
return;
}
@@ -1243,7 +1243,7 @@ class CAdminMod : public CModule {
}
void DisconnectUser(const CString& sLine) {
CString sUserName = sLine.Token(1);
CString sUsername = sLine.Token(1);
CString sNetwork = sLine.Token(2);
if (sNetwork.empty()) {
@@ -1251,7 +1251,7 @@ class CAdminMod : public CModule {
return;
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) {
return;
}
@@ -1267,12 +1267,12 @@ class CAdminMod : public CModule {
}
void ListCTCP(const CString& sLine) {
CString sUserName = sLine.Token(1, true);
CString sUsername = sLine.Token(1, true);
if (sUserName.empty()) {
sUserName = GetUser()->GetUserName();
if (sUsername.empty()) {
sUsername = GetUser()->GetUserName();
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) return;
const MCString& msCTCPReplies = pUser->GetCTCPReplies();
@@ -1295,14 +1295,14 @@ class CAdminMod : public CModule {
}
void AddCTCP(const CString& sLine) {
CString sUserName = sLine.Token(1);
CString sUsername = sLine.Token(1);
CString sCTCPRequest = sLine.Token(2);
CString sCTCPReply = sLine.Token(3, true);
if (sCTCPRequest.empty()) {
sCTCPRequest = sUserName;
sCTCPRequest = sUsername;
sCTCPReply = sLine.Token(2, true);
sUserName = GetUser()->GetUserName();
sUsername = GetUser()->GetUserName();
}
if (sCTCPRequest.empty()) {
PutModule(t_s("Usage: AddCTCP [user] [request] [reply]"));
@@ -1314,7 +1314,7 @@ class CAdminMod : public CModule {
return;
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) return;
pUser->AddCTCPReply(sCTCPRequest, sCTCPReply);
@@ -1329,14 +1329,14 @@ class CAdminMod : public CModule {
}
void DelCTCP(const CString& sLine) {
CString sUserName = sLine.Token(1);
CString sUsername = sLine.Token(1);
CString sCTCPRequest = sLine.Token(2, true);
if (sCTCPRequest.empty()) {
sCTCPRequest = sUserName;
sUserName = GetUser()->GetUserName();
sCTCPRequest = sUsername;
sUsername = GetUser()->GetUserName();
}
CUser* pUser = FindUser(sUserName);
CUser* pUser = FindUser(sUsername);
if (!pUser) return;
if (sCTCPRequest.empty()) {
modules/webadmin.cpp
+7 -7
View File
@@ -452,13 +452,13 @@ class CWebAdminMod : public CModule {
}
CString SafeGetUserNameParam(CWebSock& WebSock) {
CString sUserName = WebSock.GetParam("user"); // check for POST param
if (sUserName.empty() && !WebSock.IsPost()) {
CString sUsername = WebSock.GetParam("user"); // check for POST param
if (sUsername.empty() && !WebSock.IsPost()) {
// if no POST param named user has been given and we are not
// saving this form, fall back to using the GET parameter.
sUserName = WebSock.GetParam("user", false);
sUsername = WebSock.GetParam("user", false);
}
return sUserName;
return sUsername;
}
CString SafeGetNetworkParam(CWebSock& WebSock) {
@@ -650,11 +650,11 @@ class CWebAdminMod : public CModule {
WebSock.PrintErrorPage(t_s("No such user"));
return true;
} else if (sPageName == "edituser") {
CString sUserName = SafeGetUserNameParam(WebSock);
CUser* pUser = CZNC::Get().FindUser(sUserName);
CString sUsername = SafeGetUserNameParam(WebSock);
CUser* pUser = CZNC::Get().FindUser(sUsername);
if (!pUser) {
if (sUserName.empty()) {
if (sUsername.empty()) {
pUser = spSession->GetUser();
} // else: the "no such user" message will be printed.
}
src/User.cpp
+16 -16
View File
@@ -59,12 +59,12 @@ class CUserTimer : public CCron {
CUser* m_pUser;
};
CUser::CUser(const CString& sUserName)
: m_sUserName(sUserName),
m_sCleanUserName(MakeCleanUserName(sUserName)),
m_sNick(m_sCleanUserName),
CUser::CUser(const CString& sUsername)
: m_sUsername(sUsername),
m_sCleanUsername(MakeCleanUserName(sUsername)),
m_sNick(m_sCleanUsername),
m_sAltNick(""),
m_sIdent(m_sCleanUserName),
m_sIdent(m_sCleanUsername),
m_sRealName(""),
m_sBindHost(""),
m_sDCCBindHost(""),
@@ -78,7 +78,7 @@ CUser::CUser(const CString& sUserName)
m_sTimestampFormat("[%H:%M:%S]"),
m_sTimezone(""),
m_eHashType(HASH_NONE),
m_sUserPath(CZNC::Get().GetUserPath() + "/" + sUserName),
m_sUserPath(CZNC::Get().GetUserPath() + "/" + sUsername),
m_bMultiClients(true),
m_bDenyLoadMod(false),
m_bAdmin(false),
@@ -877,11 +877,11 @@ const CString& CUser::GetTimestampFormat() const { return m_sTimestampFormat; }
bool CUser::GetTimestampAppend() const { return m_bAppendTimestamp; }
bool CUser::GetTimestampPrepend() const { return m_bPrependTimestamp; }
bool CUser::IsValidUserName(const CString& sUserName) {
bool CUser::IsValidUserName(const CString& sUsername) {
// /^[a-zA-Z][a-zA-Z@._\-]*$/
const char* p = sUserName.c_str();
const char* p = sUsername.c_str();
if (sUserName.empty()) {
if (sUsername.empty()) {
return false;
}
@@ -908,12 +908,12 @@ bool CUser::IsValid(CString& sErrMsg, bool bSkipPass) const {
return false;
}
if (m_sUserName.empty()) {
if (m_sUsername.empty()) {
sErrMsg = t_s("Username is empty");
return false;
}
if (!CUser::IsValidUserName(m_sUserName)) {
if (!CUser::IsValidUserName(m_sUsername)) {
sErrMsg = t_s("Username is invalid");
return false;
}
@@ -1034,7 +1034,7 @@ bool CUser::CheckPass(const CString& sPass) const {
/*CClient* CUser::GetClient() {
// Todo: optimize this by saving a pointer to the sock
CSockManager& Manager = CZNC::Get().GetManager();
CString sSockName = "USR::" + m_sUserName;
CString sSockName = "USR::" + m_sUsername;
for (unsigned int a = 0; a < Manager.size(); a++) {
Csock* pSock = Manager[a];
@@ -1160,8 +1160,8 @@ bool CUser::PutModNotice(const CString& sModule, const CString& sLine,
return (pClient == nullptr);
}
CString CUser::MakeCleanUserName(const CString& sUserName) {
return sUserName.Token(0, false, "@").Replace_n(".", "");
CString CUser::MakeCleanUserName(const CString& sUsername) {
return sUsername.Token(0, false, "@").Replace_n(".", "");
}
bool CUser::IsUserAttached() const {
@@ -1356,8 +1356,8 @@ vector<CClient*> CUser::GetAllClients() const {
return vClients;
}
const CString& CUser::GetUserName() const { return m_sUserName; }
const CString& CUser::GetCleanUserName() const { return m_sCleanUserName; }
const CString& CUser::GetUserName() const { return m_sUsername; }
const CString& CUser::GetCleanUserName() const { return m_sCleanUsername; }
const CString& CUser::GetNick(bool bAllowDefault) const {
return (bAllowDefault && m_sNick.empty()) ? GetCleanUserName() : m_sNick;
}
src/znc.cpp
+5 -5
View File
@@ -1246,12 +1246,12 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
config.FindSubConfig("user", subConf);
for (const auto& subIt : subConf) {
const CString& sUserName = subIt.first;
const CString& sUsername = subIt.first;
CConfig* pSubConf = subIt.second.m_pSubConfig;
CUtils::PrintMessage("Loading user [" + sUserName + "]");
CUtils::PrintMessage("Loading user [" + sUsername + "]");
std::unique_ptr<CUser> pUser(new CUser(sUserName));
std::unique_ptr<CUser> pUser(new CUser(sUsername));
if (!m_sStatusPrefix.empty()) {
if (!pUser->SetStatusPrefix(m_sStatusPrefix)) {
@@ -1268,7 +1268,7 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
}
if (!pSubConf->empty()) {
sError = "Unhandled lines in config for User [" + sUserName + "]!";
sError = "Unhandled lines in config for User [" + sUsername + "]!";
CUtils::PrintError(sError);
DumpConfig(pSubConf);
return false;
@@ -1277,7 +1277,7 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
CString sErr;
CUser* pRawUser = pUser.release();
if (!AddUser(pRawUser, sErr, true)) {
sError = "Invalid user [" + sUserName + "] " + sErr;
sError = "Invalid user [" + sUsername + "] " + sErr;
CUtils::PrintError(sError);
pRawUser->SetBeingDeleted(true);
delete pRawUser;