2 files changed, 51 insertions, 1 deletions

diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 19093b1..8f909f9 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -1,19 +1,23 @@
 #include <stdlib.h>
 #include <qdir.h>
 
+#include <qtextcodec.h>
+#include <qtextstream.h>
+#include <qfile.h>
+
 //#include <opie2/odebug.h>
 #include <kconfig.h>
 
 #include <kstandarddirs.h>
 #include "settings.h"
 //#include "defines.h"
 
 #define IMAP_PORT           "143"
 #define IMAP_SSL_PORT       "993"
 #define SMTP_PORT           "25"
 #define SMTP_SSL_PORT       "465"
 #define POP3_PORT           "110"
 #define POP3_SSL_PORT       "995"
 #define NNTP_PORT           "119"
 #define NNTP_SSL_PORT       "563"
 
@@ -353,76 +357,116 @@ SMTPaccount::SMTPaccount()
     type = MAILLIB::A_SMTP;
     port = SMTP_PORT;
 }
 
 SMTPaccount::SMTPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New SMTP Account";
     ssl = false;
     connectionType = 1;
     login = false;
     type = MAILLIB::A_SMTP;
     port = SMTP_PORT;
 }
 
+QString SMTPaccount::getSignature()
+{
+    QFileInfo fi ( signature );
+    if ( ! fi.exists() )
+        return QString();
+
+    QFile file( signature );
+    if (!file.open( IO_ReadOnly ) ) {
+        return QString();
+        
+    } 
+    QTextStream ts( &file );
+    ts.setCodec( QTextCodec::codecForName("utf8") );
+    QString text = ts.read();
+    file.close();
+    
+    return text;
+
+}
+void SMTPaccount::setSignature( QString b )
+{
+
+    QFileInfo fi ( signature );
+    if ( ! fi.exists() ) {
+        QString filedir( locateLocal("data", "kopiemail" ) );
+         signature = filedir+ "/" + getAccountName() +".sig";
+         qDebug("new sig %s ", signature.latin1());
+         save();
+    }
+    QFile fileIn( signature );
+    if (!fileIn.open( IO_WriteOnly ) ) {
+        qDebug("OM: Cannot write signature file %s ", signature.latin1() );
+        return ;
+    } 
+    QTextStream tsIn( &fileIn );
+    tsIn.setCodec( QTextCodec::codecForName("utf8") );
+    tsIn << b ;
+    fileIn.close();  
+}
 QString SMTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
 
     QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "smtp-" + unique ) > 0 );
 
     return unique;
 }
 
 void SMTPaccount::read()
 {
     KConfig *conf = new KConfig( getFileName() );
     conf->setGroup( "SMTP Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     connectionType = conf->readNumEntry( "ConnectionType" );
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
-    //password = conf->readEntryCrypt( "Password" );
+    signature = conf->readEntry( "SigFile" );
     setPasswordList( conf->readListEntry( "FolderHistory"));
     delete conf;
 }
 
 void SMTPaccount::save()
 {
     Settings::checkDirectory();
 
     KConfig *conf = new KConfig( getFileName() );
     conf->setGroup( "SMTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
+    conf->writeEntry( "SigFile", signature );
     //conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "FolderHistory",getPasswordList() );
     conf->sync();
     delete conf;
 }
 
 
 QString SMTPaccount::getFileName()
 {
     return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
 }
 
 NNTPaccount::NNTPaccount()
     : Account()
 {
     file = NNTPaccount::getUniqueFileName();
diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h
index c996fe0..a6e95fe 100644
--- a/kmicromail/libmailwrapper/settings.h
+++ b/kmicromail/libmailwrapper/settings.h
@@ -114,32 +114,38 @@ private:
 class SMTPaccount : public Account
 {
 
 public:
     SMTPaccount();
     SMTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
     void setLogin( bool b ) { login = b; }
     bool getLogin() { return login; }
 
+    void setSigFile( QString b ) { signature = b; }
+    QString getSigFile() { return signature; }
+    
+    QString getSignature();
+    void setSignature( QString b );
+
 private:
     QString file, name, mail, org, cc, bcc, reply, signature;
     bool useCC, useBCC, useReply, login;
 
 };
 
 class NNTPaccount : public Account
 {
 
 public:
     NNTPaccount();
     NNTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();