ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-14 04:34:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clarify disallowed paths.

Browse source
This commit is contained in:
Ottermandias 2022-10-09 22:56:26 +02:00
parent 707f308fac
commit bbfdc7fad2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Penumbra/UI/ConfigWindow.SettingsTab.cs
View file

@ -97,7 +97,7 @@ public partial class ConfigWindow
if( Path.GetDirectoryName( newName ) == null ) if( Path.GetDirectoryName( newName ) == null )
{ {
return ( "Path may not be a drive root. Please add a directory.", false ); return ( "Path is not allowed to be a drive root. Please add a directory.", false );
} }
var symbol = '\0'; var symbol = '\0';
@ -109,31 +109,31 @@ public partial class ConfigWindow
var desktop = Environment.GetFolderPath( Environment.SpecialFolder.Desktop ); var desktop = Environment.GetFolderPath( Environment.SpecialFolder.Desktop );
if( IsSubPathOf( desktop, newName ) ) if( IsSubPathOf( desktop, newName ) )
{ {
return ( "Path may not be on your Desktop.", false ); return ( "Path is not allowed to be on your Desktop.", false );
} }
var programFiles = Environment.GetFolderPath( Environment.SpecialFolder.ProgramFiles ); var programFiles = Environment.GetFolderPath( Environment.SpecialFolder.ProgramFiles );
var programFilesX86 = Environment.GetFolderPath( Environment.SpecialFolder.ProgramFilesX86 ); var programFilesX86 = Environment.GetFolderPath( Environment.SpecialFolder.ProgramFilesX86 );
if( IsSubPathOf( programFiles, newName ) || IsSubPathOf( programFilesX86, newName ) ) if( IsSubPathOf( programFiles, newName ) || IsSubPathOf( programFilesX86, newName ) )
{ {
return ( "Path may not be in ProgramFiles.", false ); return ( "Path is not allowed to be in ProgramFiles.", false );
} }
var dalamud = Dalamud.PluginInterface.ConfigDirectory.Parent!.Parent!; var dalamud = Dalamud.PluginInterface.ConfigDirectory.Parent!.Parent!;
if( IsSubPathOf( dalamud.FullName, newName ) ) if( IsSubPathOf( dalamud.FullName, newName ) )
{ {
return ( "Path may not be inside your Dalamud directories.", false ); return ( "Path is not allowed to be inside your Dalamud directories.", false );
} }
if( Functions.GetDownloadsFolder( out var downloads ) && IsSubPathOf( downloads, newName ) ) if( Functions.GetDownloadsFolder( out var downloads ) && IsSubPathOf( downloads, newName ) )
{ {
return ( "Path may not be inside your Downloads folder.", false ); return ( "Path is not allowed to be inside your Downloads folder.", false );
} }
var gameDir = Dalamud.GameData.GameData.DataPath.Parent!.Parent!.FullName; var gameDir = Dalamud.GameData.GameData.DataPath.Parent!.Parent!.FullName;
if( IsSubPathOf( gameDir, newName ) ) if( IsSubPathOf( gameDir, newName ) )
{ {
return ( "Path may not be inside your game folder.", false ); return ( "Path is not allowed to be inside your game folder.", false );
} }
return ( $"Press Enter or Click Here to Save (Current Directory: {old})", true ); return ( $"Press Enter or Click Here to Save (Current Directory: {old})", true );