Normalize methods with 'UserName' to 'Username'

This commit is contained in:
Pierre Gordon
2019-01-01 14:20:05 -05:00
parent 812b27c268
commit 6af027c5dd
27 changed files with 184 additions and 165 deletions
+4 -4
View File
@@ -101,7 +101,7 @@ class CBlockUser : public CModule {
return;
}
if (GetUser()->GetUserName().Equals(sUser)) {
if (GetUser()->GetUsername().Equals(sUser)) {
PutModule(t_s("You can't block yourself"));
return;
}
@@ -135,13 +135,13 @@ class CBlockUser : public CModule {
if (sAction == "display") {
Tmpl["Blocked"] = CString(IsBlocked(Tmpl["Username"]));
Tmpl["Self"] = CString(Tmpl["Username"].Equals(
WebSock.GetSession()->GetUser()->GetUserName()));
WebSock.GetSession()->GetUser()->GetUsername()));
return true;
}
if (sAction == "change" &&
WebSock.GetParam("embed_blockuser_presented").ToBool()) {
if (Tmpl["Username"].Equals(
WebSock.GetSession()->GetUser()->GetUserName()) &&
WebSock.GetSession()->GetUser()->GetUsername()) &&
WebSock.GetParam("embed_blockuser_block").ToBool()) {
WebSock.GetSession()->AddError(
t_s("You can't block yourself"));
@@ -203,7 +203,7 @@ class CBlockUser : public CModule {
(*it2)->SetIRCConnectEnabled(false);
}
SetNV(pUser->GetUserName(), "");
SetNV(pUser->GetUsername(), "");
return true;
}
};