diff options
Diffstat (limited to 'plugins/NewsAggregator/Src/Authentication.cpp')
| -rw-r--r-- | plugins/NewsAggregator/Src/Authentication.cpp | 119 |
1 files changed, 110 insertions, 9 deletions
diff --git a/plugins/NewsAggregator/Src/Authentication.cpp b/plugins/NewsAggregator/Src/Authentication.cpp index e53c4791a0..67fddd0f22 100644 --- a/plugins/NewsAggregator/Src/Authentication.cpp +++ b/plugins/NewsAggregator/Src/Authentication.cpp @@ -19,19 +19,21 @@ Boston, MA 02111-1307, USA. #include "stdafx.h"
-void CreateAuthString(char *auth, MCONTACT hContact, HWND hwndDlg)
+void CreateAuthString(char *auth, MCONTACT hContact, CFeedEditor *pDlg)
{
wchar_t *tlogin = nullptr, *tpass = nullptr;
if (hContact && db_get_b(hContact, MODULE, "UseAuth", 0)) {
tlogin = db_get_wsa(hContact, MODULE, "Login");
tpass = db_get_wsa(hContact, MODULE, "Password");
}
- else if (hwndDlg && IsDlgButtonChecked(hwndDlg, IDC_USEAUTH)) {
- wchar_t buf[MAX_PATH] = {0};
- GetDlgItemText(hwndDlg, IDC_LOGIN, buf, _countof(buf));
- tlogin = mir_wstrdup(buf);
- GetDlgItemText(hwndDlg, IDC_PASSWORD, buf, _countof(buf));
- tpass = mir_wstrdup(buf);
+ else if (pDlg && pDlg->m_useauth.IsChecked()) {
+ ptrW strlogin(pDlg->m_login.GetText());
+ //wchar_t buf[MAX_PATH] = {0};
+ //GetDlgItemText(hwndDlg, IDC_LOGIN, buf, _countof(buf));
+ tlogin = mir_wstrdup(strlogin);
+ ptrW strpass(pDlg->m_password.GetText());
+ //GetDlgItemText(hwndDlg, IDC_PASSWORD, buf, _countof(buf));
+ tpass = mir_wstrdup(strpass);
}
char *user = mir_u2a(tlogin), *pass = mir_u2a(tpass);
@@ -45,7 +47,106 @@ void CreateAuthString(char *auth, MCONTACT hContact, HWND hwndDlg) mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode(str, len)));
}
-INT_PTR CALLBACK AuthenticationProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+CAuthRequest::CAuthRequest(CFeedEditor *pDlg, MCONTACT hContact)
+ : CSuper(hInst, IDD_AUTHENTICATION),
+ m_feedname(this, IDC_FEEDNAME), m_username(this, IDC_FEEDUSERNAME),
+ m_password(this, IDC_FEEDPASSWORD), m_ok(this, IDOK)
+{
+ m_pDlg = pDlg;
+ m_hContact = hContact;
+ m_ok.OnClick = Callback(this, &CAuthRequest::OnOk);
+}
+
+void CAuthRequest::OnInitDialog()
+{
+ if (m_pDlg) {
+ //wchar_t str[MAX_PATH];
+ ptrW strfeedtitle(m_pDlg->m_feedtitle.GetText());
+
+ if (strfeedtitle)
+ m_feedname.SetText(strfeedtitle);
+ else {
+ ptrW strfeedurl(m_pDlg->m_feedurl.GetText());
+ m_feedname.SetText(strfeedurl);
+ }
+
+ /*if (GetDlgItemText(SelItem.hwndList, IDC_FEEDTITLE, str, _countof(str)))
+ SetDlgItemText(hwndDlg, IDC_FEEDNAME, str);
+ else {
+ GetDlgItemText(SelItem.hwndList, IDC_FEEDURL, str, _countof(str));
+ SetDlgItemText(hwndDlg, IDC_FEEDNAME, str);
+ }*/
+ }
+ else if (m_hContact) {
+ wchar_t *ptszNick = db_get_wsa(m_hContact, MODULE, "Nick");
+ if (ptszNick) {
+ m_feedname.SetText(ptszNick);
+ //SetDlgItemText(hwndDlg, IDC_FEEDNAME, ptszNick);
+ mir_free(ptszNick);
+ }
+ else {
+ wchar_t *ptszURL = db_get_wsa(m_hContact, MODULE, "URL");
+ if (ptszURL) {
+ m_feedname.SetText(ptszURL);
+ //SetDlgItemText(hwndDlg, IDC_FEEDNAME, ptszURL);
+ mir_free(ptszURL);
+ }
+ }
+ }
+}
+
+void CAuthRequest::OnOk(CCtrlBase*)
+{
+ //ItemInfo &SelItem = *(ItemInfo*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+ //wchar_t username[MAX_PATH];
+ //char passw[MAX_PATH];
+
+ ptrW strfeedusername(m_username.GetText());
+ if (!strfeedusername || mir_wstrcmp(strfeedusername, L"") == 0) {
+ MessageBox(m_hwnd, TranslateT("Enter your username"), TranslateT("Error"), MB_OK | MB_ICONERROR);
+ return;
+ }
+ ptrA strfeedpassword(m_password.GetTextA());
+ if (!strfeedpassword || mir_strcmp(strfeedpassword, "") == 0) {
+ MessageBox(m_hwnd, TranslateT("Enter your password"), TranslateT("Error"), MB_OK | MB_ICONERROR);
+ return;
+ }
+ /*if (!GetDlgItemText(hwndDlg, IDC_FEEDUSERNAME, username, _countof(username))) {
+ MessageBox(hwndDlg, TranslateT("Enter your username"), TranslateT("Error"), MB_OK | MB_ICONERROR);
+ break;
+ }
+ if (!GetDlgItemTextA(hwndDlg, IDC_FEEDPASSWORD, passw, _countof(passw))) {
+ MessageBox(hwndDlg, TranslateT("Enter your password"), TranslateT("Error"), MB_OK | MB_ICONERROR);
+ break;
+ }*/
+ if (m_pDlg) {
+ m_pDlg->m_useauth.SetState(1);
+ m_pDlg->m_login.Enable(1);
+ m_pDlg->m_password.Enable(1);
+ m_pDlg->m_login.SetText(strfeedusername);
+ m_pDlg->m_password.SetTextA(strfeedpassword);
+ }
+ else if (m_hContact) {
+ db_set_b(m_hContact, MODULE, "UseAuth", 1);
+ db_set_ws(m_hContact, MODULE, "Login", strfeedusername);
+ db_set_s(m_hContact, MODULE, "Password", strfeedpassword);
+
+ }
+ /*if (SelItem.hwndList) {
+ CheckDlgButton(SelItem.hwndList, IDC_USEAUTH, BST_CHECKED);
+ EnableWindow(GetDlgItem(SelItem.hwndList, IDC_LOGIN), TRUE);
+ EnableWindow(GetDlgItem(SelItem.hwndList, IDC_PASSWORD), TRUE);
+ SetDlgItemText(SelItem.hwndList, IDC_LOGIN, username);
+ SetDlgItemTextA(SelItem.hwndList, IDC_PASSWORD, passw);
+ }
+ else if (SelItem.hContact) {
+ db_set_b(SelItem.hContact, MODULE, "UseAuth", 1);
+ db_set_ws(SelItem.hContact, MODULE, "Login", username);
+ db_set_s(SelItem.hContact, MODULE, "Password", passw);
+ }*/
+}
+
+/*INT_PTR CALLBACK AuthenticationProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
case WM_INITDIALOG:
@@ -120,4 +221,4 @@ INT_PTR CALLBACK AuthenticationProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA break;
}
return FALSE;
-}
\ No newline at end of file +}*/
\ No newline at end of file |