iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 21:12:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Normalize methods with 'UserName' to 'Username'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WebModules.cpp
View File

@@ -177,7 +177,7 @@ void CWebAuth::AcceptedLogin(CUser& User) {
m_pWebSock->Redirect("/?cookie_check=true");
}
DEBUG("Successful login attempt ==> USER [" + User.GetUserName() +
DEBUG("Successful login attempt ==> USER [" + User.GetUsername() +
"] ==> SESSION [" + spSession->GetId() + "]");
}
}
@@ -446,7 +446,7 @@ bool CWebSock::AddModLoop(const CString& sLoopName, CModule& Module,
}
if (Module.GetUser()) {
Row["Username"] = Module.GetUser()->GetUserName();
Row["Username"] = Module.GetUser()->GetUsername();
}
VWebSubPages& vSubPages = Module.GetSubPages();
@@ -672,7 +672,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI,
SendCookie("SessionId", GetSession()->GetId());
if (GetSession()->IsLoggedIn()) {
m_sUser = GetSession()->GetUser()->GetUserName();
m_sUser = GetSession()->GetUser()->GetUsername();
m_bLoggedIn = true;
}
CLanguageScope user_language(
@@ -832,7 +832,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI,
pModule->GetUser() != GetSession()->GetUser()) {
PrintErrorPage(403, "Forbidden",
"You must login as " +
pModule->GetUser()->GetUserName() +
pModule->GetUser()->GetUsername() +
" in order to view this page");
return PAGE_DONE;
} else if (pModule->OnWebPreRequest(*this, m_sPage)) {
@@ -944,7 +944,7 @@ std::shared_ptr<CWebSession> CWebSock::GetSession() {
DEBUG("Found existing session from cookie: [" + sCookieSessionId +
"] IsLoggedIn(" +
CString((*pSession)->IsLoggedIn()
? "true, " + ((*pSession)->GetUser()->GetUserName())
? "true, " + ((*pSession)->GetUser()->GetUsername())
: "false") +
")");
return *pSession;