From 736e83746f904a4f2158f6ac7beb64bec153de09 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Thu, 16 Apr 2015 07:18:14 -0700 Subject: [PATCH] password reset fixes --- WebsitePanel/Database/update_db.sql | 27 +- .../Controllers/AccountController.cs | 1 - .../OrganizationPasswordPolicyAttribute.cs | 61 ++- .../UniqueAdPhoneNumberAttribute.cs | 26 +- .../Resources/UI.Designer.cs | 11 +- .../Resources/UI.resx | 5 +- .../Views/Account/PasswordResetEmail.cshtml | 2 +- .../Account/PasswordResetEmailSent.cshtml | 6 +- .../EditorTemplates/CountrySelector.cshtml | 496 +++++++++--------- .../WebsitePanel.Portal.Modules.csproj | 2 - 10 files changed, 318 insertions(+), 319 deletions(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index c1a8d1fa..6aceeec6 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -10152,21 +10152,20 @@ GO -- ORGANIZATION SETTINGS -IF EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'ExchangeOrganizationSettings') -DROP TABLE ExchangeOrganizationSettings -GO -CREATE TABLE ExchangeOrganizationSettings -( - ItemId INT NOT NULL, - SettingsName nvarchar(100) NOT NULL, - Xml nvarchar(max) NOT NULL -) -GO +IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'ExchangeOrganizationSettings') +BEGIN + CREATE TABLE ExchangeOrganizationSettings + ( + ItemId INT NOT NULL, + SettingsName nvarchar(100) NOT NULL, + Xml nvarchar(max) NOT NULL + ); + + ALTER TABLE [dbo].[ExchangeOrganizationSettings] WITH CHECK ADD CONSTRAINT [FK_ExchangeOrganizationSettings_ExchangeOrganizations_ItemId] FOREIGN KEY([ItemId]) + REFERENCES [dbo].[ExchangeOrganizations] ([ItemId]) + ON DELETE CASCADE; +END -ALTER TABLE [dbo].[ExchangeOrganizationSettings] WITH CHECK ADD CONSTRAINT [FK_ExchangeOrganizationSettings_ExchangeOrganizations_ItemId] FOREIGN KEY([ItemId]) -REFERENCES [dbo].[ExchangeOrganizations] ([ItemId]) -ON DELETE CASCADE -GO diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs index 8a271672..f326b353 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs @@ -113,7 +113,6 @@ namespace WebsitePanel.WebDavPortal.Controllers public ActionResult PasswordChange() { var model = new PasswordChangeModel(); - model.PasswordEditor.Settings = WspContext.Services.Organizations.GetOrganizationPasswordSettings(WspContext.User.ItemId); return View(model); } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs index 1bd6c7c6..6fea16be 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs @@ -13,23 +13,18 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)] public class OrganizationPasswordPolicyAttribute : ValidationAttribute, IClientValidatable { - public OrganizationPasswordSettings Settings { get; private set; } + public int ItemId { get; private set; } public OrganizationPasswordPolicyAttribute() { - int itemId = -1; - if (WspContext.User != null) { - itemId = WspContext.User.ItemId; + ItemId = WspContext.User.ItemId; } else if (HttpContext.Current != null && HttpContext.Current.Session[WebDavAppConfigManager.Instance.SessionKeys.ItemId] != null) { - itemId = (int) HttpContext.Current.Session[WebDavAppConfigManager.Instance.SessionKeys.ItemId]; + ItemId = (int)HttpContext.Current.Session[WebDavAppConfigManager.Instance.SessionKeys.ItemId]; } - - - Settings = WspContext.Services.Organizations.GetOrganizationPasswordSettings(itemId); } protected override ValidationResult IsValid(object value, ValidationContext validationContext) @@ -38,44 +33,46 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes { var resultMessages = new List(); - if (Settings != null) + var settings = WspContext.Services.Organizations.GetOrganizationPasswordSettings(ItemId); + + if (settings != null) { var valueString = value.ToString(); - if (valueString.Length < Settings.MinimumLength) + if (valueString.Length < settings.MinimumLength) { resultMessages.Add(string.Format(Resources.Messages.PasswordMinLengthFormat, - Settings.MinimumLength)); + settings.MinimumLength)); } - if (valueString.Length > Settings.MaximumLength) + if (valueString.Length > settings.MaximumLength) { resultMessages.Add(string.Format(Resources.Messages.PasswordMaxLengthFormat, - Settings.MaximumLength)); + settings.MaximumLength)); } - if (Settings.PasswordComplexityEnabled) + if (settings.PasswordComplexityEnabled) { var symbolsCount = valueString.Count(Char.IsSymbol); var numbersCount = valueString.Count(Char.IsDigit); var upperLetterCount = valueString.Count(Char.IsUpper); - if (upperLetterCount < Settings.UppercaseLettersCount) + if (upperLetterCount < settings.UppercaseLettersCount) { resultMessages.Add(string.Format(Resources.Messages.PasswordUppercaseCountFormat, - Settings.UppercaseLettersCount)); + settings.UppercaseLettersCount)); } - if (numbersCount < Settings.NumbersCount) + if (numbersCount < settings.NumbersCount) { resultMessages.Add(string.Format(Resources.Messages.PasswordNumbersCountFormat, - Settings.NumbersCount)); + settings.NumbersCount)); } - if (symbolsCount < Settings.SymbolsCount) + if (symbolsCount < settings.SymbolsCount) { resultMessages.Add(string.Format(Resources.Messages.PasswordSymbolsCountFormat, - Settings.SymbolsCount)); + settings.SymbolsCount)); } } @@ -89,44 +86,46 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes public IEnumerable GetClientValidationRules(ModelMetadata metadata, ControllerContext context) { + var settings = WspContext.Services.Organizations.GetOrganizationPasswordSettings(ItemId); + var rule = new ModelClientValidationRule(); - rule.ErrorMessage = string.Format(Resources.Messages.PasswordMinLengthFormat, Settings.MinimumLength); - rule.ValidationParameters.Add("count", Settings.MinimumLength); + rule.ErrorMessage = string.Format(Resources.Messages.PasswordMinLengthFormat, settings.MinimumLength); + rule.ValidationParameters.Add("count", settings.MinimumLength); rule.ValidationType = "minimumlength"; yield return rule; rule = new ModelClientValidationRule(); - rule.ErrorMessage = string.Format(Resources.Messages.PasswordMaxLengthFormat, Settings.MaximumLength); - rule.ValidationParameters.Add("count", Settings.MaximumLength); + rule.ErrorMessage = string.Format(Resources.Messages.PasswordMaxLengthFormat, settings.MaximumLength); + rule.ValidationParameters.Add("count", settings.MaximumLength); rule.ValidationType = "maximumlength"; yield return rule; - if (Settings.PasswordComplexityEnabled) + if (settings.PasswordComplexityEnabled) { rule = new ModelClientValidationRule(); - rule.ErrorMessage = string.Format(Resources.Messages.PasswordUppercaseCountFormat, Settings.UppercaseLettersCount); - rule.ValidationParameters.Add("count", Settings.UppercaseLettersCount); + rule.ErrorMessage = string.Format(Resources.Messages.PasswordUppercaseCountFormat, settings.UppercaseLettersCount); + rule.ValidationParameters.Add("count", settings.UppercaseLettersCount); rule.ValidationType = "uppercasecount"; yield return rule; rule = new ModelClientValidationRule(); - rule.ErrorMessage = string.Format(Resources.Messages.PasswordNumbersCountFormat, Settings.NumbersCount); - rule.ValidationParameters.Add("count", Settings.NumbersCount); + rule.ErrorMessage = string.Format(Resources.Messages.PasswordNumbersCountFormat, settings.NumbersCount); + rule.ValidationParameters.Add("count", settings.NumbersCount); rule.ValidationType = "numberscount"; yield return rule; rule = new ModelClientValidationRule(); - rule.ErrorMessage = string.Format(Resources.Messages.PasswordSymbolsCountFormat, Settings.SymbolsCount); - rule.ValidationParameters.Add("count", Settings.SymbolsCount); + rule.ErrorMessage = string.Format(Resources.Messages.PasswordSymbolsCountFormat, settings.SymbolsCount); + rule.ValidationParameters.Add("count", settings.SymbolsCount); rule.ValidationType = "symbolscount"; yield return rule; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/UniqueAdPhoneNumberAttribute.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/UniqueAdPhoneNumberAttribute.cs index a63d5b14..fe28bdd7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/UniqueAdPhoneNumberAttribute.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/UniqueAdPhoneNumberAttribute.cs @@ -16,25 +16,9 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes protected override ValidationResult IsValid(object value, ValidationContext validationContext) { - Type type = Assembly.GetExecutingAssembly() - .GetTypes() - .FirstOrDefault(validationtype => validationtype.Name == string.Format("{0}controller", this.RouteData["controller"].ToString())); + var valueString = value as string; - object response = null; - - if (type != null) - { - MethodInfo method = type.GetMethods() - .FirstOrDefault(callingMethod => callingMethod.Name.ToLower() == (string.Format("{0}", this.RouteData["action"]).ToString().ToLower())); - - if (method != null) - { - object instance = Activator.CreateInstance(type); - response = method.Invoke(instance, new [] { value }); - } - } - - if (response is bool) + if (!string.IsNullOrEmpty(valueString) && WspContext.User != null) { var attributes = validationContext.ObjectType.GetProperty(validationContext.MemberName) @@ -45,11 +29,13 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes : validationContext.DisplayName; - return (bool)response ? ValidationResult.Success : + var result = !WspContext.Services.Organizations.CheckPhoneNumberIsInUse(WspContext.User.ItemId, valueString, WspContext.User.Login); + + return result ? ValidationResult.Success : new ValidationResult(string.Format(Resources.Messages.AlreadyInUse, displayName)); } - return ValidationResult.Success; + return ValidationResult.Success; } public UniqueAdPhoneNumberAttribute(string routeName) : base(routeName) { } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs index 4e51b301..2be5ffa9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs @@ -465,6 +465,15 @@ namespace WebsitePanel.WebDavPortal.Resources { } } + /// + /// Looks up a localized string similar to Login. + /// + public static string Login { + get { + return ResourceManager.GetString("Login", resourceCulture); + } + } + /// /// Looks up a localized string similar to Login name. /// @@ -628,7 +637,7 @@ namespace WebsitePanel.WebDavPortal.Resources { } /// - /// Looks up a localized string similar to Enter your email address to reset your password. You may need to check your spam folder.. + /// Looks up a localized string similar to Enter your login and password reset email will be sent to your email address. You may need to check your spam folder.. /// public static string PasswordResetEmailInfo { get { diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx index 3f90438f..4a6fca4c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx @@ -385,9 +385,12 @@ Zip/Postal Code - Enter your email address to reset your password. You may need to check your spam folder. + Enter your login and password reset email will be sent to your email address. You may need to check your spam folder. Try again + + Login + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmail.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmail.cshtml index f481230c..fca5271d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmail.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmail.cshtml @@ -15,7 +15,7 @@
- @Html.TextBoxFor(x => x.Email, new { @class = "form-control", placeholder = UI.Email }) + @Html.TextBoxFor(x => x.Email, new { @class = "form-control", placeholder = UI.Login }) @Html.ValidationMessageFor(x => x.Email)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmailSent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmailSent.cshtml index 7455f688..f67ded08 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmailSent.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetEmailSent.cshtml @@ -6,9 +6,13 @@
+

@UI.PasswordReset

-

@Messages.PasswordResetEmailSent

+
+ +
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/EditorTemplates/CountrySelector.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/EditorTemplates/CountrySelector.cshtml index 34e18c14..d39c994d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/EditorTemplates/CountrySelector.cshtml +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/EditorTemplates/CountrySelector.cshtml @@ -4,19 +4,255 @@ @{ List listItems = new List { - new SelectListItem {Text = "Afghanistan", Value = "AF"}, - new SelectListItem {Text = "Aland Islands", Value = "AX"}, - new SelectListItem {Text = "Algeria", Value = "DZ"}, - new SelectListItem {Text = "American Samoa", Value = "AS"}, - new SelectListItem {Text = "Andorra", Value = "AD"}, - new SelectListItem {Text = "Angola", Value = "AO"}, - new SelectListItem {Text = "Anguilla", Value = "AI"}, - new SelectListItem {Text = "Antarctica", Value = "AQ"}, - new SelectListItem {Text = "Antigua and Barbuda", Value = "AG"}, - new SelectListItem {Text = "Argentina", Value = "AR"}, - new SelectListItem {Text = "Armenia", Value = "AM"}, - new SelectListItem {Text = "Aruba", Value = "AW"}, - new SelectListItem {Text = "Australia", Value = "AU"}, + new SelectListItem { Value = "AF", Text = "AFGHANISTAN"}, + new SelectListItem { Value = "AX", Text = "ÅLAND ISLANDS"}, + new SelectListItem { Value = "AL", Text = "ALBANIA"}, + new SelectListItem { Value = "DZ", Text = "ALGERIA"}, + new SelectListItem { Value = "AS", Text = "AMERICAN SAMOA"}, + new SelectListItem { Value = "AD", Text = "ANDORRA"}, + new SelectListItem { Value = "AO", Text = "ANGOLA"}, + new SelectListItem { Value = "AI", Text = "ANGUILLA"}, + new SelectListItem { Value = "AQ", Text = "ANTARCTICA"}, + new SelectListItem { Value = "AG", Text = "ANTIGUA AND BARBUDA"}, + new SelectListItem { Value = "AR", Text = "ARGENTINA"}, + new SelectListItem { Value = "AM", Text = "ARMENIA"}, + new SelectListItem { Value = "AW", Text = "ARUBA"}, + new SelectListItem { Value = "AU", Text = "AUSTRALIA"}, + new SelectListItem { Value = "AT", Text = "AUSTRIA"}, + new SelectListItem { Value = "AZ", Text = "AZERBAIJAN"}, + new SelectListItem { Value = "BS", Text = "BAHAMAS"}, + new SelectListItem { Value = "BH", Text = "BAHRAIN"}, + new SelectListItem { Value = "BD", Text = "BANGLADESH"}, + new SelectListItem { Value = "BB", Text = "BARBADOS"}, + new SelectListItem { Value = "BY", Text = "BELARUS"}, + new SelectListItem { Value = "BE", Text = "BELGIUM"}, + new SelectListItem { Value = "BZ", Text = "BELIZE"}, + new SelectListItem { Value = "BJ", Text = "BENIN"}, + new SelectListItem { Value = "BM", Text = "BERMUDA"}, + new SelectListItem { Value = "BT", Text = "BHUTAN"}, + new SelectListItem { Value = "BO", Text = "BOLIVIA, PLURINATIONAL STATE OF"}, + new SelectListItem { Value = "BQ", Text = "BONAIRE, SINT EUSTATIUS AND SABA"}, + new SelectListItem { Value = "BA", Text = "BOSNIA AND HERZEGOVINA"}, + new SelectListItem { Value = "BW", Text = "BOTSWANA"}, + new SelectListItem { Value = "BV", Text = "BOUVET ISLAND"}, + new SelectListItem { Value = "BR", Text = "BRAZIL"}, + new SelectListItem { Value = "IO", Text = "BRITISH INDIAN OCEAN TERRITORY"}, + new SelectListItem { Value = "BN", Text = "BRUNEI DARUSSALAM"}, + new SelectListItem { Value = "BG", Text = "BULGARIA"}, + new SelectListItem { Value = "BF", Text = "BURKINA FASO"}, + new SelectListItem { Value = "BI", Text = "BURUNDI"}, + new SelectListItem { Value = "KH", Text = "CAMBODIA"}, + new SelectListItem { Value = "CM", Text = "CAMEROON"}, + new SelectListItem { Value = "CA", Text = "CANADA"}, + new SelectListItem { Value = "CV", Text = "CAPE VERDE"}, + new SelectListItem { Value = "KY", Text = "CAYMAN ISLANDS"}, + new SelectListItem { Value = "CF", Text = "CENTRAL AFRICAN REPUBLIC"}, + new SelectListItem { Value = "TD", Text = "CHAD"}, + new SelectListItem { Value = "CL", Text = "CHILE"}, + new SelectListItem { Value = "CN", Text = "CHINA"}, + new SelectListItem { Value = "CX", Text = "CHRISTMAS ISLAND"}, + new SelectListItem { Value = "CC", Text = "COCOS (KEELING) ISLANDS"}, + new SelectListItem { Value = "CO", Text = "COLOMBIA"}, + new SelectListItem { Value = "KM", Text = "COMOROS"}, + new SelectListItem { Value = "CG", Text = "CONGO"}, + new SelectListItem { Value = "CD", Text = "CONGO, THE DEMOCRATIC REPUBLIC OF THE"}, + new SelectListItem { Value = "CK", Text = "COOK ISLANDS"}, + new SelectListItem { Value = "CR", Text = "COSTA RICA"}, + new SelectListItem { Value = "CI", Text = "CÔTE D'IVOIRE"}, + new SelectListItem { Value = "HR", Text = "CROATIA"}, + new SelectListItem { Value = "CU", Text = "CUBA"}, + new SelectListItem { Value = "CW", Text = "CURAÇAO"}, + new SelectListItem { Value = "CY", Text = "CYPRUS"}, + new SelectListItem { Value = "CZ", Text = "CZECH REPUBLIC"}, + new SelectListItem { Value = "DK", Text = "DENMARK"}, + new SelectListItem { Value = "DJ", Text = "DJIBOUTI"}, + new SelectListItem { Value = "DM", Text = "DOMINICA"}, + new SelectListItem { Value = "DO", Text = "DOMINICAN REPUBLIC"}, + new SelectListItem { Value = "EC", Text = "ECUADOR"}, + new SelectListItem { Value = "EG", Text = "EGYPT"}, + new SelectListItem { Value = "SV", Text = "EL SALVADOR"}, + new SelectListItem { Value = "GQ", Text = "EQUATORIAL GUINEA"}, + new SelectListItem { Value = "ER", Text = "ERITREA"}, + new SelectListItem { Value = "EE", Text = "ESTONIA"}, + new SelectListItem { Value = "ET", Text = "ETHIOPIA"}, + new SelectListItem { Value = "FK", Text = "FALKLAND ISLANDS (MALVINAS)"}, + new SelectListItem { Value = "FO", Text = "FAROE ISLANDS"}, + new SelectListItem { Value = "FJ", Text = "FIJI"}, + new SelectListItem { Value = "FI", Text = "FINLAND"}, + new SelectListItem { Value = "FR", Text = "FRANCE"}, + new SelectListItem { Value = "GF", Text = "FRENCH GUIANA"}, + new SelectListItem { Value = "PF", Text = "FRENCH POLYNESIA"}, + new SelectListItem { Value = "TF", Text = "FRENCH SOUTHERN TERRITORIES"}, + new SelectListItem { Value = "GA", Text = "GABON"}, + new SelectListItem { Value = "GM", Text = "GAMBIA"}, + new SelectListItem { Value = "GE", Text = "GEORGIA"}, + new SelectListItem { Value = "DE", Text = "GERMANY"}, + new SelectListItem { Value = "GH", Text = "GHANA"}, + new SelectListItem { Value = "GI", Text = "GIBRALTAR"}, + new SelectListItem { Value = "GR", Text = "GREECE"}, + new SelectListItem { Value = "GL", Text = "GREENLAND"}, + new SelectListItem { Value = "GD", Text = "GRENADA"}, + new SelectListItem { Value = "GP", Text = "GUADELOUPE"}, + new SelectListItem { Value = "GU", Text = "GUAM"}, + new SelectListItem { Value = "GT", Text = "GUATEMALA"}, + new SelectListItem { Value = "GG", Text = "GUERNSEY"}, + new SelectListItem { Value = "GN", Text = "GUINEA"}, + new SelectListItem { Value = "GW", Text = "GUINEA-BISSAU"}, + new SelectListItem { Value = "GY", Text = "GUYANA"}, + new SelectListItem { Value = "HT", Text = "HAITI"}, + new SelectListItem { Value = "HM", Text = "HEARD ISLAND AND MCDONALD ISLANDS"}, + new SelectListItem { Value = "VA", Text = "HOLY SEE (VATICAN CITY STATE)"}, + new SelectListItem { Value = "HN", Text = "HONDURAS"}, + new SelectListItem { Value = "HK", Text = "HONG KONG"}, + new SelectListItem { Value = "HU", Text = "HUNGARY"}, + new SelectListItem { Value = "IS", Text = "ICELAND"}, + new SelectListItem { Value = "IN", Text = "INDIA"}, + new SelectListItem { Value = "ID", Text = "INDONESIA"}, + new SelectListItem { Value = "IR", Text = "IRAN, ISLAMIC REPUBLIC OF"}, + new SelectListItem { Value = "IQ", Text = "IRAQ"}, + new SelectListItem { Value = "IE", Text = "IRELAND"}, + new SelectListItem { Value = "IM", Text = "ISLE OF MAN"}, + new SelectListItem { Value = "IL", Text = "ISRAEL"}, + new SelectListItem { Value = "IT", Text = "ITALY"}, + new SelectListItem { Value = "JM", Text = "JAMAICA"}, + new SelectListItem { Value = "JP", Text = "JAPAN"}, + new SelectListItem { Value = "JE", Text = "JERSEY"}, + new SelectListItem { Value = "JO", Text = "JORDAN"}, + new SelectListItem { Value = "KZ", Text = "KAZAKHSTAN"}, + new SelectListItem { Value = "KE", Text = "KENYA"}, + new SelectListItem { Value = "KI", Text = "KIRIBATI"}, + new SelectListItem { Value = "KP", Text = "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"}, + new SelectListItem { Value = "KR", Text = "KOREA, REPUBLIC OF"}, + new SelectListItem { Value = "KW", Text = "KUWAIT"}, + new SelectListItem { Value = "KG", Text = "KYRGYZSTAN"}, + new SelectListItem { Value = "LA", Text = "LAO PEOPLE'S DEMOCRATIC REPUBLIC"}, + new SelectListItem { Value = "LV", Text = "LATVIA"}, + new SelectListItem { Value = "LB", Text = "LEBANON"}, + new SelectListItem { Value = "LS", Text = "LESOTHO"}, + new SelectListItem { Value = "LR", Text = "LIBERIA"}, + new SelectListItem { Value = "LY", Text = "LIBYA"}, + new SelectListItem { Value = "LI", Text = "LIECHTENSTEIN"}, + new SelectListItem { Value = "LT", Text = "LITHUANIA"}, + new SelectListItem { Value = "LU", Text = "LUXEMBOURG"}, + new SelectListItem { Value = "MO", Text = "MACAO"}, + new SelectListItem { Value = "MK", Text = "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"}, + new SelectListItem { Value = "MG", Text = "MADAGASCAR"}, + new SelectListItem { Value = "MW", Text = "MALAWI"}, + new SelectListItem { Value = "MY", Text = "MALAYSIA"}, + new SelectListItem { Value = "MV", Text = "MALDIVES"}, + new SelectListItem { Value = "ML", Text = "MALI"}, + new SelectListItem { Value = "MT", Text = "MALTA"}, + new SelectListItem { Value = "MH", Text = "MARSHALL ISLANDS"}, + new SelectListItem { Value = "MQ", Text = "MARTINIQUE"}, + new SelectListItem { Value = "MR", Text = "MAURITANIA"}, + new SelectListItem { Value = "MU", Text = "MAURITIUS"}, + new SelectListItem { Value = "YT", Text = "MAYOTTE"}, + new SelectListItem { Value = "MX", Text = "MEXICO"}, + new SelectListItem { Value = "FM", Text = "MICRONESIA, FEDERATED STATES OF"}, + new SelectListItem { Value = "MD", Text = "MOLDOVA, REPUBLIC OF"}, + new SelectListItem { Value = "MC", Text = "MONACO"}, + new SelectListItem { Value = "MN", Text = "MONGOLIA"}, + new SelectListItem { Value = "ME", Text = "MONTENEGRO"}, + new SelectListItem { Value = "MS", Text = "MONTSERRAT"}, + new SelectListItem { Value = "MA", Text = "MOROCCO"}, + new SelectListItem { Value = "MZ", Text = "MOZAMBIQUE"}, + new SelectListItem { Value = "MM", Text = "MYANMAR"}, + new SelectListItem { Value = "NA", Text = "NAMIBIA"}, + new SelectListItem { Value = "NR", Text = "NAURU"}, + new SelectListItem { Value = "NP", Text = "NEPAL"}, + new SelectListItem { Value = "NL", Text = "NETHERLANDS"}, + new SelectListItem { Value = "NC", Text = "NEW CALEDONIA"}, + new SelectListItem { Value = "NZ", Text = "NEW ZEALAND"}, + new SelectListItem { Value = "NI", Text = "NICARAGUA"}, + new SelectListItem { Value = "NE", Text = "NIGER"}, + new SelectListItem { Value = "NG", Text = "NIGERIA"}, + new SelectListItem { Value = "NU", Text = "NIUE"}, + new SelectListItem { Value = "NF", Text = "NORFOLK ISLAND"}, + new SelectListItem { Value = "MP", Text = "NORTHERN MARIANA ISLANDS"}, + new SelectListItem { Value = "NO", Text = "NORWAY"}, + new SelectListItem { Value = "OM", Text = "OMAN"}, + new SelectListItem { Value = "PK", Text = "PAKISTAN"}, + new SelectListItem { Value = "PW", Text = "PALAU"}, + new SelectListItem { Value = "PS", Text = "PALESTINIAN TERRITORY, OCCUPIED"}, + new SelectListItem { Value = "PA", Text = "PANAMA"}, + new SelectListItem { Value = "PG", Text = "PAPUA NEW GUINEA"}, + new SelectListItem { Value = "PY", Text = "PARAGUAY"}, + new SelectListItem { Value = "PE", Text = "PERU"}, + new SelectListItem { Value = "PH", Text = "PHILIPPINES"}, + new SelectListItem { Value = "PN", Text = "PITCAIRN"}, + new SelectListItem { Value = "PL", Text = "POLAND"}, + new SelectListItem { Value = "PT", Text = "PORTUGAL"}, + new SelectListItem { Value = "PR", Text = "PUERTO RICO"}, + new SelectListItem { Value = "QA", Text = "QATAR"}, + new SelectListItem { Value = "RE", Text = "RÉUNION"}, + new SelectListItem { Value = "RO", Text = "ROMANIA"}, + new SelectListItem { Value = "RU", Text = "RUSSIAN FEDERATION"}, + new SelectListItem { Value = "RW", Text = "RWANDA"}, + new SelectListItem { Value = "BL", Text = "SAINT BARTHÉLEMY"}, + new SelectListItem { Value = "SH", Text = "SAINT HELENA, ASCENSION AND TRISTAN DA CUNHA"}, + new SelectListItem { Value = "KN", Text = "SAINT KITTS AND NEVIS"}, + new SelectListItem { Value = "LC", Text = "SAINT LUCIA"}, + new SelectListItem { Value = "MF", Text = "SAINT MARTIN (FRENCH PART)"}, + new SelectListItem { Value = "PM", Text = "SAINT PIERRE AND MIQUELON"}, + new SelectListItem { Value = "VC", Text = "SAINT VINCENT AND THE GRENADINES"}, + new SelectListItem { Value = "WS", Text = "SAMOA"}, + new SelectListItem { Value = "SM", Text = "SAN MARINO"}, + new SelectListItem { Value = "ST", Text = "SAO TOME AND PRINCIPE"}, + new SelectListItem { Value = "SA", Text = "SAUDI ARABIA"}, + new SelectListItem { Value = "SN", Text = "SENEGAL"}, + new SelectListItem { Value = "RS", Text = "SERBIA"}, + new SelectListItem { Value = "SC", Text = "SEYCHELLES"}, + new SelectListItem { Value = "SL", Text = "SIERRA LEONE"}, + new SelectListItem { Value = "SG", Text = "SINGAPORE"}, + new SelectListItem { Value = "SX", Text = "SINT MAARTEN (DUTCH PART)"}, + new SelectListItem { Value = "SK", Text = "SLOVAKIA"}, + new SelectListItem { Value = "SI", Text = "SLOVENIA"}, + new SelectListItem { Value = "SB", Text = "SOLOMON ISLANDS"}, + new SelectListItem { Value = "SO", Text = "SOMALIA"}, + new SelectListItem { Value = "ZA", Text = "SOUTH AFRICA"}, + new SelectListItem { Value = "GS", Text = "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"}, + new SelectListItem { Value = "SS", Text = "SOUTH SUDAN"}, + new SelectListItem { Value = "ES", Text = "SPAIN"}, + new SelectListItem { Value = "LK", Text = "SRI LANKA"}, + new SelectListItem { Value = "SD", Text = "SUDAN"}, + new SelectListItem { Value = "SR", Text = "SURINAME"}, + new SelectListItem { Value = "SJ", Text = "SVALBARD AND JAN MAYEN"}, + new SelectListItem { Value = "SZ", Text = "SWAZILAND"}, + new SelectListItem { Value = "SE", Text = "SWEDEN"}, + new SelectListItem { Value = "CH", Text = "SWITZERLAND"}, + new SelectListItem { Value = "SY", Text = "SYRIAN ARAB REPUBLIC"}, + new SelectListItem { Value = "TW", Text = "TAIWAN, PROVINCE OF CHINA"}, + new SelectListItem { Value = "TJ", Text = "TAJIKISTAN"}, + new SelectListItem { Value = "TZ", Text = "TANZANIA, UNITED REPUBLIC OF"}, + new SelectListItem { Value = "TH", Text = "THAILAND"}, + new SelectListItem { Value = "TL", Text = "TIMOR-LESTE"}, + new SelectListItem { Value = "TG", Text = "TOGO"}, + new SelectListItem { Value = "TK", Text = "TOKELAU"}, + new SelectListItem { Value = "TO", Text = "TONGA"}, + new SelectListItem { Value = "TT", Text = "TRINIDAD AND TOBAGO"}, + new SelectListItem { Value = "TN", Text = "TUNISIA"}, + new SelectListItem { Value = "TR", Text = "TURKEY"}, + new SelectListItem { Value = "TM", Text = "TURKMENISTAN"}, + new SelectListItem { Value = "TC", Text = "TURKS AND CAICOS ISLANDS"}, + new SelectListItem { Value = "TV", Text = "TUVALU"}, + new SelectListItem { Value = "UG", Text = "UGANDA"}, + new SelectListItem { Value = "UA", Text = "UKRAINE"}, + new SelectListItem { Value = "AE", Text = "UNITED ARAB EMIRATES"}, + new SelectListItem { Value = "GB", Text = "UNITED KINGDOM"}, + new SelectListItem { Value = "US", Text = "UNITED STATES"}, + new SelectListItem { Value = "UM", Text = "UNITED STATES MINOR OUTLYING ISLANDS"}, + new SelectListItem { Value = "UY", Text = "URUGUAY"}, + new SelectListItem { Value = "UZ", Text = "UZBEKISTAN"}, + new SelectListItem { Value = "VU", Text = "VANUATU"}, + new SelectListItem { Value = "VE", Text = "VENEZUELA, BOLIVARIAN REPUBLIC OF"}, + new SelectListItem { Value = "VN", Text = "VIET NAM"}, + new SelectListItem { Value = "VG", Text = "VIRGIN ISLANDS, BRITISH"}, + new SelectListItem { Value = "VI", Text = "VIRGIN ISLANDS, U.S."}, + new SelectListItem { Value = "WF", Text = "WALLIS AND FUTUNA"}, + new SelectListItem { Value = "EH", Text = "WESTERN SAHARA"}, + new SelectListItem { Value = "YE", Text = "YEMEN"}, + new SelectListItem { Value = "ZM", Text = "ZAMBIA"}, + new SelectListItem { Value = "ZW", Text = "ZIMBABWE"}, }; var selectedItem = listItems.FirstOrDefault(x => x.Value == Model); @@ -25,240 +261,6 @@ { selectedItem.Selected = true; } - - @*Austria - Azerbaijan - Bahamas - Bahrain - Bangladesh - Barbados - Belarus - Belgium - Belize - Benin - Bermuda - Bhutan - Bolivia, Plurinational State of - Bosnia and Herzegovina - Botswana - Bouvet Island - Brazil - British Indian Ocean Territory - Brunei Darussalam - Bulgaria - Burkina Faso - Burundi - Cambodia - Cameroon - Canada - Cape Verde - Cayman Islands - Central African Republic - Chad - Chile - China - Christmas Island - Cocos (Keeling) Islands - Colombia - Comoros - Congo - Congo, the Democratic Republic of the - Cook Islands - Costa Rica - Cote D'Ivoire - Croatia - Cuba - Cyprus - Czech Republic - Denmark - Djibouti - Dominica - Dominican Republic - Ecuador - Egypt - El Salvador - Equatorial Guinea - Eritrea - Estonia - Ethiopia - Falkland Islands (Malvinas) - Faroe Islands - Fiji - Finland - France - French Guiana - French Polynesia - French Southern Territories - Gabon - Gambia - Georgia - Germany - Ghana - Gibraltar - Greece - Greenland - Grenada - Guadeloupe - Guam - Guatemala - Guernsey - Guinea - Guinea-Bissau - Guyana - Haiti - Heard Island and Mcdonald Islands - Holy See (Vatican City State) - Honduras - Hong Kong - Hungary - Iceland - India - Indonesia - Iran, Islamic Republic of - Iraq - Ireland - Isle of Man - Israel - Italy - Jamaica - Japan - Jersey - Jordan - Kazakhstan - Kenya - Kiribati - Korea, Democratic People's Republic of - Korea, Republic of - Kuwait - Kyrgyzstan - Lao People's Democratic Republic - Latvia - Lebanon - Lesotho - Liberia - Libyan Arab Jamahiriya - Liechtenstein - Lithuania - Luxembourg - Macao - Macedonia, the Former Yugoslav Republic of - Madagascar - Malawi - Malaysia - Maldives - Mali - Malta - Marshall Islands - Martinique - Mauritania - Mauritius - Mayotte - Mexico - Micronesia, Federated States of - Moldova, Republic of - Monaco - Mongolia - Montenegro - Montserrat - Morocco - Mozambique - Myanmar - Namibia - Nauru - Nepal - Netherlands - Netherlands Antilles - New Caledonia - New Zealand - Nicaragua - Niger - Nigeria - Niue - Norfolk Island - Northern Mariana Islands - Norway - Oman - Pakistan - Palau - Palestinian Territory, Occupied - Panama - Papua New Guinea - Paraguay - Peru - Philippines - Pitcairn - Poland - Portugal - Puerto Rico - Qatar - Reunion - Romania - Russian Federation - Rwanda - Saint Barthelemy - Saint Helena - Saint Kitts and Nevis - Saint Lucia - Saint Martin - Saint Pierre and Miquelon - Saint Vincent and the Grenadines - Samoa - San Marino - Sao Tome and Principe - Saudi Arabia - Senegal - Serbia - Seychelles - Sierra Leone - Singapore - Slovakia - Slovenia - Solomon Islands - Somalia - South Africa - South Georgia and the South Sandwich Islands - Spain - Sri Lanka - Sudan - Suriname - Svalbard and Jan Mayen - Swaziland - Sweden - Switzerland - Syrian Arab Republic - Taiwan, Province of China - Tajikistan - Tanzania, United Republic of - Thailand - Timor-Leste - Togo - Tokelau - Tonga - Trinidad and Tobago - Tunisia - Turkey - Turkmenistan - Turks and Caicos Islands - Tuvalu - Uganda - Ukraine - United Arab Emirates - United Kingdom - United States - United States Minor Outlying Islands - Uruguay - Uzbekistan - Vanuatu - Venezuela, Bolivarian Republic of - Viet Nam - Virgin Islands, British - Virgin Islands, U.S. - Wallis and Futuna - Western Sahara - Yemen - Zambia - Zimbabwe*@ - } @Html.DropDownListFor(model => model, listItems, @UI.Select, new { @class = "form-control" }) \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj index 00fa7463..a1538950 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj @@ -362,8 +362,6 @@ SettingsUserPasswordResetLetter.ascx - - ASPXCodeBehind Connect.aspx