diff --git a/include/znc/znc.h b/include/znc/znc.h
index 93ebabf9..b663fc3f 100644
--- a/include/znc/znc.h
+++ b/include/znc/znc.h
@@ -55,7 +55,7 @@ public:
bool RehashConfig(CString& sError);
void BackupConfigOnce(const CString& sSuffix);
static CString GetVersion();
- static CString GetTag(bool bIncludeVersion = true);
+ static CString GetTag(bool bIncludeVersion = true, bool bHTML = false);
static CString GetCompileOptionsString();
CString GetUptime() const;
void ClearBindHosts();
diff --git a/src/HTTPSock.cpp b/src/HTTPSock.cpp
index 0d710283..0c4b2d30 100644
--- a/src/HTTPSock.cpp
+++ b/src/HTTPSock.cpp
@@ -432,12 +432,22 @@ bool CHTTPSock::PrintErrorPage(unsigned int uStatusId, const CString& sStatusMsg
}
CString sPage =
- "\r\n"
- "\r\n" + CString(uStatusId) + " " + sStatusMsg.Escape_n(CString::EHTML) + "\r\n"
- "\r\n" + sStatusMsg.Escape_n(CString::EHTML) + "
\r\n"
- "" + sMessage.Escape_n(CString::EHTML) + "
\r\n"
- "
\r\n" + CZNC::GetTag(false).Escape_n(CString::EHTML) + " at " + GetLocalIP().Escape_n(CString::EHTML) + " Port " + CString(GetLocalPort()) + "\r\n"
- "\r\n";
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "" + CString(uStatusId) + " " + sStatusMsg.Escape_n(CString::EHTML) + "\r\n"
+ "\r\n"
+ "\r\n"
+ "" + sStatusMsg.Escape_n(CString::EHTML) + "
\r\n"
+ "" + sMessage.Escape_n(CString::EHTML) + "
\r\n"
+ "
\r\n"
+ "" +
+ CZNC::GetTag(false, /* bHTML = */ true) +
+ " at " + GetLocalIP().Escape_n(CString::EHTML) + " Port " + CString(GetLocalPort()) +
+ "\r\n"
+ "\r\n"
+ "\r\n";
PrintHeader(sPage.length(), "text/html", uStatusId, sStatusMsg);
Write(sPage);
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index 6a7685a9..6092078c 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -304,7 +304,7 @@ void CWebSock::SetPaths(CModule* pModule, bool bIsTemplate) {
void CWebSock::SetVars() {
m_Template["SessionUser"] = GetUser();
m_Template["SessionIP"] = GetRemoteIP();
- m_Template["Tag"] = CZNC::GetTag(GetSession()->GetUser() != NULL);
+ m_Template["Tag"] = CZNC::GetTag(GetSession()->GetUser() != NULL, true);
m_Template["SkinName"] = GetSkinName();
m_Template["_CSRF_Check"] = GetCSRFCheck();
diff --git a/src/znc.cpp b/src/znc.cpp
index 6fca4063..17d3e284 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -79,17 +79,19 @@ CString CZNC::GetVersion() {
return szBuf;
}
-CString CZNC::GetTag(bool bIncludeVersion) {
+CString CZNC::GetTag(bool bIncludeVersion, bool bHTML) {
+ CString sAddress = bHTML ? "http://znc.in" : "http://znc.in";
+
if (!bIncludeVersion) {
- return "ZNC - http://znc.in";
+ return "ZNC - " + sAddress;
}
char szBuf[128];
- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION);
+ snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - ", VERSION);
// If snprintf overflows (which I doubt), we want to be on the safe side
szBuf[sizeof(szBuf) - 1] = '\0';
- return szBuf;
+ return szBuf + sAddress;
}
CString CZNC::GetCompileOptionsString() {
diff --git a/webskins/_default_/tmpl/LowerBanner.tmpl b/webskins/_default_/tmpl/LowerBanner.tmpl
index 98733cd1..e9eaf657 100644
--- a/webskins/_default_/tmpl/LowerBanner.tmpl
+++ b/webskins/_default_/tmpl/LowerBanner.tmpl
@@ -1 +1 @@
-
+
diff --git a/webskins/dark-clouds/tmpl/Banner.tmpl b/webskins/dark-clouds/tmpl/Banner.tmpl
index 61111da8..4d0462af 100644
--- a/webskins/dark-clouds/tmpl/Banner.tmpl
+++ b/webskins/dark-clouds/tmpl/Banner.tmpl
@@ -1 +1 @@
-
+
diff --git a/webskins/forest/tmpl/Banner.tmpl b/webskins/forest/tmpl/Banner.tmpl
index 61111da8..4d0462af 100644
--- a/webskins/forest/tmpl/Banner.tmpl
+++ b/webskins/forest/tmpl/Banner.tmpl
@@ -1 +1 @@
-
+