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

Merge

Browse source
This commit is contained in:
Virtuworks 2013-11-21 12:15:02 -05:00
commit 26c941dcef
2 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer/Default.aspx.cs
View file

@ -47,6 +47,9 @@ namespace WebsitePanel.AWStats.Viewer
{
private void Page_Load(object sender, EventArgs e)
{
string username = Request["username"];
string password = Request["password"];
if (Request.IsAuthenticated)
{
string identity = Context.User.Identity.Name;
@ -55,9 +58,21 @@ namespace WebsitePanel.AWStats.Viewer
if (String.Compare(Request["config"], domain, true) != 0)
{
FormsAuthentication.SignOut();
domain = Request["domain"];
if (!String.IsNullOrEmpty(domain)
&& !String.IsNullOrEmpty(username)
&& !String.IsNullOrEmpty(password))
{
// perform login
txtUsername.Text = username;
txtDomain.Text = domain;
Login(domain, username, password);
}
else
{
Response.Redirect(Request.Url.AbsolutePath);
}
}
Response.Clear();
string queryParams = Request.Url.Query;
@ -74,7 +89,6 @@ namespace WebsitePanel.AWStats.Viewer
// replace links
awStatsPage = awStatsPage.Replace(AWStatsScript, Request.Url.AbsolutePath);
Response.Write(awStatsPage);
Response.End();
@ -86,8 +100,6 @@ namespace WebsitePanel.AWStats.Viewer
if (!IsPostBack)
{
string domain = Request["domain"];
string username = Request["username"];
string password = Request["password"];
if (String.IsNullOrEmpty(domain))
domain = Request["config"];

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

@ -136,7 +136,7 @@ namespace WebsitePanel.Providers.Utils
if (String.IsNullOrEmpty(str))
return str;
Regex re = new Regex("%(.+)%", RegexOptions.IgnoreCase);
Regex re = new Regex("%([^\\s\\%]+)%", RegexOptions.IgnoreCase);
return re.Replace(str, new MatchEvaluator(EvaluateSystemVariable));
}
@ -185,7 +185,15 @@ namespace WebsitePanel.Providers.Utils
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)
@ -967,7 +975,6 @@ namespace WebsitePanel.Providers.Utils
catch
{ }
}
#region Advanced Delete
/// <summary>
/// Deletes the specified file.