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.6.x'

Browse Source 
Conflicts:
	src/Client.cpp
	znc-buildmod.in
This commit is contained in:
J-P Nurmi
2015-07-31 23:53:30 +02:00
parent 2098dc1f2c 5c2e040cb8
commit 015a8f6502
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/znc/version.h
View File

@@ -11,6 +11,9 @@
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)
// You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
#ifndef VERSION_EXTRA
# define VERSION_EXTRA ""
#endif
extern const char* ZNC_VERSION_EXTRA;
#endif // !ZNC_VERSION_H

2
make-tarball.sh
View File

@@ -54,7 +54,7 @@ sed -e 's:#include "defines.h":#include <znc/defines.h>:' third_party/Csocket/Cs
rm make-tarball.sh
sed -e "s/THIS_IS_NOT_TARBALL//" -i Makefile.in
echo '#include <znc/version.h>' > src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = \"$DESC\";" >> src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$DESC\";" >> src/version.cpp
)
(
cd $TMPDIR

2
modules/modules_online.cpp
View File

@@ -72,7 +72,7 @@ public:
if (IsOnlineModNick(sNick)) {
CIRCNetwork* pNetwork = GetNetwork();
PutUser(":znc.in 311 " + pNetwork->GetCurNick() + " " + sNick + " " + sNick + " znc.in * :" + sNick);
PutUser(":znc.in 311 " + pNetwork->GetCurNick() + " " + sNick + " znc znc.in * :" + sNick);
PutUser(":znc.in 312 " + pNetwork->GetCurNick() + " " + sNick + " *.znc.in :Bouncer");
PutUser(":znc.in 318 " + pNetwork->GetCurNick() + " " + sNick + " :End of /WHOIS list.");

2
src/Chan.cpp
View File

@@ -141,7 +141,7 @@ void CChan::Cycle() const {
}
void CChan::JoinUser(const CString& sKey) {
if (!sKey.empty()) {
if (!IsOn() && !sKey.empty()) {
SetKey(sKey);
}
m_pNetwork->PutIRC("JOIN " + GetName() + " " + GetKey());

18
src/Client.cpp
View File

@@ -431,13 +431,19 @@ void CClient::ReadLine(const CString& sData) {
return;
} else if (sCommand.Equals("JOIN")) {
CString sChans = sLine.Token(1).TrimPrefix_n();
CString sKey = sLine.Token(2);
CString sKeys = sLine.Token(2);
VCString vsChans;
sChans.Split(",", vsChans, false);
sChans.clear();
for (CString& sChannel : vsChans) {
VCString vsKeys;
sKeys.Split(",", vsKeys, true);
sKeys.clear();
for (unsigned int a = 0; a < vsChans.size(); a++) {
CString sChannel = vsChans[a];
CString sKey = (a < vsKeys.size()) ? vsKeys[a] : "";
bool bContinue = false;
NETWORKMODULECALL(OnUserJoin(sChannel, sKey), m_pUser, m_pNetwork, this, &bContinue);
if (bContinue) continue;
@@ -453,6 +459,10 @@ void CClient::ReadLine(const CString& sData) {
if (!sChannel.empty()) {
sChans += (sChans.empty()) ? sChannel : CString("," + sChannel);
if (!vsKeys.empty()) {
sKeys += (sKeys.empty()) ? sKey : CString("," + sKey);
}
}
}
@@ -462,8 +472,8 @@ void CClient::ReadLine(const CString& sData) {
sLine = "JOIN " + sChans;
if (!sKey.empty()) {
sLine += " " + sKey;
if (!sKeys.empty()) {
sLine += " " + sKeys;
}
} else if (sCommand.Equals("PART")) {
CString sChans = sLine.Token(1).TrimPrefix_n();

2
version.sh
View File

@@ -53,7 +53,7 @@ fi
if [ "x$WRITE_OUTPUT" = "xyes" ]
then
echo '#include <znc/version.h>' > src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = \"$EXTRA\";" >> src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$EXTRA\";" >> src/version.cpp
fi
echo "$EXTRA"

2
znc-buildmod.in
View File

@@ -40,7 +40,7 @@ LIBZNC_VERSION="@LIBZNC_VERSION@"
if test "x" = "x$LIBZNC"; then
LIBZNCFLAGS=""
else
LIBZNCFLAGS="-L\"$LIBZNCDIR\" -lznc-$LIBZNC_VERSION"
LIBZNCFLAGS="-L$LIBZNCDIR -lznc-$LIBZNC_VERSION"
fi
LDFLAGS="$LIBZNCFLAGS $LDFLAGS"