CrashDumper: Miranda-VI is dead, lets use our own implementation... Version dump.

(It's a bit messy, should be improved later)

git-svn-id: http://svn.miranda-ng.org/main/trunk@10955 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 14 insertions, 8 deletions

diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 0389f03a53..8c195c3276 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -136,7 +136,7 @@ INT_PTR OpenUrl(WPARAM wParam, LPARAM)
 		break;

 

 	case 1:

-		OpenAuthUrl("http://%s.miranda-vi.org");

+		OpenAuthUrl("http://www.miranda-ng.org/versioninfo/detail/%s");

 		break;

 	}

 	return 0;

@@ -276,7 +276,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 

 	mi.popupPosition = 1;

 	mi.position = 2000099991;

-	mi.ptszName = LPGENT("Open miranda-vi.org");

+	mi.ptszName = LPGENT("Open online report");

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_URL);

 	mi.pszService = MS_CRASHDUMPER_URL;

 	Menu_AddMainMenuItem(&mi);

diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp
index 2e2a91ca29..be0aa8d4c0 100644
--- a/plugins/CrashDumper/src/ui.cpp
+++ b/plugins/CrashDumper/src/ui.cpp
@@ -273,11 +273,11 @@ LRESULT CALLBACK DlgProcPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_COMMAND:

 		switch ((int)PUGetPluginData(hWnd)) {

 		case 0:

-			OpenAuthUrl("http://www.miranda-vi.org/");

+			OpenAuthUrl("http://www.miranda-ng.org/versioninfo/detail/%s");

 			break;

 

 		case 1:

-			OpenAuthUrl("http://%s.miranda-vi.org/global");

+			OpenAuthUrl("http://www.miranda-ng.org/versioninfo/global/%s");

 			break;

 

 		case 3:

diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp
index a964c41967..e49d2825c4 100644
--- a/plugins/CrashDumper/src/upload.cpp
+++ b/plugins/CrashDumper/src/upload.cpp
@@ -68,10 +68,10 @@ void OpenAuthUrl(const char* url)
 	if (user[0] && pass[0]) {

 		char str[256];

 		mir_snprintf(str, sizeof(str), url, user);

-		mir_snprintf(str, sizeof(str), "http://www.miranda-vi.org/cdlogin?name=%s&pass=%s&redir=%s", user, pass, ptrA(mir_urlEncode(str)));

+		mir_snprintf(str, sizeof(str), "http://www.miranda-ng.org/versioninfo/detail/%s", user);

 		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)str);

 	}

-	else CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.miranda-vi.org/");

+	else CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.miranda-ng.org/versioninfo/");

 }

 

 void CreateAuthString(char* auth)

@@ -205,7 +205,13 @@ bool InternetDownloadFile(const char *szUrl, VerTrnsfr* szReq)
 void __cdecl VersionInfoUploadThread(void* arg)

 {

 	VerTrnsfr* trn = (VerTrnsfr*)arg;

-	InternetDownloadFile("http://www.miranda-vi.org/uploadpost", trn);

+

+	char user[64], pass[40];

+	GetLoginStr(user, sizeof(user), pass);

+	char str[256];

+	mir_snprintf(str, sizeof(str), "http://www.miranda-ng.org/en/versioninfo/upload?login=%s&pass=%s", user, pass);

+

+	InternetDownloadFile(str, trn);

 	mir_free(trn->buf);

 	mir_free(trn);

 }

diff --git a/plugins/CrashDumper/src/version.h b/plugins/CrashDumper/src/version.h
index 2a58b264b2..373dea8060 100644
--- a/plugins/CrashDumper/src/version.h
+++ b/plugins/CrashDumper/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION            0

 #define __MINOR_VERSION            0

 #define __RELEASE_NUM              5

-#define __BUILD_NUM                1

+#define __BUILD_NUM                2

 

 #include <stdver.h>