From 0f073a74579bb5107c2d900502c30a3dbd10e116 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 6 May 2015 06:28:58 -0700
Subject: [PATCH 01/11] symbol regex fix

---
 .../CustomAttributes/OrganizationPasswordPolicyAttribute.cs    | 3 ++-
 .../appScripts/validation/passwordeditor.unobtrusive.js        | 2 +-
 .../Views/Account/PasswordResetFinalStep.cshtml                | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
index 6fea16be..9cffde91 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
 using WebsitePanel.Providers.HostedSolution;
@@ -53,9 +54,9 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes
 
                     if (settings.PasswordComplexityEnabled)
                     {
-                        var symbolsCount = valueString.Count(Char.IsSymbol);
                         var numbersCount = valueString.Count(Char.IsDigit);
                         var upperLetterCount = valueString.Count(Char.IsUpper);
+                        var symbolsCount = Regex.Matches(valueString, @"[~!@#$%^&*_\-+'\|\\(){}\[\]:;\""'<>,.?/]").Count;
 
                         if (upperLetterCount < settings.UppercaseLettersCount)
                         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
index 799b8f82..03d49e3e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
@@ -45,7 +45,7 @@ $.validator.addMethod("numberscount", function (value, element, count) {
 $.validator.unobtrusive.adapters.addSingleVal("symbolscount", "count");
 
 $.validator.addMethod("symbolscount", function (value, element, count) {
-    if (value.replace(/[a-zA-Z0-9_]/g, "").length < count) {
+    if (value.replace(/[^~!@#$%^&*_\-+'\|\\(){}\[\]:;\"'<>,.?/]/g, "").length < count) {
         
         return false;
     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
index 6432a19b..2d5abbbf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
@@ -8,7 +8,8 @@
 <div class="container row">
     @using (Html.BeginRouteForm(AccountRouteNames.PasswordResetFinalStep, FormMethod.Post, new { @class = "form-horizontal user-password-reset-final-step bs-val-styles col-lg-9 col-lg-offset-3", id = "user-password-reset" }))
     {
-
+        @Html.HiddenFor(x=>x.Login)
+        
         <div class="form-group">
             <h3>@UI.PasswordReset</h3>
         </div>

From e93d35405877fea76ffa4ef51d27155e3d1bf9b2 Mon Sep 17 00:00:00 2001
From: alexY2004 <devnull@localhost>
Date: Wed, 6 May 2015 17:03:18 +0300
Subject: [PATCH 02/11] Rollback 3339

---
 .../WebsitePanel/WebSitesEditSite.ascx.cs      | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
index 3f36fcf9..26502684 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
@@ -206,23 +206,7 @@ namespace WebsitePanel.Portal
                 {
                     lblSharedIP.Text = string.Format("({0})", ipsGeneral[0].ExternalIP);
                 }
-                else
-                {
-                    string[] settings = ES.Services.Servers.GetServiceSettings(site.ServiceId);
-                    foreach (string setting in settings)
-                    {
-                        int idx = setting.IndexOf('=');
-                        string option = setting.Substring(0, idx);
-                        if (String.Compare(option, "publicsharedip", true) == 0)
-                        {
-                            string res = setting.Substring(idx + 1);
-                            if (!String.IsNullOrEmpty(res))
-                                lblSharedIP.Text = string.Format("({0})", res);
-                            break;
-                        }
-                    }
-                }
-                lblSharedIP.Visible = !String.IsNullOrEmpty(lblSharedIP.Text);
+                lblSharedIP.Visible = generalIPExists;
             }
 
             dedicatedIP.Visible = site.IsDedicatedIP;

From e2e351bbf623b8e8bd2860deecc3d9a0be7b7bd3 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 6 May 2015 07:41:30 -0700
Subject: [PATCH 03/11] update_db.sql fixes

---
 WebsitePanel/Database/update_db.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 5126597e..f139c195 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -9607,6 +9607,8 @@ IF EXISTS (SELECT * FROM ResourceGroups WHERE GroupName = 'SharePoint')
 BEGIN
 	DECLARE @group_id INT
 	SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'SharePoint'
+	DELETE FROM PackageQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
+	DELETE FROM HostingPlanQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
 	DELETE FROM Providers WHERE GroupID = @group_id
 	DELETE FROM Quotas WHERE GroupID = @group_id
 	DELETE FROM VirtualGroups WHERE GroupID = @group_id

From 01daa1a293dab5e1642bd05a95c097e890721afb Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 10:44:30 -0400
Subject: [PATCH 04/11] Added tag build-2.1.0.704 for changeset 41fe22fe2adf


From 2e13fd4d165b253f9cdc80b6a62a5db16051b816 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 16:46:28 -0400
Subject: [PATCH 05/11] Added tag build-2.1.0.705 for changeset 205d8f91935e


From 4a45e05f07f08d52082a36f39fa957d1e3fcf615 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 20:20:09 -0400
Subject: [PATCH 06/11] Re-Style Webdav Portal

---
 .../Content/Site.css                          | 72 +++++++++++++++++++
 .../Views/FileSystem/_ResoursePartial.cshtml  |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index 2173c20a..2ab67ad3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -455,4 +455,76 @@ div#breadcrumb_wrapper a:last-child {
     .navbar-right {
         margin-right: 0;
     }
+}
+
+.navbar-inverse {
+  background-color: #F4F4F4;
+  border-color: #d4d4d4;
+  background: rgb(251,251,251);
+  background: -moz-linear-gradient(top, rgba(251,251,251,1) 0%, rgba(242,242,242,1) 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(251,251,251,1)), color-stop(100%,rgba(242,242,242,1)));
+  background: -webkit-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
+  background: -o-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
+  background: -ms-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
+  background: linear-gradient(to bottom, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fbfbfb', endColorstr='#f2f2f2',GradientType=0 );
+  -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-inverse .navbar-text, .navbar-inverse .navbar-brand, .navbar-text, #logout {
+  color: #565656;
+}
+
+.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .navbar-text:hover, #logout:hover {
+  color: #565656;
+  background-color: transparent;
+  opacity: 1;
+}
+
+div#breadcrumb_wrapper {
+   background-color: #F7F7F7;
+  border: 1px solid #d4d4d4;
+  margin-top: 9px;
+}
+.progress {  
+	height:21px;
+    
+	background-color: #ffffff;
+     border: 1px solid #BBBBBB;
+  border-radius: 3px!important;  
+}
+.progress-bar {
+	background-color: #F4C18F;
+	-webkit-box-shadow: none; 
+	box-shadow: none; 
+}
+body {
+  background-color: #FAFAFA;
+}
+p.progress-text {
+  position: absolute;
+  left: 44%;  
+  color: #515151;
+}
+p.resource-subtext {
+  color: #AEAEAE;
+}
+#logout :hover {
+  color: #333;
+}
+
+.file-link:hover {
+  text-decoration:none;
+}
+.file-link p {
+  color: #818181;
+  font-size: 13pt;
+}
+.file-link p:hover {
+  color: #333!important;
+}
+.icon-size {
+  width: 60px;
+  height: 60px;
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
index 9285872a..9f5dbcdc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
@@ -64,7 +64,7 @@
                     <p class="progress-text">@percent%</p>
                 </div>
             </div>
-            <p>@ViewDataHelper.BytesToSize(resource.ContentLength) / @ViewDataHelper.BytesToSize(resource.AllocatedSpace)</p>
+            <p class="resource-subtext">@ViewDataHelper.BytesToSize(resource.ContentLength) / @ViewDataHelper.BytesToSize(resource.AllocatedSpace)</p>
         }
 
         <div class="selected-element-overlay">

From 4be06211a44723d9017e45032ea69e672da845c8 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 20:34:00 -0400
Subject: [PATCH 07/11] Added tag build-2.1.0.706 for changeset 9577939ee17a


From 3c7cc2fc8c5e860fa3a73e84832339aa3c9357cd Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 21:38:19 -0400
Subject: [PATCH 08/11] Update Webdav Portal Logo

---
 .../Content/Images/logo.png                   | Bin 6045 -> 6205 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png
index 8db3bf628312588c512b6d06272d3562ed109d67..bf543851b73a0f0231c68129942f7fea00524985 100644
GIT binary patch
delta 5482
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

delta 5332
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


From 253238b6f986b6ece291ac1c94487f5188886d9b Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 6 May 2015 21:50:23 -0400
Subject: [PATCH 09/11] Added tag build-2.1.0.707 for changeset 16aa24360497


From e9be91a97c803d22cfb48ad89e1d538f376040a1 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 7 May 2015 02:02:04 -0700
Subject: [PATCH 10/11] update_db.sql fixes

---
 WebsitePanel/Database/update_db.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index f139c195..72d95c43 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -9609,6 +9609,11 @@ BEGIN
 	SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'SharePoint'
 	DELETE FROM PackageQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
 	DELETE FROM HostingPlanQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
+	DELETE FROM HostingPlanResources WHERE GroupId = @group_id
+	DELETE FROM PackagesBandwidth WHERE GroupId = @group_id
+	DELETE FROM PackagesDiskspace WHERE GroupId = @group_id
+	DELETE FROM PackageResources WHERE GroupId = @group_id
+	DELETE FROM ResourceGroupDnsRecords WHERE GroupId = @group_id
 	DELETE FROM Providers WHERE GroupID = @group_id
 	DELETE FROM Quotas WHERE GroupID = @group_id
 	DELETE FROM VirtualGroups WHERE GroupID = @group_id

From 5bc6de2f5ec3e29f09f96b2b3864da74273d9b75 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 7 May 2015 13:39:11 -0400
Subject: [PATCH 11/11] Added tag build-2.1.0.708 for changeset 97a9a9f34040