fixes for logging and regusers

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@282 17fca916-40b9-46aa-a4ea-0a15b648b75c

11 files changed, 7 insertions, 32 deletions

diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 14767dad4..748311583 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -244,20 +244,13 @@ void KviChannel::textViewRightClicked()
 	KVS_TRIGGER_EVENT_0(KviEvent_OnChannelPopupRequest,this);
 }
 
-void KviChannel::getBaseLogFileName(KviStr &buffer)
-{
-	if (console()->connection())
-		buffer.sprintf("%s.%s",windowName().utf8().data(),console()->currentNetworkName().utf8().data());
-	else
-		buffer.sprintf("%s.%u",windowName().utf8().data(),console()->ircContextId());
-}
 void KviChannel::getBaseLogFileName(QString &buffer)
 {
 	QString szChan=windowName();
 	szChan.replace(".","%2e");
 	if (console()->connection())
 	{
-		buffer=windowName();
+		buffer=szChan;
 		buffer+=".";
 		buffer+=console()->currentNetworkName();
 	} else {
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index cec29ee84..763fc2f20 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -156,7 +156,6 @@ protected:
 	virtual void saveProperties(KviConfig * cfg);
 	virtual void loadProperties(KviConfig * cfg);
 	virtual void applyOptions();
-	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual void triggerCreationEvents();
 	void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPtrList<KviMaskEntry> *l,char flag,const char *edName);
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index ed8563670..7546ecf35 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -430,10 +430,6 @@ void KviConsole::saveProperties(KviConfig *cfg)
 
 }
 
-void KviConsole::getBaseLogFileName(KviStr &buffer)
-{
-	buffer.sprintf("CONSOLE%u",ircContextId());
-}
 void KviConsole::getBaseLogFileName(QString &buffer)
 {
 	buffer=QString("CONSOLE%1").arg(ircContextId());
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 804d0c24e..2326f8e7c 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -97,7 +97,6 @@ protected:
 	virtual void fillCaptionBuffers();
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void closeEvent(QCloseEvent *e);
-	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual void getTaskBarTipText(QString &buffer);
 	virtual void fillContextPopup(KviTalPopupMenu * p);
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index fc701c873..9326397b8 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -68,10 +68,6 @@ KviDebugWindow * KviDebugWindow::getInstance()
 }
 
 
-void KviDebugWindow::getBaseLogFileName(KviStr &buffer)
-{
-	buffer = "debug";
-}
 
 void KviDebugWindow::getBaseLogFileName(QString &buffer)
 {
diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h
index d47f28426..ca630e8e3 100644
--- a/src/kvirc/ui/kvi_debugwindow.h
+++ b/src/kvirc/ui/kvi_debugwindow.h
@@ -47,7 +47,6 @@ protected:
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void loadProperties(KviConfig * cfg);
 	virtual void saveProperties(KviConfig * cfg);
-	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual QSize sizeHint() const;
 };
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 8b49addd1..44e40098b 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -266,14 +266,6 @@ void KviQuery::triggerCreationEvents()
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this);
 }
 
-void KviQuery::getBaseLogFileName(KviStr &buffer)
-{
-	if(console()->connection())
-		buffer.sprintf("%s.%s",windowName().utf8().data(),console()->currentNetworkName().utf8().data());
-	else
-		buffer.sprintf("%s.%u",windowName().utf8().data(),console()->ircContextId());
-}
-
 void KviQuery::getBaseLogFileName(QString &buffer)
 {
 	if(console()->connection())
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index d167ac710..96f141991 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -59,7 +59,6 @@ protected:
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void loadProperties(KviConfig * cfg);
 	virtual void saveProperties(KviConfig * cfg);
-	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual void triggerCreationEvents();
 public:
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 28561c6b9..8e4ebd117 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -585,6 +585,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer)
 	QString base;
 	getBaseLogFileName(base);
 	kvi_encodeFileName(base);
+	base.replace("%%2e","%2e");
 	base=base.lower();
 	QString tmp;
 	if(KVI_OPTION_BOOL(KviOption_boolGzipLogs))
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 5faa80f79..89c785a3d 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -398,7 +398,8 @@ KviLogFile::KviLogFile(const QString& name)
 	else
 		m_type = Other;
 
-	KviStr undecoded = m_szFilename.section('.',0,0).section('_',1,1);
+	KviStr undecoded = m_szFilename.section('.',0,0);
+	undecoded.cutToFirst('_');
 	m_szName = undecoded.hexDecode(undecoded.ptr()).ptr();
 
 	undecoded = m_szFilename.section('.',1,1).section('_',0,0);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index c923bdb36..3bc6d2532 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -495,11 +495,11 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 			m_pMaskListBox->insertItem(mk);
 		}
 
-		const char * notp = r->getProperty("notify");
-		if(notp)
+		QString szNotifyNicks = r->getProperty("notify");
+		if(!szNotifyNicks.isEmpty())
 		{
 			m_pNotifyCheck->setChecked(true);
-			m_pNotifyNick->setText(notp);
+			m_pNotifyNick->setText(szNotifyNicks);
 			m_pNotifyNick->setEnabled(true);
 		}