webMAN MOD 1.47.45

- prepISO now copy encrypted ISO .key file to /dev_hdd0/tmp/wmtmp

_Projects_/prepISO/include/exfat.h

@@ -106,15 +106,15 @@ static int dir_read (char *dpath)
 					continue;
 				}
 				//---------------
-				 
+
 				// If the key exists, copy it to "/dev_hdd0/tmp/wmtmp" to 
-				// decrypt on-the-fly with Cobra when the ISO is mounted (By Evilnat) 				
+				// decrypt on-the-fly with Cobra when the ISO is mounted (By Evilnat)
 				if(strcasestr(ext, ".key"))
 				{
 					FIL fd;
 					char output[256];
 					snprintf (fn, 255, "%s/%s", dpath, fno.fname);
-					sprintf(output, "/dev_hdd0/tmp/wmtmp/%s", fno.fname);
+					snprintf(output, 255, "/dev_hdd0/tmp/wmtmp/%s", fno.fname);
 
 					if (!f_open(&fd, fn, FA_READ))
 					{
@@ -130,7 +130,6 @@ static int dir_read (char *dpath)
 							ps3ntfs_close(fda);
 						}
 					}
-
 				}
 
 				//--- is ISO?

_Projects_/prepISO/source/main.c

@@ -268,6 +268,16 @@ int main(int argc, const char* argv[])
 								}
 								//---------------
 
+								// If the key exists, copy it to "/dev_hdd0/tmp/wmtmp" to 
+								// decrypt on-the-fly with Cobra when the ISO is mounted (By Evilnat)
+								if(strcasestr(ext, ".key"))
+								{
+									char output[256];
+									snprintf(output, 255, "/dev_hdd0/tmp/wmtmp/%s", dir.d_name);
+
+									copy_file(filename, output);
+								}
+
 								//--- is ISO?
 								is_iso =	( (strcasestr(ext, ".iso")) ) ||
 								(m > 0 && ( ( (strcasestr(ext, ".bin")) ) ||

include/scan/prepntfs.h

@@ -203,6 +203,15 @@ static void create_ntfs_file(char *iso_path, char *filename, size_t plen)
 			force_copy(sfo_path, tmp_path);
 		}
 
+		// copy external .key to WMTMP
+		if(ntfs_m == id_PS3ISO)
+		{
+			char *key_path = iso_path;
+			strcpy(key_path + plen, ".key");
+			strcpy(tmp_path + tlen, ".key");
+			force_copy(key_path, tmp_path);
+		}
+
 		// copy external image to WMTMP if exists
 		char *img_path = iso_path;
 		if(!get_image_file(img_path, plen)) // image not found in NTFS

include/setup.h

@@ -1231,7 +1231,13 @@ static void read_settings(void)
 	webman_config->ps2_rate = 40;      //% ps2 fan speed
 
 	if(payload_ps3hen) webman_config->man_speed = 0x5A; // ps3hen default is 35% manual
-
+/*
+	if(payload_ps3hen) 
+	{
+		webman_config->man_rate = 30;      //% manual fan speed
+		webman_config->man_speed = 0x4C; // ps3hen default is 30% manual
+	}
+*/
 	webman_config->minfan = DEFAULT_MIN_FANSPEED; // 25% defined in fancontrol.h
 	webman_config->maxfan = DEFAULT_MAX_FANSPEED; // 80% defined in fancontrol.h