aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2009-11-29 08:27:25 +0000
committerGravatar Szymon Tomasz Stefanek2009-11-29 08:27:25 +0000
commitea8ae6ee9a5aac6fcca4b9a92ee0caa6f682d1dc (patch)
tree7c2a5d6bb503ceac68c7c770389b8bed71b1dc65
parent[KVIrc] (trunk) Change Crypto++ paths in libkvirijndael_cryptopp.{h,cpp} (diff)
downloadKVIrc-ea8ae6ee9a5aac6fcca4b9a92ee0caa6f682d1dc.tar.gz
KVIrc-ea8ae6ee9a5aac6fcca4b9a92ee0caa6f682d1dc.tar.bz2
KVIrc-ea8ae6ee9a5aac6fcca4b9a92ee0caa6f682d1dc.zip
Client side list filtering by sg2002
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3637 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/modules/list/listwindow.cpp32
2 files changed, 26 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09b40dc7b..4fa4cc553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -889,7 +889,7 @@ ENDIF()
# saner way to build KVIrc if -DWITH_NO_EMBEDDED_CODE=YES is passed to
# CMake.
############################################################################
-OPTION(WANT_NO_EMBEDDED_CODE "Don't use embedded copies of code available from libraries (potential security issue)" OFF)
+OPTION(WANT_NO_EMBEDDED_CODE "Don't use embedded copies of code available from libraries" OFF)
IF(WITH_NO_EMBEDDED_CODE)
SET(WANT_NO_EMBEDDED_CODE ON)
ENDIF()
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 7f996201c..0b6a607e7 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -247,7 +247,8 @@ void KviListWindow::requestList()
KviStr parms = m_pParamsEdit->text();
if(parms.isEmpty())
m_pConsole->connection()->sendFmtData("list");
- else m_pConsole->connection()->sendFmtData("list %s",m_pConsole->connection()->encodeText(parms.ptr()).data());
+ else
+ m_pConsole->connection()->sendFmtData("list %s",m_pConsole->connection()->encodeText(parms.ptr()).data());
outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent list request, waiting for reply..."));
m_pRequestButton->setEnabled(false);
@@ -435,12 +436,29 @@ void KviListWindow::processData(KviIrcMessage * pMsg)
m_pRequestButton->setEnabled(false);
}
- m_pItemList->append(
- new KviChannelTreeWidgetItemData(
- pMsg->connection()->decodeText(pMsg->safeParam(1)),
- pMsg->connection()->decodeText(pMsg->safeParam(2)),
- pMsg->connection()->decodeText(pMsg->safeTrailing()))
- );
+ if(m_pParamsEdit->text().isEmpty())
+ {
+ m_pItemList->append(
+ new KviChannelTreeWidgetItemData(
+ pMsg->connection()->decodeText(pMsg->safeParam(1)),
+ pMsg->connection()->decodeText(pMsg->safeParam(2)),
+ pMsg->connection()->decodeText(pMsg->safeTrailing()))
+ );
+ } else {
+ if(
+ pMsg->connection()->decodeText(pMsg->safeParam(1)).contains(m_pParamsEdit->text()) ||
+ pMsg->connection()->decodeText(pMsg->safeTrailing()).contains(m_pParamsEdit->text())
+ )
+ {
+ m_pItemList->append(
+ new KviChannelTreeWidgetItemData(
+ pMsg->connection()->decodeText(pMsg->safeParam(1)),
+ pMsg->connection()->decodeText(pMsg->safeParam(2)),
+ pMsg->connection()->decodeText(pMsg->safeTrailing())
+ )
+ );
+ }
+ }
if(_OUTPUT_VERBOSE)
{