zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix AWSTAT config generate problem

Browse source 
all unmatched environmentvariable will retain
This commit is contained in:
stephen 2013-09-04 17:55:06 +08:00
parent f11d00d4fa
commit 6f220a3a2b
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
WebsitePanel/Sources/WebsitePanel.Server.Utils/FileUtils.cs
View file

@ -136,7 +136,7 @@ namespace WebsitePanel.Providers.Utils
if (String.IsNullOrEmpty(str)) if (String.IsNullOrEmpty(str))
return str; return str;
Regex re = new Regex("%(.+)%", RegexOptions.IgnoreCase); Regex re = new Regex("%([^\\s\\%]+)%", RegexOptions.IgnoreCase);
return re.Replace(str, new MatchEvaluator(EvaluateSystemVariable)); return re.Replace(str, new MatchEvaluator(EvaluateSystemVariable));
} }
@ -185,7 +185,15 @@ namespace WebsitePanel.Providers.Utils
private static string EvaluateSystemVariable(Match match) private static string EvaluateSystemVariable(Match match)
{ {
return Environment.GetEnvironmentVariable(match.Groups[1].Value); string EnvVar = Environment.GetEnvironmentVariable(match.Groups[1].Value);
if (string.IsNullOrEmpty(EnvVar))
{
return @"%" + match.Groups[1].Value + @"%";
}
else
{
return EnvVar;
}
} }
public static bool FileExists(string path) public static bool FileExists(string path)
@ -964,8 +972,7 @@ namespace WebsitePanel.Providers.Utils
catch catch
{ } { }
} }
#region Advanced Delete
#region Advanced Delete
/// <summary> /// <summary>
/// Deletes the specified file. /// Deletes the specified file.
/// </summary> /// </summary>