option to disable prescense subscription

metacontacts fix

7 files changed, 189 insertions, 121 deletions

diff --git a/globals.h b/globals.h
index f531cf1..3aeb8ad 100755
--- a/globals.h
+++ b/globals.h
@@ -16,7 +16,7 @@
 

 #ifndef GLOBALS_H

 #define GLOBALS_H

-extern bool bAppendTags, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;

+extern bool bAppendTags, bPrescenseSubscription, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;

 extern TCHAR *inopentag, *inclosetag, *outopentag, *outclosetag;

 extern logtofile debuglog;

 #endif

diff --git a/init.cpp b/init.cpp
index 5388f0f..8da20b2 100755
--- a/init.cpp
+++ b/init.cpp
@@ -17,7 +17,7 @@
 #include "commonheaders.h"

 

 //global variables

-bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false;

+bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPrescenseSubscription = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false;

 TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL;

 

 list <JabberAccount*> Accounts;

@@ -97,6 +97,7 @@ void init_vars()
 	password = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));

 	debuglog.init();

 	bJabberAPI = DBGetContactSettingByte(NULL, szGPGModuleName, "bJabberAPI", bIsMiranda09?1:0);

+	bPrescenseSubscription = DBGetContactSettingByte(NULL, szGPGModuleName, "bPrescenseSubscription", 1);

 	bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 1);

 	firstrun_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowX", 0);

 	firstrun_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowY", 0);

diff --git a/messages.cpp b/messages.cpp
index db4e404..18b2378 100755
--- a/messages.cpp
+++ b/messages.cpp
@@ -875,7 +875,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
 			return CallService(MS_PROTO_CHAINSEND, w, l);
 		}
 	}
-	if(metaIsProtoMetaContacts(ccs->hContact) || !isContactSecured(ccs->hContact))
+	if(!isContactSecured(ccs->hContact) || metaIsProtoMetaContacts(ccs->hContact))
 	{
 		mir_free(msg);
 		return CallService(MS_PROTO_CHAINSEND, w, l);
@@ -917,6 +917,8 @@ int HookSendMsg(WPARAM w, LPARAM l)
 			}
 			event_processing_mutex.unlock();
 		}
+		if(metaIsProtoMetaContacts(hContact) && !isContactSecured(metaGetMostOnline(hContact)))
+			return 0;
 		return 1;
 	}
 	if(!isContactSecured(hContact))
diff --git a/new_gpg.rc b/new_gpg.rc
index 6ebf7ad..66dda83 100755
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -360,6 +360,14 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10

 END

 

+IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 214

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+FONT 8, "MS Shell Dlg", 400, 0, 0x0

+BEGIN

+    CONTROL         "Turn on prescense subscription (Jabber)",IDC_PRESCENSE_SUBSCRIPTION,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,190,10

+END

+

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -380,6 +388,11 @@ BEGIN
     IDD_OPT_GPG_MESSAGES, DIALOG

     BEGIN

     END

+

+    IDD_OPT_GPG_ADVANCED, DIALOG

+    BEGIN

+        VERTGUIDE, 12

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

diff --git a/options.cpp b/options.cpp
index 0e952b7..2b8fce1 100755
--- a/options.cpp
+++ b/options.cpp
@@ -21,6 +21,7 @@ extern HINSTANCE hInst;
 static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef)

 {

@@ -74,6 +75,18 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts;

 	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

 

+	ZeroMemory(&odp, sizeof(odp));

+

+	odp.cbSize = sizeof(odp);

+	odp.hInstance = hInst;

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);

+	odp.pszTitle = szGPGModuleName;

+	odp.pszGroup = "Services";

+	odp.pszTab = "Advanced";

+	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY;

+	odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts;

+	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+

 	return 0;

 }

 

@@ -683,6 +696,44 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
   return FALSE;

 }

 

+static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+  switch (msg)

+  {

+  case WM_INITDIALOG:

+    {

+		extern bool bJabberAPI;

+		TranslateDialogDefault(hwndDlg);

+		CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription", 1);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI);

+

+      return TRUE;

+    }

+    

+ 

+  case WM_COMMAND:

+    {

+      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+      break;

+    }

+    

+  case WM_NOTIFY:

+    {

+      switch (((LPNMHDR)lParam)->code)

+      {

+        

+      case PSN_APPLY:

+        {

+			bPrescenseSubscription = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription");

+          return TRUE;

+        }

+      }

+	}

+    break;

+  }

+  return FALSE;

+}

+

 HWND hPubKeyEdit = NULL;

 

 

diff --git a/resource.h b/resource.h
index 332e2d3..77189f8 100755
--- a/resource.h
+++ b/resource.h
@@ -15,6 +15,7 @@
 #define IDI_SECURED                     112

 #define IDD_IMPORT_KEY                  112

 #define IDI_UNSECURED                   113

+#define IDD_OPT_GPG_ADVANCED            113

 #define IDC_SET_BIN_PATH                1016

 #define IDC_SET_HOME_DIR                1017

 #define IDC_BIN_PATH                    1018

@@ -74,8 +75,9 @@
 #define IDC_AUT_EXCHANGE                1065

 #define IDC_BUTTON3                     1066

 #define IDC_COPY_KEY                    1066

-#define IDC_CHECK1                      1067

 #define IDC_STRIP_TAGS                  1067

+#define IDC_CHECK1                      1068

+#define IDC_PRESCENSE_SUBSCRIPTION      1068

 

 // Next default values for new objects

 // 

@@ -83,7 +85,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        114

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1068

+#define _APS_NEXT_CONTROL_VALUE         1069

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif

diff --git a/utilities.cpp b/utilities.cpp
index 26354ea..56f7ccb 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -716,7 +716,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 				return FALSE;
 			}
 		}
-		if(nodename)
+		if(bPrescenseSubscription && nodename)
 		{
 			if(_tcsstr(nodename, _T("status")))
 			{
@@ -1663,121 +1663,120 @@ int ImportGpGKeys(WPARAM w, LPARAM l)
 						break;
 					}
 					if(found)
-					{

-						wstring cmd;

-						TCHAR tmp2[MAX_PATH] = {0};

-						TCHAR *ptmp;

-						string output;

-						DWORD exitcode;

-						{

-							HANDLE hcnt = hContact;

-							ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));

-							_tcscpy(tmp2, ptmp);

-							mir_free(ptmp);

-							_tcscat(tmp2, _T("\\"));

-							_tcscat(tmp2, _T("temporary_exported.asc"));

-							DeleteFile(tmp2);

-							wfstream f(tmp2, std::ios::out);

-							f<<toUTF16(key).c_str();

-							f.close();

-							cmd += _T(" --batch ");

-							cmd += _T(" --import \"");

-							cmd += tmp2;

-							cmd += _T("\"");

-						}

-						gpg_execution_params params;

-						pxResult result;

-						params.cmd = &cmd;

-						params.useless = "";

-						params.out = &output;

-						params.code = &exitcode;

-						params.result = &result;

-						boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));

-						if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))

-						{

-							gpg_thread.~thread();

-							TerminateProcess(params.hProcess, 1);

-							params.hProcess = NULL;

-							debuglog<<time_str()<<": GPG execution timed out, aborted\n";

-							break;

-						}

-						if(result == pxNotFound)

-							break;

-						if(result == pxSuccess)

-							processed_keys++;

-						{

-							TCHAR *tmp;

-							if(output.find("already in secret keyring") != string::npos)

-							{

-								MessageBox(0, _T("Key already in scret key ring."), _T("Info"), MB_OK);

-								DeleteFile(tmp2);

-								break;

-							}

-							char *tmp2;

-							string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");

-							string::size_type s2 = output.find(":", s);

-							tmp2 = new char [output.substr(s,s2-s).length()+1];

-							strcpy(tmp2, output.substr(s,s2-s).c_str());

-							mir_utf8decode(tmp2, 0);

-							DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", tmp2);

-							mir_free(tmp2);

-							s = output.find("“", s2);

-							if(s == string::npos)

-							{

-								s = output.find("\"", s2);

-								s += 1;

-							}

-							else

-								s += 3;

-							if((s2 = output.find("(", s)) == string::npos)

-								s2 = output.find("<", s);

-							else if(s2 > output.find("<", s))

-								s2 = output.find("<", s);

-							if(s2 != string::npos)

-							{

-								tmp2 = new char [output.substr(s,s2-s-1).length()+1];

-								strcpy(tmp2, output.substr(s,s2-s-1).c_str());

-								mir_utf8decode(tmp2, 0);

-								if(hContact)

-								{

-									DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());

-								}

-								mir_free(tmp2);

-								if((s = output.find(")", s2)) == string::npos)

-									s = output.find(">", s2);

-								else if(s > output.find(">", s2))

-									s = output.find(">", s2);

-								s2++;

-								if(output[s] == ')')

-								{

-									tmp2 = new char [output.substr(s2,s-s2).length()+1];

-									strcpy(tmp2, output.substr(s2,s-s2).c_str());

-									mir_utf8decode(tmp2, 0);

-									if(hContact)

-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());

-									mir_free(tmp2);

-									s+=3;

-									s2 = output.find(">", s);

-									tmp2 = new char [output.substr(s,s2-s).length()+1];

-									strcpy(tmp2, output.substr(s,s2-s).c_str());

-									mir_utf8decode(tmp2, 0);

-									if(hContact)

-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());

-									mir_free(tmp2);

-								}

-								else

-								{

-									tmp2 = new char [output.substr(s2,s-s2).length()+1];

-									strcpy(tmp2, output.substr(s2,s-s2).c_str());

-									mir_utf8decode(tmp2, 0);

-									if(hContact)

-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());

-									mir_free(tmp2);

-								}

-							}

-							DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);

-							DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", toUTF16(key).c_str());

-						}

+					{
+						wstring cmd;
+						TCHAR tmp2[MAX_PATH] = {0};
+						TCHAR *ptmp;
+						string output;
+						DWORD exitcode;
+						{
+							HANDLE hcnt = hContact;
+							ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
+							_tcscpy(tmp2, ptmp);
+							mir_free(ptmp);
+							_tcscat(tmp2, _T("\\"));
+							_tcscat(tmp2, _T("temporary_exported.asc"));
+							DeleteFile(tmp2);
+							wfstream f(tmp2, std::ios::out);
+							f<<toUTF16(key).c_str();
+							f.close();
+							cmd += _T(" --batch ");
+							cmd += _T(" --import \"");
+							cmd += tmp2;
+							cmd += _T("\"");
+						}
+						gpg_execution_params params;
+						pxResult result;
+						params.cmd = &cmd;
+						params.useless = "";
+						params.out = &output;
+						params.code = &exitcode;
+						params.result = &result;
+						boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
+						if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
+						{
+							gpg_thread.~thread();
+							TerminateProcess(params.hProcess, 1);
+							params.hProcess = NULL;
+							debuglog<<time_str()<<": GPG execution timed out, aborted\n";
+							break;
+						}
+						if(result == pxNotFound)
+							break;
+						if(result == pxSuccess)
+							processed_keys++;
+						{
+							if(output.find("already in secret keyring") != string::npos)
+							{
+								MessageBox(0, _T("Key already in scret key ring."), _T("Info"), MB_OK);
+								DeleteFile(tmp2);
+								break;
+							}
+							char *tmp2;
+							string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
+							string::size_type s2 = output.find(":", s);
+							tmp2 = new char [output.substr(s,s2-s).length()+1];
+							strcpy(tmp2, output.substr(s,s2-s).c_str());
+							mir_utf8decode(tmp2, 0);
+							DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", tmp2);
+							mir_free(tmp2);
+							s = output.find("“", s2);
+							if(s == string::npos)
+							{
+								s = output.find("\"", s2);
+								s += 1;
+							}
+							else
+								s += 3;
+							if((s2 = output.find("(", s)) == string::npos)
+								s2 = output.find("<", s);
+							else if(s2 > output.find("<", s))
+								s2 = output.find("<", s);
+							if(s2 != string::npos)
+							{
+								tmp2 = new char [output.substr(s,s2-s-1).length()+1];
+								strcpy(tmp2, output.substr(s,s2-s-1).c_str());
+								mir_utf8decode(tmp2, 0);
+								if(hContact)
+								{
+									DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
+								}
+								mir_free(tmp2);
+								if((s = output.find(")", s2)) == string::npos)
+									s = output.find(">", s2);
+								else if(s > output.find(">", s2))
+									s = output.find(">", s2);
+								s2++;
+								if(output[s] == ')')
+								{
+									tmp2 = new char [output.substr(s2,s-s2).length()+1];
+									strcpy(tmp2, output.substr(s2,s-s2).c_str());
+									mir_utf8decode(tmp2, 0);
+									if(hContact)
+										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());
+									mir_free(tmp2);
+									s+=3;
+									s2 = output.find(">", s);
+									tmp2 = new char [output.substr(s,s2-s).length()+1];
+									strcpy(tmp2, output.substr(s,s2-s).c_str());
+									mir_utf8decode(tmp2, 0);
+									if(hContact)
+										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());
+									mir_free(tmp2);
+								}
+								else
+								{
+									tmp2 = new char [output.substr(s2,s-s2).length()+1];
+									strcpy(tmp2, output.substr(s2,s-s2).c_str());
+									mir_utf8decode(tmp2, 0);
+									if(hContact)
+										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
+									mir_free(tmp2);
+								}
+							}
+							DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
+							DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", toUTF16(key).c_str());
+						}
 						DeleteFile(tmp2);
 						break;
 					}