62,23 → 62,31 |
void TWebBrowser::Scan(dword id) { |
if (id > 399) |
{ |
//Lee 21.02 { |
GetURLfromPageLinks(id); |
|
//ýòó âñþ õðåíü íóæíî â GetNewUrl() ïåðåìåñòèòü |
IF (URL[0] == '#') { //ìû íå óìååì ïåðåõîäèòü ïî ññûëêå âíóòðè äîêóìåíòà. Ïîêà ÷òî... |
copystr(#editURL, #URL); |
return; |
} |
|
GetURLfromPageLinks(id); |
|
URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü) |
|
GetNewUrl(); |
|
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad(); |
//Lee 21.02 } |
//ïðûãàåò èçîáðàæåíèå ïîëîñà, áåëàÿ ðèñóåòñÿ ñíèçó |
if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg")) |
{ |
RunProgram("/sys/media/kiv", #URL); |
copystr(#editURL, #URL); |
return; |
} |
|
copystr(#URL, #editURL); |
za_kadrom = count = 0; |
|
if (!strcmp(get_URL_part(5),"http:")) HttpLoad(); |
|
ShowPage(#URL); |
return; |
} |
175,23 → 183,27 |
} |
|
void GetNewUrl(){ |
IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+1,#URL); |
IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+2,#URL); |
|
//IF (!strcmp(get_URL_part(3),"../")) |
//{ |
// //DrawTitle(#URL+7); |
//} |
if (strcmp(get_URL_part(3),"/rd")<>0) && (strcmp(get_URL_part(5),"/sys/")<>0) && (strcmp(get_URL_part(3),"/hd")<>0) |
&& (strcmp(get_URL_part(3),"/bd")<>0) && (strcmp(get_URL_part(3),"/fd")<>0) && (strcmp(get_URL_part(3),"/cd")<>0) |
if (URL[0] <> '/') |
&& (strcmp(get_URL_part(5),"http:")<>0) && (strcmp(get_URL_part(5),"mailt")<>0) && (strcmp(get_URL_part(5),"ftp:/")<>0) |
{ |
copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû |
|
IF (editURL[find_symbol(#editURL, '/')-2]<>'/') // åñëè íå http://pagename.ua |
_CUT_ST_LEVEL_MARK: |
|
IF (editURL[find_symbol(#editURL, '/')-2]<>'/') // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà??? |
{ |
editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî / |
IF (URL[0]=='/') copystr(#URL+1,#URL); |
} |
|
IF (!strcmp(get_URL_part(3),"../")) //íà óðîâåíü ââåðõ |
{ |
copystr(#URL+3,#URL); |
editURL[find_symbol(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî / |
goto _CUT_ST_LEVEL_MARK; |
} |
|
copystr(#URL, #editURL + strlen(#editURL)); //êëåèì íîâûé àäðåñ |
copystr(#editURL, #URL); |
} |