webMAN MOD 1.47.44

- Added a condition to don't close the PS3 browser if /download.ps3 or /install.ps3 is called directly, instead of using /xmb.ps3 (issue #877) - Fixed the breadcrumb trail when the path is an URL
aldostools · May 14, 2023 · 532bd92 · 532bd92
1 parent f670970
commit 532bd92
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 3 deletions.
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx
diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx
diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_lite.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_lite.sprx
diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx
diff --git a/include/cmd/download.h b/include/cmd/download.h
@@ -39,7 +39,7 @@
 
 		wait_for_xml_download(filename, param);
 
-		setPluginInactive(); unload_plugin_modules(true);
+		setPluginInactive(); if(from_xmb_ps3) unload_plugin_modules(true);
 		goto exit_handleclient_www;
 	}
 #endif
diff --git a/include/cmd/install.h b/include/cmd/install.h
@@ -87,7 +87,7 @@
 			sys_ppu_thread_sleep(5);
 			while(IS_DOWNLOADING)
 				sys_ppu_thread_sleep(2);
-			unload_plugin_modules(true);
+			if(from_xmb_ps3) unload_plugin_modules(true);
 		}
 
 		if(pkg_delete_after_install || do_restart)

diff --git a/include/cmd/xmb_browser.h b/include/cmd/xmb_browser.h
@@ -344,7 +344,7 @@
 			{
 				#ifndef LITE_EDITION
 				if(*params == NULL) sprintf(params, "/");
-				if(*params == '/' ) {do_umount(false); check_path_alias(params); sprintf(header, "http://%s%s", local_ip, params); open_browser(header, 0);} else
+				if(*params == '/' ) {do_umount(false); check_path_alias(params); from_xmb_ps3 = true; sprintf(header, "http://%s%s", local_ip, params); open_browser(header, 0);} else
 				if(*params == '$' ) {if(get_explore_interface()) exec_xmb_command(url);} else
 				if(*params == '?' ) {do_umount(false);  open_browser(url, 0);} else
 									{					open_browser(url, 1);} // example: /browser.ps3*regcam:reg?   More examples: http://www.psdevwiki.com/ps3/Xmb_plugin#Function_23

diff --git a/include/feat/pkg_handler.h b/include/feat/pkg_handler.h
@@ -186,6 +186,7 @@ static void unload_plugin_modules(bool all)
 
 	if(all)
 	{
+		from_xmb_ps3 = false;
 		unload_system_plugins();
 	}
 

diff --git a/include/file_manager.h b/include/file_manager.h
@@ -475,6 +475,13 @@ static int add_breadcrumb_trail(char *pbuffer, const char *param)
 
 	char swap[MAX_PATH_LEN], templn[MAX_PATH_LEN], url[MAX_PATH_LEN], *slash, *buffer = pbuffer;
 
+	if(*param != '/')
+	{
+		add_url(buffer, "<a class=\"f\" href=\"", param, "\">");
+		add_url(buffer, param, "</a>", "");
+		return strlen(pbuffer);
+	}
+
 	strcpy(templn, param);
 
 	// add links to path

diff --git a/main.c b/main.c
@@ -211,6 +211,7 @@ static u8 system_bgm = 0;
 
 #define APP_GAME  0xFF
 
+static bool from_xmb_ps3 = false;
 static bool show_info_popup = false;
 static bool do_restart = false;
 static bool payload_ps3hen = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -186,6 +186,7 @@ static void unload_plugin_modules(bool all) @@
     	if(all)
     	{
+    		from_xmb_ps3 = false;
     		unload_system_plugins();
     	}
@@ Expand Down @@