diff options
Diffstat (limited to 'plugins/Weather/src/weather_http.cpp')
| -rw-r--r-- | plugins/Weather/src/weather_http.cpp | 188 |
1 files changed, 73 insertions, 115 deletions
diff --git a/plugins/Weather/src/weather_http.cpp b/plugins/Weather/src/weather_http.cpp index 7cf39bfd54..ddb5cd973c 100644 --- a/plugins/Weather/src/weather_http.cpp +++ b/plugins/Weather/src/weather_http.cpp @@ -47,137 +47,95 @@ int findHeader(NETLIBHTTPREQUEST *nlhrReply, char *hdr) // szUrl = URL of the webpage to be retrieved
// return value = 0 for success, 1 or HTTP error code for failure
// global var used: szData, szInfo = containing the retrieved data
-int InternetDownloadFile (char *szUrl, char* cookie, TCHAR** szData)
+
+int InternetDownloadFile (char *szUrl, char *cookie, TCHAR **szData)
{
- int result = 0xBADBAD;
- char* szRedirUrl = NULL;
- NETLIBHTTPREQUEST nlhr = {0};
- NETLIBHTTPHEADER headers[6];
+ NETLIBHTTPHEADER headers[5];
+ headers[0].szName = "User-Agent";
+ headers[0].szValue = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)";
+ headers[1].szName = "Cache-Control";
+ headers[1].szValue = "no-cache";
+ headers[2].szName = "Pragma";
+ headers[2].szValue = "no-cache";
+ headers[3].szName = "Connection";
+ headers[3].szValue = "close";
+ headers[4].szName = "Cookie";
+ headers[4].szValue = cookie;
// initialize the netlib request
- nlhr.cbSize = sizeof(nlhr);
+ NETLIBHTTPREQUEST nlhr = { sizeof(nlhr) };
nlhr.requestType = REQUEST_GET;
nlhr.flags = NLHRF_DUMPASTEXT | NLHRF_HTTP11 | NLHRF_PERSISTENT | NLHRF_REDIRECT;
nlhr.szUrl = szUrl;
nlhr.nlc = hNetlibHttp;
-
- // change the header so the plugin is pretended to be IE 6 + WinXP
- nlhr.headersCount = 5;
nlhr.headers = headers;
- nlhr.headers[0].szName = "User-Agent";
- nlhr.headers[0].szValue = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)";
- nlhr.headers[1].szName = "Cache-Control";
- nlhr.headers[1].szValue = "no-cache";
- nlhr.headers[2].szName = "Pragma";
- nlhr.headers[2].szValue = "no-cache";
- nlhr.headers[3].szName = "Connection";
- nlhr.headers[3].szValue = "close";
- nlhr.headers[4].szName = "Cookie";
- nlhr.headers[4].szValue = cookie;
-// nlhr.headers[5].szName = "If-Modified-Since";
-// nlhr.headers[5].szValue = "Tue, 24 Feb 2009 03:44:23 GMT";
-
- if (cookie == NULL || cookie[0] == 0) --nlhr.headersCount;
-
- while (result == 0xBADBAD) {
- // download the page
- NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,
- (WPARAM)hNetlibUser, (LPARAM)&nlhr);
-
- if (nlhrReply) {
- // if the recieved code is 200 OK
- if (nlhrReply->resultCode == 200) {
- if (nlhrReply->dataLength) {
- result = 0;
- bool bIsUtf = false;
-
- // allocate memory and save the retrieved data
- int i = findHeader(nlhrReply, "Content-Type");
- if (i != -1 && strstr(_strlwr((char*)nlhrReply->headers[i].szValue), "utf-8"))
- bIsUtf = true;
- else {
- char* end = nlhrReply->pData;
- for (;;) {
- char* beg = strstr(end, "<meta");
- if (beg == NULL) break;
- else {
- char* method, tmp;
- end = strchr(beg, '>');
- tmp = *end; *end = 0;
-
- method = strstr(beg, "http-equiv=\"");
- if (method && _strnicmp(method+12, "Content-Type", 12) == 0 && strstr(method, "utf-8")) {
- bIsUtf = true;
- break;
- }
- else *end = tmp;
- } } }
-
- if ( bIsUtf )
- *szData = mir_utf8decodeT( nlhrReply->pData );
- else
- *szData = mir_a2t( nlhrReply->pData );
+ nlhr.headersCount = SIZEOF(headers);
+
+ if (cookie == NULL || cookie[0] == 0)
+ --nlhr.headersCount;
+
+ // download the page
+ NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUser, (LPARAM)&nlhr);
+ if (nlhrReply == 0) {
+ // if the data does not downloaded successfully (ie. disconnected), then return 1000 as error code
+ *szData = (TCHAR*)mir_alloc(512);
+ // store the error code in szData
+ _tcscpy(*szData, _T("NetLib error occurred!!"));
+ hNetlibHttp = NULL;
+ return NLHRF_REDIRECT;
+ }
- }
- else result = DATA_EMPTY;
- }
- // if the recieved code is 302 Moved, Found, etc
- // workaround for url forwarding
- else if (nlhrReply->resultCode == 302 || nlhrReply->resultCode == 301 || nlhrReply->resultCode == 303 ) // page moved
- {
- // get the url for the new location and save it to szInfo
- // look for the reply header "Location"
- int i = findHeader(nlhrReply, "Location");
-
- if (i != -1)
- {
- size_t rlen = 0;
- if (nlhrReply->headers[i].szValue[0] == '/')
- {
- char* szPath;
- char* szPref = strstr(szUrl, "://");
- szPref = szPref ? szPref + 3 : szUrl;
- szPath = strchr(szPref, '/');
- rlen = szPath != NULL ? szPath - szUrl : strlen(szUrl);
+ // if the recieved code is 200 OK
+ int result;
+ if (nlhrReply->resultCode == 200) {
+ if (nlhrReply->dataLength) {
+ bool bIsUtf = false;
+ result = 0;
+
+ // allocate memory and save the retrieved data
+ int i = findHeader(nlhrReply, "Content-Type");
+ if (i != -1 && strstr(_strlwr((char*)nlhrReply->headers[i].szValue), "utf-8"))
+ bIsUtf = true;
+ else {
+ char* end = nlhrReply->pData;
+ for (;;) {
+ char* beg = strstr(end, "<meta");
+ if (beg == NULL) break;
+ else {
+ char* method, tmp;
+ end = strchr(beg, '>');
+ tmp = *end; *end = 0;
+
+ method = strstr(beg, "http-equiv=\"");
+ if (method && _strnicmp(method+12, "Content-Type", 12) == 0 && strstr(method, "utf-8")) {
+ bIsUtf = true;
+ break;
+ }
+ else *end = tmp;
}
-
- szRedirUrl = (char*)mir_realloc(szRedirUrl,
- rlen + strlen(nlhrReply->headers[i].szValue)*3 + 1);
-
- strncpy(szRedirUrl, szUrl, rlen);
- strcpy(szRedirUrl+rlen, nlhrReply->headers[i].szValue);
-
- GetSearchStr(szRedirUrl);
-
- nlhr.szUrl = szRedirUrl;
}
}
- // return error code if the recieved code is neither 200 OK nor 302 Moved
- else {
- *szData = ( TCHAR* )mir_alloc(512);
- // store the error code in szData
- mir_sntprintf(*szData, 512, _T("Error occured! HTTP Error: %i\n"), nlhrReply->resultCode);
- result = (int)nlhrReply->resultCode;
- }
- hNetlibHttp = nlhrReply->nlc;
- // make a copy of the retrieved data, then free the memory of the http reply
- CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0, (LPARAM)nlhrReply);
+ TCHAR *retVal = NULL;
+ if (bIsUtf)
+ retVal = mir_utf8decodeT( nlhrReply->pData );
+ if (retVal == NULL)
+ retVal = mir_a2t(nlhrReply->pData);
+ *szData = retVal;
}
- // if the data does not downloaded successfully (ie. disconnected), then return 1000 as error code
- else
- {
- *szData = ( TCHAR* )mir_alloc(512);
- // store the error code in szData
- _tcscpy(*szData, _T("NetLib error occurred!!"));
- result = NETLIB_ERROR;
- hNetlibHttp = NULL;
- }
-
+ else result = DATA_EMPTY;
+ }
+ // return error code if the recieved code is neither 200 OK nor 302 Moved
+ else {
+ *szData = (TCHAR*)mir_alloc(512);
+ // store the error code in szData
+ mir_sntprintf(*szData, 512, _T("Error occured! HTTP Error: %i\n"), nlhrReply->resultCode);
+ result = (int)nlhrReply->resultCode;
}
- mir_free(szRedirUrl);
-
+ hNetlibHttp = nlhrReply->nlc;
+ // make a copy of the retrieved data, then free the memory of the http reply
+ CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0, (LPARAM)nlhrReply);
return result;
}
|