iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.10.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2025-06-24 18:16:41 +01:00
parent 6a2c158540 af975b2016
commit d48e215761
11 changed files with 293 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
modules/data/webadmin/tmpl/settings.tmpl
View File

@@ -21,10 +21,9 @@
<th><? FORMAT "Delete" ?></th>
</tr>
</thead>
<? LOOP ListenLoop ?>
<? LOOP ListenLoop ?>
<? IF Type == "TCP" ?>
<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
<? IF Type == "TCP" ?>
<td><? VAR Port ?></td>
<td><? VAR BindHost DEFAULT=** ?></td>
<td>
@@ -33,9 +32,6 @@
<td>
<div class="checkbox"><input type="checkbox" disabled="disabled" <? IF IsIPV6 ?>checked="checked"<? ENDIF ?>/></div>
</td>
<? ELSE ?>
<td colspan="4">unix:<? VAR Path ?></td>
<? ENDIF ?>
<td class="listener_show_ssl">
<div class="checkbox"><input type="checkbox" disabled="disabled" <? IF IsSSL ?>checked="checked"<? ENDIF ?>/></div>
</td>
@@ -51,14 +47,10 @@
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>del_listener" method="post">
<? INC _csrf_check.tmpl ?>
<input name="type" type="hidden" value="<? VAR Type ?>"/>
<? IF Type == "TCP" ?>
<input name="host" type="hidden" value="<? VAR BindHost ?>"/>
<input name="port" type="hidden" value="<? VAR Port ?>"/>
<input name="ipv4" type="hidden" value="<? VAR IsIPV4 ?>"/>
<input name="ipv6" type="hidden" value="<? VAR IsIPV6 ?>"/>
<? ELSE ?>
<input name="path" type="hidden" value="<? VAR Path ?>"/>
<? ENDIF ?>
<input type="submit" value="<? FORMAT "Del" ?>"/>
</form>
<? ELSE ?>
@@ -66,7 +58,8 @@
<? ENDIF ?>
</td>
</tr>
<? ENDLOOP ?>
<? ENDIF ?>
<? ENDLOOP ?>
<tr>
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>add_listener" method="post">
<? INC _csrf_check.tmpl ?>
@@ -82,11 +75,58 @@
<td><input type="submit" value="<? FORMAT "Add" ?>"/></td>
</form>
</tr>
</table>
</div>
<div class="subsection">
<table>
<thead>
<tr>
<th><? FORMAT "Path" ?></th>
<th><? FORMAT "Mode" ?></th>
<th><? FORMAT "Group" ?></th>
<th><? FORMAT "SSL" ?></th>
<th><? FORMAT "IRC" ?></th>
<th><? FORMAT "HTTP" ?></th>
<th><? FORMAT "URIPrefix" ?></th>
<th><? FORMAT "Delete" ?></th>
</tr>
</thead>
<? LOOP ListenLoop ?>
<? IF Type == "Unix" ?>
<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
<td>unix:<? VAR Path ?></td>
<td><? VAR Mode ?></td>
<td><? VAR Group ?></td>
<td class="listener_show_ssl">
<div class="checkbox"><input type="checkbox" disabled="disabled" <? IF IsSSL ?>checked="checked"<? ENDIF ?>/></div>
</td>
<td>
<div class="checkbox"><input type="checkbox" disabled="disabled" <? IF IsIRC ?>checked="checked"<? ENDIF ?>/></div>
</td>
<td>
<div class="checkbox"><input type="checkbox" disabled="disabled" <? IF IsHTTP ?>checked="checked"<? ENDIF ?>/></div>
</td>
<td><? VAR URIPrefix ?></td>
<td>
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>del_listener" method="post">
<? INC _csrf_check.tmpl ?>
<input name="type" type="hidden" value="<? VAR Type ?>"/>
<input name="path" type="hidden" value="<? VAR Path ?>"/>
<input type="submit" value="<? FORMAT "Del" ?>"/>
</form>
</td>
</tr>
<? ENDIF ?>
<? ENDLOOP ?>
<tr>
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>add_listener" method="post">
<? INC _csrf_check.tmpl ?>
<input name="type" type="hidden" value="Unix"/>
<td colspan="4">unix:<input name="path" type="text" value="/" class="third"/></td>
<td>unix:<input name="path" type="text" value="/" class="third"/></td>
<td><input name="mode" type="number" min="-1" max="777" class="number third" value="-1" title="<? FORMAT "Octal number; -1 means do not chmod" ?>"/></td>
<td><input name="group" type="text" value="" class="sixth"/></td>
<td><div class="checkbox"><input name="ssl" type="checkbox"/></div></td>
<td><div class="checkbox"><input name="irc" type="checkbox" checked="checked"/></div></td>
<td><div class="checkbox"><input name="web" type="checkbox" checked="checked"/></div></td>

14
modules/po/log.tr_TR.po
View File

@@ -84,11 +84,11 @@ msgstr ""
msgid "Will log joins"
msgstr "Kanala girişler (joins) günlüğe kaydedilecek"
#: log.cpp:196
#: log.cpp:197
msgid "Will not log joins"
msgstr "Kanala girişler (joins) günlüğe kaydedilmeyecek"
#: log.cpp:197
#: log.cpp:198
msgid "Will log quits"
msgstr "IRC çıkışları (quits) günlüğe kaydedilecek"
@@ -114,23 +114,23 @@ msgstr ""
msgid "Logging joins"
msgstr "Kanala girişler (joins) günlüğe kaydediliyor"
#: log.cpp:211
#: log.cpp:212
msgid "Not logging joins"
msgstr "Kanala girişler (joins) günlüğe kaydedilmiyor"
#: log.cpp:212
#: log.cpp:213
msgid "Logging quits"
msgstr "IRC çıkışları (quits) günlüğe kaydediliyor"
#: log.cpp:212
#: log.cpp:213
msgid "Not logging quits"
msgstr "IRC çıkışları (quits) günlüğe kaydedilmiyor"
#: log.cpp:213
#: log.cpp:214
msgid "Logging nick changes"
msgstr "Rumuz değişiklikleri (nickchanges) günlüğe kaydediliyor"
#: log.cpp:214
#: log.cpp:215
msgid "Not logging nick changes"
msgstr "Rumuz değişiklikleri (nickchanges) günlüğe kaydedilmiyor"

6
modules/webadmin.cpp
View File

@@ -1910,8 +1910,10 @@ class CWebAdminMod : public CModule {
eAddr, eAccept, sMessage);
} else {
CString sPath = WebSock.GetParam("path");
CString sMode = WebSock.GetParam("mode");
CString sGroup = WebSock.GetParam("group");
bResult = CZNC::Get().AddUnixListener(sPath, sURIPrefix, bSSL,
eAccept, sMessage);
eAccept, sGroup, sMode, sMessage);
}
if (bResult) {
@@ -2030,6 +2032,8 @@ class CWebAdminMod : public CModule {
dynamic_cast<const CUnixListener*>(pListener)) {
l["Type"] = "Unix";
l["Path"] = pUnixListener->GetPath();
l["Mode"] = pUnixListener->GetMode();
l["Group"] = pUnixListener->GetGroup();
// We can't determine whether it's the same port, as it's
// always "localhost". Just assume the user knows what he's
// doing. Unix sockets are advanced topic anyway.