webMAN MOD 1.47.47i

- Fixed display of resource text if the plugin was not loaded #1159
- Partial fix fir modules loaded from /dev_flash (implemented load plugin by name for some plugins)

include/feat/pkg_handler.h

@@ -151,6 +151,75 @@ static int LoadPluginById(int id, void *handler)
 	return xmm0_interface->LoadPlugin3(id, handler, 0);
 }
 
+static int LoadPluginByName(char *plugin_name)
+{
+	int id = 0;
+	if(!strstr(plugin_name, "_plugin")) return 0;
+	if(strstr(plugin_name, "nas")) id = nas_plugin; else
+	if(strstr(plugin_name, "xai")) id = xai_plugin; else
+	if(strstr(plugin_name, "edy")) id = edy_plugin; else
+	if(strstr(plugin_name, "ps3")) id = ps3_savedata_plugin; else
+	if(strstr(plugin_name, "vmc")) id = vmc_savedata_plugin; else
+	if(strstr(plugin_name, "hknw")) id = hknw_plugin; else
+	if(strstr(plugin_name, "sacd")) id = sacd_plugin; else
+	if(strstr(plugin_name, "user")) id = user_plugin; else
+	if(strstr(plugin_name, "dlna")) id = dlna_plugin; else
+	if(strstr(plugin_name, "cddb")) id = eula_cddb_plugin; else
+	if(strstr(plugin_name, "premo")) id = premo_plugin; else
+	if(strstr(plugin_name, "regcam")) id = regcam_plugin; else
+	if(strstr(plugin_name, "wboard")) id = wboard_plugin; else
+	if(strstr(plugin_name, "remote")) id = remotedownload_plugin; else
+	if(strstr(plugin_name, "update")) id = software_update_plugin; else
+	if(strstr(plugin_name, "device")) id = deviceconf_plugin; else
+	if(strstr(plugin_name, "netconf")) id = netconf_plugin; else
+	if(strstr(plugin_name, "sysconf")) id = sysconf_plugin; else
+	if(strstr(plugin_name, "kensaku")) id = kensaku_plugin; else
+	if(strstr(plugin_name, "game_ext")) id = game_ext_plugin; else
+	if(strstr(plugin_name, "gamedata")) id = gamedata_plugin; else
+	if(strstr(plugin_name, "filecopy")) id = filecopy_plugin; else
+	if(strstr(plugin_name, "npsignin")) id = npsignin_plugin; else
+	if(strstr(plugin_name, "newstore")) id = newstore_plugin; else
+	if(strstr(plugin_name, "download")) id = download_plugin; else
+	if(strstr(plugin_name, "playlist")) id = playlist_plugin; else
+	if(strstr(plugin_name, "strviewer")) id = strviewer_plugin; else
+	if(strstr(plugin_name, "webrender")) id = webrender_plugin; else
+	if(strstr(plugin_name, "webbrowser")) id = webbrowser_plugin; else
+	if(strstr(plugin_name, "photoviewer")) id = photoviewer_plugin; else
+	if(strstr(plugin_name, "audioplayer")) id = audioplayer_plugin; else
+	if(strstr(plugin_name, "videoplayer")) id = videoplayer_plugin; else
+	if(strstr(plugin_name, "videodownloader")) id = videodownloader_plugin; else
+	if(strstr(plugin_name, "game")) id = game_plugin;
+
+	//system_plugin=0x00,
+	//xmb_plugin=0x01,
+	//explore_plugin=0x02,
+	//category_setting_plugin=0x03,
+	//print_plugin=0x09,
+	//bdp_plugin=0x11,
+	//bdp_disccheck_plugin=0x12,
+	//bdp_storage_plugin=0x13,
+	//friendim_plugin=0x1E,
+	//friendml_plugin=0x1F,
+	//avc_plugin=0x20,
+	//avc2_text_plugin=0x21,
+	//np_trophy_plugin=0x24,
+	//np_trophy_ingame=0x25,
+	//friendtrophy_plugin=0x26,
+	//profile_plugin=0x27,
+	//thumthum_plugin=0x2A,
+	//micon_lock_plugin=0x2B,
+	//idle_plugin=0x36,
+	//poweroff_plugin=0x39,
+	//videoeditor_plugin=0x3A,
+	//scenefolder_plugin=0x3B,
+	//eula_hcopy_plugin=0x3C,
+	//mtpinitiator_plugin=0x3E,
+	//campaign_plugin=0x3F,
+
+	if(id) {LoadPluginById(id, NULL); sys_ppu_thread_sleep(1);}
+	return id;
+}
+
 static void unloadSysPluginCallback(void)
 {
 	//Add potential callback process

include/notify/vsh_notify.h

@@ -95,6 +95,10 @@ static void play_sound_id(u8 value)
 	if(value == 9) { play_rco_sound("snd_system_ng"); }
 }
 
+#ifdef PKG_HANDLER
+static int LoadPluginByName(char *plugin_name);
+#endif
+
 //------------
 /* Based on PHTNC's code to write VSH Notify notifications with icons */
 
@@ -220,6 +224,15 @@ static s32 show_msg_with_icon(u8 icon_id, const char *msg)
 		if(get_param("&rco=", rco, pos, 63))
 		{
 			rco_plugin = View_Find(rco);
+			#ifdef PKG_HANDLER
+			if(!rco_plugin)
+			{
+				LoadPluginByName(rco);
+				rco_plugin = View_Find(rco);
+			}
+			#endif
+
+			if(!rco_plugin) return vshtask_notify(msg);
 		}
 
 		LoadRCOTexture(&teximg, tex_plugin, tex); *pos = NULL;

include/ps3mapi/ps3mapi.h

@@ -1691,8 +1691,13 @@ static void ps3mapi_gameplugin(char *buffer, char *html, const char *param)
 				if(get_param("prx=", prx_path, param, STD_PATH_LEN))
 				{
 					check_path_alias(prx_path);
-					if(strstr(prx_path, "/dev_flash"))
-						load_start(prx_path); // <- load system modules from flash to process
+					if(islike(prx_path, "/dev_flash"))
+					{
+						#ifdef PKG_HANDLER
+						if(!LoadPluginByName(prx_path))
+						#endif
+							load_start(prx_path); // <- load system modules from flash to process
+					}
 					else
 						{system_call_6(SC_COBRA_SYSCALL8, SYSCALL8_OPCODE_PS3MAPI, PS3MAPI_OPCODE_LOAD_PROC_MODULE, (u64)pid, (u64)(u32)prx_path, NULL, 0); } // <- load custom modules to process
 				}