Skip to content
This repository has been archived by the owner on Mar 17, 2018. It is now read-only.

Commit

Permalink
fix stuff
Browse files Browse the repository at this point in the history 
fixed the display of the CPU/RSX temperartures on the PS3 Internet
Browser (in silk mode) due the bad support for iframes in this browser
  • Loading branch information
@Matsumot0
Matsumot0 committed Nov 1, 2015
1 parent e251bfc commit dc80a58
Show file tree
Hide file tree
Showing 26 changed files with 44 additions and 28 deletions.
2 changes: 1 addition & 1 deletion include/debug_mem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static void ps3mapi_find_peek_poke(char *buffer, char *templn, char *param)
sprintf(templn, " <a id=\"back\" href=\"/peek.lv%i?%llx\">&lt;&lt;</a> <a href=\"/peek.lv%i?%llx\">&lt;Back</a>", lv1?1:2, ((int)(address-0x1000)>=0)?(address-0x1000):0, lv1?1:2, ((int)(address-0x200)>=0)?(address-0x200):0); strcat(buffer, templn);
sprintf(templn, " <a id=\"next\" href=\"/peek.lv%i?%llx\">Next&gt;</a> <a href=\"/peek.lv%i?%llx\">&gt;&gt;</a></pre>", lv1?1:2, ((int)(address+0x400)<(int)upper_memory)?(address+0x200):(upper_memory-0x200), lv1?1:2, ((int)(lv1+0x1200)<(int)upper_memory)?(address+0x1000):(upper_memory-0x200)); strcat(buffer, templn);

strcat(buffer, "<script>"
strcat(buffer, "<script type=\"text/javascript\">"
"document.addEventListener(\"keydown\", keyDownEvent, false);"
"function keyDownEvent(e)"
"{e=e||window.event;var keyCode=e.keyCode;if(keyCode==37){self.location=back.href;}if(keyCode==39){self.location=next.href;}}"
Expand Down
14 changes: 8 additions & 6 deletions include/stealth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ static void remove_cfw_syscalls(void)

static void disable_cfw_syscalls(void)
{
/*
#ifdef COBRA_ONLY
get_vsh_plugin_slot_by_name((char *)"VSH_MENU", true); // unload vsh menu
#endif
*/
if(syscalls_removed)
{
{ BEEP2 }
Expand Down Expand Up @@ -138,6 +133,8 @@ static void block_online_servers(void)

u64 mem=0; url_count = 0;

// LV1

for(u64 addr=0x860000; addr<0xFFFFF8ULL; addr+=4)//16MB
{
mem = peek_lv1(addr);
Expand All @@ -148,7 +145,12 @@ static void block_online_servers(void)
else if(mem == 0x656E612E6E65742EULL) // ena.net.
{if(!block_url(addr, mem, 0x0000000000000000ULL)) break;}
}
for(u64 addr = 0x1300000ULL; addr < 0x17FFFF8ULL; addr+=4)//8MB

// LV2

u64 start_addr = 0x300000ULL + LV2_OFFSET_ON_LV1, stop_addr = 0x7FFFF8ULL + LV2_OFFSET_ON_LV1;

for(u64 addr = start_addr; addr < stop_addr; addr+=4)//8MB
{
mem = peek_lv1(addr);
if( mem == 0x733A2F2F6E73782EULL) // s://nsx.
Expand Down
28 changes: 21 additions & 7 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ static void handleclient(u64 conn_s_p)

if(((header[0]=='G') || recv(conn_s, header, HTML_RECV_SIZE, 0) > 0) && header[0]=='G' && header[4]=='/') // serve only GET /xxx requests
{
if(strstr(header, "Mozilla/5.0 (PLAYSTATION 3;")) is_ps3_http=1; else
if(strstr(header, "x-ps3-browser")) is_ps3_http=1; else
if(strstr(header, "Gecko/36")) is_ps3_http=2; else is_ps3_http=0;

header[strcspn(header, "\n")] = '\0';
Expand Down Expand Up @@ -1537,15 +1537,29 @@ static void handleclient(u64 conn_s_p)
}
else if(!mount_ps3)
{
sprintf(templn, " [<a href=\"/cpursx.ps3\"><iframe src=\"%s\" style=\"border:0;overflow:hidden;\" width=\"225\" height=\"22\" frameborder=\"0\" scrolling=\"no\"></iframe></a>]<hr>"
"<div id=\"rxml\" class=\"dlg\"><H1>%s XML ...</H1></div>"
"<div id=\"rhtm\" class=\"dlg\"><H1>%s HTML ...</H1></div>"
{
char cpursx[24]; memset(cpursx, 0, 24);

if(is_ps3_http)
{
u32 t1=0, t2=0;
get_temperature(0, &t1); // 3E030000 -> 3E.03°C -> 62.(03/256)°C
get_temperature(1, &t2);
t1=t1>>24;
t2=t2>>24;
sprintf(cpursx, "CPU: %i°C | RSX: %i°C", t1, t2);
}

sprintf(templn, " [<a href=\"/cpursx.ps3\" style=\"text-decoration:none;\">%s</a>]<hr>"
"<div id=\"rxml\" class=\"dlg\"><H1>%s XML ...</H1></div>"
"<div id=\"rhtm\" class=\"dlg\"><H1>%s HTML ...</H1></div>"
#ifdef COPY_PS3
"<div id=\"rcpy\" class=\"dlg\"><H1><a href=\"/copy.ps3$abort\">&#9746;</a> %s ...</H1></div>"
"<form action=\"\">", "/cpursx_ps3", STR_REFRESH, STR_REFRESH, STR_COPYING); strcat(buffer, templn);
"<div id=\"rcpy\" class=\"dlg\"><H1><a href=\"/copy.ps3$abort\">&#9746;</a> %s ...</H1></div>"
"<form action=\"\">", is_ps3_http ? cpursx : "<iframe src=\"/cpursx_ps3\" style=\"border:0;overflow:hidden;\" width=\"230\" height=\"22\" frameborder=\"0\" scrolling=\"no\"></iframe>", STR_REFRESH, STR_REFRESH, STR_COPYING); strcat(buffer, templn);
#else
"<form action=\"\">", "/cpursx_ps3", STR_REFRESH, STR_REFRESH); strcat(buffer, templn);
"<form action=\"\">", is_ps3_http ? cpursx : "<iframe src=\"/cpursx_ps3\" style=\"border:0;overflow:hidden;\" width=\"230\" height=\"22\" frameborder=\"0\" scrolling=\"no\"></iframe>", STR_REFRESH, STR_REFRESH); strcat(buffer, templn);
#endif
}

if((webman_config->homeb) && (strlen(webman_config->home_url)>0))
{sprintf(templn, HTML_BUTTON_FMT, HTML_BUTTON, STR_HOME, HTML_ONCLICK, webman_config->home_url); strcat(buffer, templn);}
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/LANG_FR.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ STR_MOVIELOADED [DVD/BD Vidéo chargé avec succès. Lancer le film depuis l'ic

STR_XMLRF [Liste des jeux rafraîchit (<a href="/dev_hdd0/xmlhost/game_plugin/mygames.xml">mygames.xml</a>).<br>Clic <a href="/restart.ps3">ici</a> pour redémarrer ton système PLAYSTATION®3 maintenant.]

STR_STORAGE [Stockage système]
STR_STORAGE [Stockage]
STR_MEMORY [Mémoire]
STR_MBFREE [Mo de libre]
STR_KBFREE [Ko de libre]
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
<Pair key="title"><String>Unmount Disc</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_CN.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@
<Pair key="title"><String>卸载光盘</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_DE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>Disk auswerfen</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_DK.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>Afmontér Disk</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_ES.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
<Pair key="title"><String>Desmontar Disco</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_FR.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
<Pair key="title"><String>Démonter le disque</String></Pair>
<Pair key="info"><String>[Select+O]</String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_IT.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
<Pair key="title"><String>Rimuovi il Disco</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_KR.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>게임 디스크 꺼내기</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_PL.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>Odmontuj dysk</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_PT.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
<Pair key="title"><String>Desmontar Disco</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_RU.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>Выгрузить игру</String></Pair>
<Pair key="info"><String>Текущая смонтированная игра будет выгружена [Select+O]</String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_SK.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
<Pair key="title"><String>Odpojiť Disk</String></Pair>
<Pair key="info"><String></String>Odpojí načítaný disk</Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
2 changes: 1 addition & 1 deletion updater/pkgfiles/USRDIR/webMAN_ZH.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
<Pair key="title"><String>卸載光碟片</String></Pair>
<Pair key="info"><String></String></Pair>
<Pair key="module_name"><String>webbrowser_plugin</String></Pair>
<Pair key="module_action"><String>http://localhost/mount.ps3/unmount</String></Pair>
<Pair key="module_action"><String>http://localhost/mount_ps3/unmount</String></Pair>
</Table>
</Attributes>
<Items><Item class="type:x-xmb/module-action" key="webman_unmount" attr="webman_unmount"/></Items>
Expand Down
Binary file modified updater/pkgfiles/USRDIR/webftp_server.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_ccapi.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_english.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_lite.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_ps3mapi.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_english.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_multi23.sprx
View file
Binary file not shown.
Binary file modified updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx
View file
Binary file not shown.

0 comments on commit dc80a58

Please sign in to comment.