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

Merge branch '1.6.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2016-01-09 18:23:06 +00:00
parent 1f226d2ade 5d014193b4
commit e9006634cb
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/data/webadmin/tmpl/add_edit_network.tmpl
+1 -1
View File
@@ -136,7 +136,7 @@
<script type="text/javascript">floodprotection_change();</script>
<div style="clear:both;"></div>
<div class="subsection" title="Character encoding used between ZNC and IRC server. After changing this, reconnect ZNC to server.">
<div class="subsection" title="Character encoding used between ZNC and IRC server.">
<div class="inputlabel">Server encoding:</div>
<? INC encoding_settings.tmpl ?>
</div>
modules/data/webadmin/tmpl/add_edit_user.tmpl
+1 -1
View File
@@ -289,7 +289,7 @@
</datalist>
</div>
<div style="clear:both;"></div>
<div class="subsection" title="Character encoding used between IRC client and ZNC. After changing this, reconnect client to ZNC.">
<div class="subsection" title="Character encoding used between IRC client and ZNC.">
<div class="inputlabel">Client encoding:</div>
<? INC encoding_settings.tmpl ?>
</div>
src/IRCNetwork.cpp
+6 -1
View File
@@ -1454,7 +1454,12 @@ void CIRCNetwork::SetBindHost(const CString& s) {
}
}
void CIRCNetwork::SetEncoding(const CString& s) { m_sEncoding = s; }
void CIRCNetwork::SetEncoding(const CString& s) {
m_sEncoding = s;
if (GetIRCSock()) {
GetIRCSock()->SetEncoding(s);
}
}
void CIRCNetwork::SetQuitMsg(const CString& s) {
if (m_pUser->GetQuitMsg().Equals(s)) {
src/User.cpp
+6 -1
View File
@@ -1330,7 +1330,12 @@ void CUser::SetDenyLoadMod(bool b) { m_bDenyLoadMod = b; }
void CUser::SetAdmin(bool b) { m_bAdmin = b; }
void CUser::SetDenySetBindHost(bool b) { m_bDenySetBindHost = b; }
void CUser::SetDefaultChanModes(const CString& s) { m_sDefaultChanModes = s; }
void CUser::SetClientEncoding(const CString& s) { m_sClientEncoding = s; }
void CUser::SetClientEncoding(const CString& s) {
m_sClientEncoding = s;
for (CClient* pClient : GetAllClients()) {
pClient->SetEncoding(s);
}
}
void CUser::SetQuitMsg(const CString& s) { m_sQuitMsg = s; }
void CUser::SetAutoClearChanBuffer(bool b) {
for (CIRCNetwork* pNetwork : m_vIRCNetworks) {