diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index fe657ae470..8afb0a17e3 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -13278,7 +13278,7 @@ }, "pretty-hrtime": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", "dev": true }, @@ -15838,7 +15838,7 @@ "dependencies": { "lru-cache": { "version": "2.2.4", - "resolved": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", "dev": true } diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config index c9a74eebb0..c137c3705e 100644 --- a/src/Umbraco.Web.UI/Views/Web.config +++ b/src/Umbraco.Web.UI/Views/Web.config @@ -54,16 +54,16 @@ Somehow, transitive dependencies are not working correctly, and either (a) NuGet fails to properly register this dependency, or (b) when reference assemblies are gathered before compiling views, this dependency is missed. In any case, the result is that the ICodeProvider is passed a list of referenced - assemblies that is missing netstandard. + assemblies that is missing .NET Standard. It may be a mix of both. NuGet registers the dependency well enough, that we can actually build the - whole application - but it is not doing something that is required in order to have netstandard + whole application - but it is not doing something that is required in order to have .NET Standard being a dependency when building views. See also: https://stackoverflow.com/questions/50165910 Funny enough, the CSharpCompiler already explicitly adds System.Runtime as a referenced assembly, - with a comment mentioning an issue. But it's not adding netstandard. So, for the time being, to be sure, + with a comment mentioning an issue. But it's not adding .NET Standard. So, for the time being, to be sure, we are adding both here. --> diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs index a1942ed141..944157db9d 100644 --- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs @@ -75,7 +75,7 @@ namespace Umbraco.Web.Cache if (assignedDomains.Count > 0) { - // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, + // TODO: this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the // DomainCacheRefresher? diff --git a/src/Umbraco.Web/Cache/DistributedCache.cs b/src/Umbraco.Web/Cache/DistributedCache.cs index c445f66621..1e0e33ebd7 100644 --- a/src/Umbraco.Web/Cache/DistributedCache.cs +++ b/src/Umbraco.Web/Cache/DistributedCache.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Cache #region Core notification methods /// - /// Notifies the distributed cache of specifieds item invalidation, for a specified . + /// Notifies the distributed cache of specified item invalidation, for a specified . /// /// The type of the invalidated items. /// The unique identifier of the ICacheRefresher. @@ -148,7 +148,7 @@ namespace Umbraco.Web.Cache } /// - /// Notifies the distributed cache of specifieds item removal, for a specified . + /// Notifies the distributed cache of specified item removal, for a specified . /// /// The type of the removed items. /// The unique identifier of the ICacheRefresher. diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs index f75d8ead87..4f05abc9ee 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs @@ -267,7 +267,7 @@ namespace Umbraco.Web.Cache #region LocalizationService / Language /// - /// Fires when a langauge is deleted + /// Fires when a language is deleted /// /// /// @@ -278,7 +278,7 @@ namespace Umbraco.Web.Cache } /// - /// Fires when a langauge is saved + /// Fires when a language is saved /// /// /// diff --git a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs index c5dfcfd1e7..9093124609 100644 --- a/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/LanguageCacheRefresher.cs @@ -57,7 +57,7 @@ namespace Umbraco.Web.Cache if (assignedDomains.Count > 0) { - // todo - this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, + // TODO: this is duplicating the logic in DomainCacheRefresher BUT we cannot inject that into this because it it not registered explicitly in the container, // and we cannot inject the CacheRefresherCollection since that would be a circular reference, so what is the best way to call directly in to the // DomainCacheRefresher? diff --git a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs index 589502e6a2..4ae371502f 100644 --- a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs +++ b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.Components [RuntimeLevel(MinLevel = RuntimeLevel.Run)] // during Initialize / Startup, we end up checking Examine, which needs to be initialized beforehand - // todo - should not be a strong dependency on "examine" but on an "indexing component" + // TODO: should not be a strong dependency on "examine" but on an "indexing component" [ComposeAfter(typeof(ExamineComposer))] public sealed class DatabaseServerRegistrarAndMessengerComposer : ComponentComposer, ICoreComposer diff --git a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs index 377a6bdb86..0aa3c7f8a1 100644 --- a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs +++ b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs @@ -32,8 +32,7 @@ namespace Umbraco.Web.Composing.Composers // UmbracoApiController is fast-ish because they both are IDiscoverable. Scanning for IController or IHttpController // is a full, non-cached scan = expensive, we do it only for 1 assembly. // - // TODO - // find a way to scan for IController *and* IHttpController in one single pass + // TODO: find a way to scan for IController *and* IHttpController in one single pass // or, actually register them manually so don't require a full scan for these // 5 are IController but not PluginController // Umbraco.Web.Mvc.RenderMvcController diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs index c11b64882a..5804a00a79 100644 --- a/src/Umbraco.Web/Editors/AuthenticationController.cs +++ b/src/Umbraco.Web/Editors/AuthenticationController.cs @@ -69,8 +69,8 @@ namespace Umbraco.Web.Editors [WebApi.UmbracoAuthorize(requireApproval: false)] public IDictionary GetMembershipProviderConfig() { - //TODO: Check if the current PasswordValidator is an IMembershipProviderPasswordValidator, if - //it's not than we should return some generic defaults + // TODO: Check if the current PasswordValidator is an IMembershipProviderPasswordValidator, if + // it's not than we should return some generic defaults var provider = Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider(); return provider.GetConfiguration(Services.UserService); } @@ -194,7 +194,7 @@ namespace Umbraco.Web.Editors if (user.IsApproved) { - //if they are approved, than they are no longer invited and we can return an error + // if they are approved, than they are no longer invited and we can return an error throw new HttpResponseException(Request.CreateUserNoAccessResponse()); } @@ -202,14 +202,14 @@ namespace Umbraco.Web.Editors var httpContextAttempt = TryGetHttpContext(); if (httpContextAttempt.Success) { - //set their remaining seconds + // set their remaining seconds result.SecondsUntilTimeout = httpContextAttempt.Result.GetRemainingAuthSeconds(); } return result; } - //TODO: This should be on the CurrentUserController? + // TODO: This should be on the CurrentUserController? [WebApi.UmbracoAuthorize] [ValidateAngularAntiForgeryToken] public async Task> GetCurrentUserLinkedLogins() @@ -228,8 +228,8 @@ namespace Umbraco.Web.Editors var http = EnsureHttpContext(); var owinContext = TryGetOwinContext().Result; - //Sign the user in with username/password, this also gives a chance for developers to - //custom verify the credentials and auto-link user accounts with a custom IBackOfficePasswordChecker + // Sign the user in with username/password, this also gives a chance for developers to + // custom verify the credentials and auto-link user accounts with a custom IBackOfficePasswordChecker var result = await SignInManager.PasswordSignInAsync( loginModel.Username, loginModel.Password, isPersistent: true, shouldLockout: true); @@ -237,7 +237,7 @@ namespace Umbraco.Web.Editors { case SignInStatus.Success: - //get the user + // get the user var user = Services.UserService.GetByUsername(loginModel.Username); UserManager.RaiseLoginSuccessEvent(user.Id); @@ -268,7 +268,7 @@ namespace Umbraco.Web.Editors var attemptedUser = Services.UserService.GetByUsername(loginModel.Username); - //create a with information to display a custom two factor send code view + // create a with information to display a custom two factor send code view var verifyResponse = Request.CreateResponse(HttpStatusCode.PaymentRequired, new { twoFactorView = twofactorView, @@ -282,10 +282,10 @@ namespace Umbraco.Web.Editors case SignInStatus.LockedOut: case SignInStatus.Failure: default: - //return BadRequest (400), we don't want to return a 401 because that get's intercepted + // return BadRequest (400), we don't want to return a 401 because that get's intercepted // by our angular helper because it thinks that we need to re-perform the request once we are - // authorized and we don't want to return a 403 because angular will show a warning msg indicating - // that the user doesn't have access to perform this function, we just want to return a normal invalid msg. + // authorized and we don't want to return a 403 because angular will show a warning message indicating + // that the user doesn't have access to perform this function, we just want to return a normal invalid message. throw new HttpResponseException(HttpStatusCode.BadRequest); } } @@ -314,13 +314,13 @@ namespace Umbraco.Web.Editors var callbackUrl = ConstructCallbackUrl(identityUser.Id, code); var message = Services.TextService.Localize("resetPasswordEmailCopyFormat", - //Ensure the culture of the found user is used for the email! + // Ensure the culture of the found user is used for the email! UserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings), new[] { identityUser.UserName, callbackUrl }); await UserManager.SendEmailAsync(identityUser.Id, Services.TextService.Localize("login/resetPasswordEmailCopySubject", - //Ensure the culture of the found user is used for the email! + // Ensure the culture of the found user is used for the email! UserExtensions.GetUserCulture(identityUser.Culture, Services.TextService, GlobalSettings)), message); @@ -332,7 +332,7 @@ namespace Umbraco.Web.Editors } /// - /// Used to retrived the 2FA providers for code submission + /// Used to retrieve the 2FA providers for code submission /// /// [SetAngularAntiForgeryTokens] @@ -417,7 +417,7 @@ namespace Umbraco.Web.Editors { Logger.Info("User {UserId} is currently locked out, unlocking and resetting AccessFailedCount", model.UserId); - //var user = await UserManager.FindByIdAsync(model.UserId); + //// var user = await UserManager.FindByIdAsync(model.UserId); var unlockResult = await UserManager.SetLockoutEndDateAsync(model.UserId, DateTimeOffset.Now); if (unlockResult.Succeeded == false) { @@ -431,18 +431,18 @@ namespace Umbraco.Web.Editors } } - //They've successfully set their password, we can now update their user account to be confirmed - //if user was only invited, then they have not been approved - //but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite) - //means we have verified their email + // They've successfully set their password, we can now update their user account to be confirmed + // if user was only invited, then they have not been approved + // but a successful forgot password flow (e.g. if their token had expired and they did a forgot password instead of request new invite) + // means we have verified their email if (!UserManager.IsEmailConfirmed(model.UserId)) { await UserManager.ConfirmEmailAsync(model.UserId, model.ResetCode); } - //if the user is invited, enable their account on forgot password + // if the user is invited, enable their account on forgot password var identityUser = await UserManager.FindByIdAsync(model.UserId); - //invited is not approved, never logged in, invited date present + // invited is not approved, never logged in, invited date present /* if (LastLoginDate == default && IsApproved == false && InvitedDate != null) return UserState.Invited; @@ -450,7 +450,7 @@ namespace Umbraco.Web.Editors if (identityUser != null && !identityUser.IsApproved) { var user = Services.UserService.GetByUsername(identityUser.UserName); - //also check InvitedDate and never logged in, otherwise this would allow a disabled user to reactivate their account with a forgot password + // also check InvitedDate and never logged in, otherwise this would allow a disabled user to reactivate their account with a forgot password if (user.LastLoginDate == default && user.InvitedDate != null) { user.IsApproved = true; @@ -505,13 +505,13 @@ namespace Umbraco.Web.Editors if (principal == null) throw new ArgumentNullException(nameof(principal)); var userDetail = Mapper.Map(user); - //update the userDetail and set their remaining seconds + // update the userDetail and set their remaining seconds userDetail.SecondsUntilTimeout = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds; - //create a response with the userDetail object + // create a response with the userDetail object var response = Request.CreateResponse(HttpStatusCode.OK, userDetail); - //ensure the user is set for the current request + // ensure the user is set for the current request Request.SetPrincipalForRequest(principal); return response; diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 6dd5efecb1..7e45797107 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -176,7 +176,7 @@ namespace Umbraco.Web.Editors var textForCulture = Services.TextService.GetAllStoredValues(cultureInfo) //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript - // in the back office requres the delimiter to be a '_' so we'll just replace it + // in the back office requires the delimiter to be a '_' so we'll just replace it .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value); return new JsonNetResult { Data = textForCulture, Formatting = Formatting.Indented }; @@ -416,7 +416,7 @@ namespace Umbraco.Web.Editors { if (await AutoLinkAndSignInExternalAccount(loginInfo, autoLinkOptions) == false) { - ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to to an account" }; + ViewData[TokenExternalSignInError] = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to an account" }; } //Remove the cookie otherwise this message will keep appearing diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index d6a6947eba..1d4113bb7d 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -426,7 +426,7 @@ namespace Umbraco.Web.Editors /// /// /// We are doing this because if we constantly resolve the tree controller types from the PluginManager it will re-scan and also re-log that - /// it's resolving which is unecessary and annoying. + /// it's resolving which is unnecessary and annoying. /// private static readonly Lazy> TreeControllerTypes = new Lazy>(() => Current.TypeLoader.GetAttributedTreeControllers().ToArray()); // todo inject diff --git a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs index f50122bc9b..f54fd12c30 100644 --- a/src/Umbraco.Web/Editors/Binders/MemberBinder.cs +++ b/src/Umbraco.Web/Editors/Binders/MemberBinder.cs @@ -140,7 +140,7 @@ namespace Umbraco.Web.Editors.Binders var contentType = _services.MemberTypeService.Get(model.ContentTypeAlias); if (contentType == null) { - throw new InvalidOperationException("No member type found wth alias " + model.ContentTypeAlias); + throw new InvalidOperationException("No member type found with alias " + model.ContentTypeAlias); } //remove all membership properties, these values are set with the membership provider. @@ -176,7 +176,7 @@ namespace Umbraco.Web.Editors.Binders /// /// This will remove all of the special membership provider properties which were required to display the property editors - /// for editing - but the values have been mapped back ot the MemberSave object directly - we don't want to keep these properties + /// for editing - but the values have been mapped back to the MemberSave object directly - we don't want to keep these properties /// on the IMember because they will attempt to be persisted which we don't want since they might not even exist. /// /// diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index ec72ca3df4..6db0c6a8f9 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Editors if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name"); // if the parentId is root (-1) then we just need an empty string as we are - // creating the path below and we don't wan't -1 in the path + // creating the path below and we don't want -1 in the path if (parentId == Core.Constants.System.Root.ToInvariantString()) { parentId = string.Empty; @@ -193,7 +193,7 @@ namespace Umbraco.Web.Editors } /// - /// Used to get a list of available templates/snippets to base a new Partial View og Partial View Macro from + /// Used to get a list of available templates/snippets to base a new Partial View or Partial View Macro from /// /// This is a string but will be 'partialViews', 'partialViewMacros' /// Returns a list of if a correct type is sent diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index b574dc8f29..841c60938a 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -104,14 +104,14 @@ namespace Umbraco.Web.Editors /// /// /// - /// Permission check is done for letter 'R' which is for which the user must have access to to update + /// Permission check is done for letter 'R' which is for which the user must have access to update /// [EnsureUserPermissionForContent("saveModel.ContentId", 'R')] public IEnumerable PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel) { if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound)); - //TODO: Should non-admins be alowed to set granular permissions? + // TODO: Should non-admins be allowed to set granular permissions? var content = Services.ContentService.GetById(saveModel.ContentId); if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound)); @@ -166,7 +166,7 @@ namespace Umbraco.Web.Editors /// /// /// - /// Permission check is done for letter 'R' which is for which the user must have access to to view + /// Permission check is done for letter 'R' which is for which the user must have access to view /// [EnsureUserPermissionForContent("contentId", 'R')] public IEnumerable GetDetailedPermissions(int contentId) @@ -457,7 +457,7 @@ namespace Umbraco.Web.Editors Direction orderDirection = Direction.Ascending, bool orderBySystemField = true, string filter = "", - string cultureName = "") // TODO it's not a NAME it's the ISO CODE + string cultureName = "") // TODO: it's not a NAME it's the ISO CODE { long totalChildren; List children; @@ -583,7 +583,7 @@ namespace Umbraco.Web.Editors private ContentItemDisplay PostSaveInternal(ContentItemSave contentItem, Func saveMethod) { - //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name. + //Recent versions of IE/Edge may send in the full client side file path instead of just the file name. //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all //uploaded files to being *only* the actual file name (as it should be). if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any()) @@ -647,7 +647,7 @@ namespace Umbraco.Web.Editors .Any(x => x == false)) { //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue! - // add the modelstate to the outgoing object and throw a validation message + // add the model state to the outgoing object and throw a validation message var forDisplay = MapToDisplay(contentItem.PersistedContent); forDisplay.Errors = ModelState.ToErrorDictionary(); throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay)); @@ -797,7 +797,7 @@ namespace Umbraco.Web.Editors v.Notifications.AddRange(n.Notifications); } - //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403 + //lastly, if it is not valid, add the model state to the outgoing object and throw a 403 HandleInvalidModelState(display); if (wasCancelled) @@ -1040,7 +1040,7 @@ namespace Umbraco.Web.Editors /// /// /// global notifications will be shown if all variant processing is successful and the save/publish dialog is closed, otherwise - /// variant specific notifications are used to show success messagse in the save/publish dialog. + /// variant specific notifications are used to show success messages in the save/publish dialog. /// private static void AddSuccessNotification(IDictionary notifications, string culture, string header, string msg) { @@ -1091,7 +1091,7 @@ namespace Umbraco.Web.Editors { //its invariant, proceed normally var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, userId: Security.CurrentUser.Id); - //TODO: Deal with multiple cancelations + //TODO: Deal with multiple cancellations wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent); successfulCultures = Array.Empty(); return publishStatus; @@ -1124,7 +1124,7 @@ namespace Umbraco.Web.Editors { //proceed to publish if all validation still succeeds var publishStatus = Services.ContentService.SaveAndPublishBranch(contentItem.PersistedContent, force, culturesToPublish, Security.CurrentUser.Id); - //TODO: Deal with multiple cancelations + //TODO: Deal with multiple cancellations wasCancelled = publishStatus.Any(x => x.Result == PublishResultType.FailedPublishCancelledByEvent); successfulCultures = contentItem.Variants.Where(x => x.Publish).Select(x => x.Culture).ToArray(); return publishStatus; @@ -1732,7 +1732,7 @@ namespace Umbraco.Web.Editors /// private void MapValuesForPersistence(ContentItemSave contentSave) { - //inline method to determine if a property type varies + // inline method to determine if a property type varies bool Varies(Property property) => property.PropertyType.VariesByCulture(); var variantIndex = 0; @@ -1865,7 +1865,7 @@ namespace Umbraco.Web.Editors /// /// /// - /// This is null when dealing with invariant content, else it's the cultures that were succesfully published + /// This is null when dealing with invariant content, else it's the cultures that were successfully published /// private void AddMessageForPublishStatus(IEnumerable statuses, INotificationModel display, string[] successfulCultures = null) { diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs index 1a8820c4a0..904e6911c9 100644 --- a/src/Umbraco.Web/Editors/ContentControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs @@ -101,7 +101,7 @@ namespace Umbraco.Web.Editors protected virtual void HandleInvalidModelState(IErrorModel display) { - //lastly, if it is not valid, add the modelstate to the outgoing object and throw a 403 + //lastly, if it is not valid, add the model state to the outgoing object and throw a 403 if (!ModelState.IsValid) { display.Errors = ModelState.ToErrorDictionary(); @@ -117,7 +117,7 @@ namespace Umbraco.Web.Editors /// /// /// - /// This is useful for when filters have alraedy looked up a persisted entity and we don't want to have + /// This is useful for when filters have already looked up a persisted entity and we don't want to have /// to look it up again. /// protected TPersisted GetObjectFromRequest(Func getFromService) diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index 9811c48801..b59e17d9e1 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a document type wth a given ID + /// Deletes a document type with a given ID /// /// /// @@ -128,7 +128,7 @@ namespace Umbraco.Web.Editors } /// - /// Returns the avilable compositions for this content type + /// Returns the available compositions for this content type /// This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request body /// /// @@ -187,7 +187,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a document type container wth a given ID + /// Deletes a document type container with a given ID /// /// /// @@ -293,7 +293,7 @@ namespace Umbraco.Web.Editors saveContentType: type => Services.ContentTypeService.Save(type), beforeCreateNew: ctSave => { - //create a default template if it doesnt exist -but only if default template is == to the content type + //create a default template if it doesn't exist -but only if default template is == to the content type if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias) { var template = CreateTemplateForContentType(ctSave.Alias, ctSave.Name); diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs index 9cfde94a3a..fe91f9fff6 100644 --- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs @@ -259,7 +259,7 @@ namespace Umbraco.Web.Editors ModelState.AddModelError("Alias", Services.TextService.Localize("editcontenttype/aliasAlreadyExists")); } - // execute the externam validators + // execute the external validators EditorValidator.Validate(ModelState, contentTypeSave); if (ModelState.IsValid == false) diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs index 335b609b0a..0af3a1cfe7 100644 --- a/src/Umbraco.Web/Editors/DataTypeController.cs +++ b/src/Umbraco.Web/Editors/DataTypeController.cs @@ -68,7 +68,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a data type wth a given ID + /// Deletes a data type with a given ID /// /// /// @@ -120,7 +120,7 @@ namespace Umbraco.Web.Editors { var dt = Services.DataTypeService.GetDataType(Constants.Conventions.DataTypes.ListViewPrefix + contentTypeAlias); - //if it doesnt exist yet, we will create it. + //if it doesn't exist yet, we will create it. if (dt == null) { var editor = _propertyEditors[Constants.PropertyEditors.Aliases.ListView]; @@ -172,7 +172,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a data type container wth a given ID + /// Deletes a data type container with a given ID /// /// /// diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs index 9d01cc9d64..616317f7ba 100644 --- a/src/Umbraco.Web/Editors/DictionaryController.cs +++ b/src/Umbraco.Web/Editors/DictionaryController.cs @@ -22,7 +22,7 @@ namespace Umbraco.Web.Editors /// /// /// The security for this controller is defined to allow full CRUD access to dictionary if the user has access to either: - /// Dictionar + /// Dictionary /// [PluginController("UmbracoApi")] [UmbracoTreeAuthorize(Constants.Trees.Dictionary)] @@ -30,7 +30,7 @@ namespace Umbraco.Web.Editors public class DictionaryController : BackOfficeNotificationsController { /// - /// Deletes a data type wth a given ID + /// Deletes a data type with a given ID /// /// /// @@ -49,7 +49,7 @@ namespace Umbraco.Web.Editors } /// - /// Creates a new dictoinairy item + /// Creates a new dictionary item /// /// /// The parent id. @@ -65,7 +65,7 @@ namespace Umbraco.Web.Editors { if (string.IsNullOrEmpty(key)) return Request - .CreateNotificationValidationErrorResponse("Key can not be empty;"); // TODO translate + .CreateNotificationValidationErrorResponse("Key can not be empty;"); // TODO: translate if (Services.LocalizationService.DictionaryItemExists(key)) { @@ -108,7 +108,7 @@ namespace Umbraco.Web.Editors /// The . /// /// - /// Returrns a not found response when dictionary item does not exist + /// Returns a not found response when dictionary item does not exist /// public DictionaryDisplay GetById(int id) { diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index b25f3f5af1..6fcf5b0e2d 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -207,7 +207,7 @@ namespace Umbraco.Web.Editors /// Gets the url of an entity /// /// Int id of the entity to fetch URL for - /// The tpye of entity such as Document, Media, Member + /// The type of entity such as Document, Media, Member /// The URL or path to the item public HttpResponseMessage GetUrl(int id, UmbracoEntityTypes type) { @@ -256,7 +256,7 @@ namespace Umbraco.Web.Editors if (type != UmbracoEntityTypes.Document) - throw new ArgumentException("Get by query is only compatible with enitities of type Document"); + throw new ArgumentException("Get by query is only compatible with entities of type Document"); var q = ParseXPathQuery(query, nodeContextId); @@ -268,7 +268,7 @@ namespace Umbraco.Web.Editors return GetById(node.Id, type); } - //PP: wip in progress on the query parser + // PP: Work in progress on the query parser private string ParseXPathQuery(string query, int id) { return UmbracoXPathPathSyntaxParser.ParseXPathQuery( diff --git a/src/Umbraco.Web/Editors/ExamineManagementController.cs b/src/Umbraco.Web/Editors/ExamineManagementController.cs index b7392a1fa4..5f969cdd80 100644 --- a/src/Umbraco.Web/Editors/ExamineManagementController.cs +++ b/src/Umbraco.Web/Editors/ExamineManagementController.cs @@ -133,7 +133,7 @@ namespace Umbraco.Web.Editors _logger.Info("Rebuilding index '{IndexName}'", indexName); - //remove it in case there's a handler there alraedy + //remove it in case there's a handler there already index.IndexOperationComplete -= Indexer_IndexOperationComplete; //now add a single handler diff --git a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs index 264dd049f5..e54bb3ef71 100644 --- a/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs +++ b/src/Umbraco.Web/Editors/Filters/ContentItemValidationHelper.cs @@ -117,7 +117,7 @@ namespace Umbraco.Web.Editors.Filters /// /// /// - /// All property data validation goes into the modelstate with a prefix of "Properties" + /// All property data validation goes into the model state with a prefix of "Properties" /// public virtual bool ValidatePropertyData( TModelSave model, diff --git a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs index 789dd1fdf2..64e1c76417 100644 --- a/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs +++ b/src/Umbraco.Web/Editors/Filters/ContentSaveValidationAttribute.cs @@ -152,7 +152,7 @@ namespace Umbraco.Web.Editors.Filters case ContentSaveAction.PublishWithDescendantsNew: case ContentSaveAction.PublishWithDescendantsForceNew: //Publish new requires both ActionNew AND ActionPublish - //TODO: Shoudn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied + //TODO: Shouldn't publish also require ActionUpdate since it will definitely perform an update to publish but maybe that's just implied permissionToCheck.Add(ActionNew.ActionLetter); permissionToCheck.Add(ActionPublish.ActionLetter); diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs index 8b6d8ec6ac..64132d3d8e 100644 --- a/src/Umbraco.Web/Editors/LanguageController.cs +++ b/src/Umbraco.Web/Editors/LanguageController.cs @@ -100,7 +100,7 @@ namespace Umbraco.Web.Editors if (!ModelState.IsValid) throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState)); - // this is prone to race conds but the service will not let us proceed anyways + // this is prone to race conditions but the service will not let us proceed anyways var existing = Services.LocalizationService.GetLanguageByIsoCode(language.IsoCode); if (existing != null && language.Id != existing.Id) @@ -150,7 +150,7 @@ namespace Umbraco.Web.Editors existing.FallbackLanguageId = language.FallbackLanguageId; // modifying an existing language can create a fallback, verify - // note that the service will check again, dealing with race conds + // note that the service will check again, dealing with race conditions if (existing.FallbackLanguageId.HasValue) { var languages = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.Id, x => x); diff --git a/src/Umbraco.Web/Editors/LegacyController.cs b/src/Umbraco.Web/Editors/LegacyController.cs index e2e22457c1..bc5b3b1a7a 100644 --- a/src/Umbraco.Web/Editors/LegacyController.cs +++ b/src/Umbraco.Web/Editors/LegacyController.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Editors [HttpPost] public HttpResponseMessage DeleteLegacyItem(string nodeId, string alias, string nodeType) { - //U4-2686 - alias is html encoded, make sure to decode + //U4-2686 - alias is HTML encoded, make sure to decode alias = HttpUtility.HtmlDecode(alias); //In order to process this request we MUST have an HttpContext available @@ -45,8 +45,8 @@ namespace Umbraco.Web.Editors return Request.CreateResponse(HttpStatusCode.OK); } - //the way this legacy stuff used to work is that if the node id didn't parse, we would - //pass the node id as the alias with an id of zero = sure whatevs. + // the way this legacy stuff used to work is that if the node id didn't parse, we would + // pass the node id as the alias with an id of zero = sure whatevs. LegacyDialogHandler.Delete(httpContextAttempt.Result, Security.CurrentUser, nodeType, 0, nodeId); return Request.CreateResponse(HttpStatusCode.OK); } diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs index 0b4a78e603..3ec25b1632 100644 --- a/src/Umbraco.Web/Editors/MacroRenderingController.cs +++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs @@ -60,7 +60,7 @@ namespace Umbraco.Web.Editors } /// - /// Gets a rendered macro as html for rendering in the rich text editor + /// Gets a rendered macro as HTML for rendering in the rich text editor /// /// /// @@ -78,8 +78,8 @@ namespace Umbraco.Web.Editors } /// - /// Gets a rendered macro as html for rendering in the rich text editor. - /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependant on URL-length limitations like GET. + /// Gets a rendered macro as HTML for rendering in the rich text editor. + /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependent on URL-length limitations like GET. /// The method using GET is kept to maintain backwards compatibility /// /// @@ -116,14 +116,14 @@ namespace Umbraco.Web.Editors if (macro.RenderInEditor == false) { var response = Request.CreateResponse(); - //need to create a specific content result formatted as html since this controller has been configured + //need to create a specific content result formatted as HTML since this controller has been configured //with only json formatters. response.Content = new StringContent(string.Empty, Encoding.UTF8, "text/html"); return response; } - //because macro's are filled with insane legacy bits and pieces we need all sorts of wierdness to make them render. + //because macro's are filled with insane legacy bits and pieces we need all sorts of weirdness to make them render. //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that //and then set the legacy parameters. @@ -145,7 +145,7 @@ namespace Umbraco.Web.Editors var renderer = new UmbracoComponentRenderer(UmbracoContext); var result = Request.CreateResponse(); - //need to create a specific content result formatted as html since this controller has been configured + //need to create a specific content result formatted as HTML since this controller has been configured //with only json formatters. result.Content = new StringContent( renderer.RenderMacro(macro, macroParams, legacyPage).ToString(), diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index ce088e0caa..fe081c1cb4 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -457,7 +457,7 @@ namespace Umbraco.Web.Editors [ModelBinder(typeof(MediaItemBinder))] MediaItemSave contentItem) { - //Recent versions of IE/Edge may send in the full clientside file path instead of just the file name. + //Recent versions of IE/Edge may send in the full client side file path instead of just the file name. //To ensure similar behavior across all browsers no matter what they do - we strip the FileName property of all //uploaded files to being *only* the actual file name (as it should be). if (contentItem.UploadedFiles != null && contentItem.UploadedFiles.Any()) @@ -500,7 +500,7 @@ namespace Umbraco.Web.Editors && (contentItem.Action == ContentSaveAction.SaveNew)) { //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue! - // add the modelstate to the outgoing object and throw validation response + // add the model state to the outgoing object and throw validation response var forDisplay = Mapper.Map(contentItem.PersistedContent); forDisplay.Errors = ModelState.ToErrorDictionary(); throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay)); @@ -513,7 +513,7 @@ namespace Umbraco.Web.Editors //return the updated model var display = Mapper.Map(contentItem.PersistedContent); - //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403 + //lastly, if it is not valid, add the model state to the outgoing object and throw a 403 HandleInvalidModelState(display); //put the correct msgs in @@ -928,7 +928,7 @@ namespace Umbraco.Web.Editors if (media == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinMedia) { media = mediaService.GetById(nodeId); - //put the content item into storage so it can be retreived + //put the content item into storage so it can be retrieved // in the controller (saves a lookup) storage[typeof(IMedia).ToString()] = media; } diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs index d6acc9331e..dd1f53f8af 100644 --- a/src/Umbraco.Web/Editors/MediaTypeController.cs +++ b/src/Umbraco.Web/Editors/MediaTypeController.cs @@ -92,7 +92,7 @@ namespace Umbraco.Web.Editors } /// - /// Returns the avilable compositions for this content type + /// Returns the available compositions for this content type /// This has been wrapped in a dto instead of simple parameters to support having multiple parameters in post request body /// /// @@ -154,7 +154,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a media type container wth a given ID + /// Deletes a media type container with a given ID /// /// /// diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 92ca648c3f..2211bea76b 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -307,7 +307,7 @@ namespace Umbraco.Web.Editors string generatedPassword = null; //Depending on the action we need to first do a create or update using the membership provider - // this ensures that passwords are formatted correclty and also performs the validation on the provider itself. + // this ensures that passwords are formatted correctly and also performs the validation on the provider itself. switch (contentItem.Action) { case ContentSaveAction.Save: @@ -360,7 +360,7 @@ namespace Umbraco.Web.Editors Roles.AddUserToRoles(contentItem.PersistedContent.Username, toAdd); } - //set the generated password (if there was one) - in order to do this we'll chuck the gen'd password into the + //set the generated password (if there was one) - in order to do this we'll chuck the generated password into the // additional data of the IUmbracoEntity of the persisted item - then we can retrieve this in the model mapper and set // the value to be given to the UI. Hooray for AdditionalData :) contentItem.PersistedContent.AdditionalData["GeneratedPassword"] = generatedPassword; @@ -368,11 +368,11 @@ namespace Umbraco.Web.Editors //return the updated model var display = Mapper.Map(contentItem.PersistedContent); - //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403 + //lastly, if it is not valid, add the model state to the outgoing object and throw a 403 HandleInvalidModelState(display); var localizedTextService = Services.TextService; - //put the correct msgs in + //put the correct messages in switch (contentItem.Action) { case ContentSaveAction.Save: @@ -603,7 +603,7 @@ namespace Umbraco.Web.Editors /// /// Following a refresh of member data called during an update if the membership provider has changed some underlying data, - /// we don't want to lose the provided, and potentiallly changed, username + /// we don't want to lose the provided, and potentially changed, username /// /// /// @@ -637,7 +637,7 @@ namespace Umbraco.Web.Editors /// we create an empty IMember instance first (of type 'Member'), this gives us a unique ID (GUID) /// that we then use to create the member in the custom membership provider. This acts as the link between Umbraco data and /// the custom membership provider data. This gives us the ability to eventually have custom membership properties but still use - /// a custom memberhip provider. If there is no 'Member' member type, then we will simply just create the membership provider member + /// a custom membership provider. If there is no 'Member' member type, then we will simply just create the membership provider member /// with no link to our data. /// /// If this is successful, it will go and re-fetch the IMember from the db because it will now have an ID because the Umbraco provider diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs index f6bcbb727f..b200f17372 100644 --- a/src/Umbraco.Web/Editors/MemberTypeController.cs +++ b/src/Umbraco.Web/Editors/MemberTypeController.cs @@ -51,7 +51,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a document type wth a given ID + /// Deletes a document type with a given ID /// /// /// @@ -71,7 +71,7 @@ namespace Umbraco.Web.Editors } /// - /// Returns the avilable compositions for this content type + /// Returns the available compositions for this content type /// /// /// diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index e38a2fdd26..658a28a79e 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -52,7 +52,7 @@ namespace Umbraco.Web.Editors } /// - /// This checks if this package & version is alraedy installed + /// This checks if this package & version is already installed /// /// /// diff --git a/src/Umbraco.Web/Editors/PasswordChanger.cs b/src/Umbraco.Web/Editors/PasswordChanger.cs index 6777ae1f56..e124f3a9a4 100644 --- a/src/Umbraco.Web/Editors/PasswordChanger.cs +++ b/src/Umbraco.Web/Editors/PasswordChanger.cs @@ -254,7 +254,7 @@ namespace Umbraco.Web.Editors if (passwordModel.OldPassword.IsNullOrWhiteSpace() == false) { - //if an old password is suplied try to change it + //if an old password is supplied try to change it try { diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs index 5c0a746ee7..ac9341a095 100644 --- a/src/Umbraco.Web/Editors/TemplateController.cs +++ b/src/Umbraco.Web/Editors/TemplateController.cs @@ -52,7 +52,7 @@ namespace Umbraco.Web.Editors } /// - /// Deletes a template wth a given ID + /// Deletes a template with a given ID /// /// /// diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs index 73ebdf3bc5..41f38679a9 100644 --- a/src/Umbraco.Web/Editors/TemplateQueryController.cs +++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs @@ -120,6 +120,7 @@ namespace Umbraco.Web.Editors //x is passed in as the parameter alias for the linq where statement clause var operation = condition.BuildCondition("x", contents, Properties); + //for review - this uses a tonized query rather then the normal linq query. contents = contents.Where(operation.Compile()); queryExpression.Append(indent); queryExpression.AppendFormat(".Where({0})", operation); diff --git a/src/Umbraco.Web/Editors/UserGroupsController.cs b/src/Umbraco.Web/Editors/UserGroupsController.cs index 5069d99cfe..c8f7d2b0df 100644 --- a/src/Umbraco.Web/Editors/UserGroupsController.cs +++ b/src/Umbraco.Web/Editors/UserGroupsController.cs @@ -112,7 +112,7 @@ namespace Umbraco.Web.Editors if (onlyCurrentUserGroups == false) { - //this user is not an admin so in that case we need to exlude all admin users + //this user is not an admin so in that case we need to exclude all admin users allGroups.RemoveAt(allGroups.IndexOf(allGroups.Find(basic => basic.Alias == Constants.Security.AdminGroupAlias))); return allGroups; } diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index e7432c4828..c31d005ea6 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -200,7 +200,7 @@ namespace Umbraco.Web.Editors var isAdmin = Security.CurrentUser.IsAdmin(); if (isAdmin == false) { - //this user is not an admin so in that case we need to exlude all admin users + //this user is not an admin so in that case we need to exclude all admin users excludeUserGroups = new[] {Constants.Security.AdminGroupAlias}; } diff --git a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs index 13e99fa886..273d19bae0 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Permissions/FolderAndFilePermissionsCheck.cs @@ -134,7 +134,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Permissions bool optionalPathCheckResult, IEnumerable optionalFailedPaths, PermissionCheckFor checkingFor) { - // Return error if any required parths fail the check, or warning if any optional ones do + // Return error if any required paths fail the check, or warning if any optional ones do var resultType = StatusResultType.Success; var messageKey = string.Format("healthcheck/{0}PermissionsCheckMessage", checkingFor == PermissionCheckFor.Folder ? "folder" : "file"); diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs index 61f56ec9d8..18827b0c81 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Security/HstsCheck.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security { // The check is mostly based on the instructions in the OWASP CheatSheet // (https://www.owasp.org/index.php/HTTP_Strict_Transport_Security_Cheat_Sheet) - // and the blogpost of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/) + // and the blog post of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/) // If you want do to it perfectly, you have to submit it https://hstspreload.appspot.com/, // but then you should include subdomains and I wouldn't suggest to do that for Umbraco-sites. public HstsCheck(IRuntimeState runtime, ILocalizedTextService textService) diff --git a/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs b/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs index 75595db992..dc25aa6a65 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs +++ b/src/Umbraco.Web/HealthCheck/Checks/Security/XssProtectionCheck.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security { // The check is mostly based on the instructions in the OWASP CheatSheet // (https://www.owasp.org/index.php/HTTP_Strict_Transport_Security_Cheat_Sheet) - // and the blogpost of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/) + // and the blog post of Troy Hunt (https://www.troyhunt.com/understanding-http-strict-transport/) // If you want do to it perfectly, you have to submit it https://hstspreload.appspot.com/, // but then you should include subdomains and I wouldn't suggest to do that for Umbraco-sites. public XssProtectionCheck(IRuntimeState runtime, ILocalizedTextService textService) diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs index f8c3708e2e..da906c30f9 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckResults.cs @@ -62,7 +62,7 @@ namespace Umbraco.Web.HealthCheck var checkIsSuccess = result.Value.All(x => x.ResultType == StatusResultType.Success); if (checkIsSuccess) { - Logger.Info("Checks for '{HealthCheckName}' all completed succesfully.", checkName); + Logger.Info("Checks for '{HealthCheckName}' all completed successfully.", checkName); } else { @@ -96,7 +96,7 @@ namespace Umbraco.Web.HealthCheck if (checkIsSuccess) { - sb.AppendFormat("{0}Checks for '{1}' all completed succesfully.{2}", newItem, checkName, Environment.NewLine); + sb.AppendFormat("{0}Checks for '{1}' all completed successfully.{2}", newItem, checkName, Environment.NewLine); } else { diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs index 445582788a..2db0b1f2e7 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckStatus.cs @@ -30,7 +30,7 @@ namespace Umbraco.Web.HealthCheck public string Description { get; set; } /// - /// This is optional but would allow a developer to specify a path to an angular html view + /// This is optional but would allow a developer to specify a path to an angular HTML view /// in order to either show more advanced information and/or to provide input for the admin /// to configure how an action is executed /// diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs index 626a19a369..e18397dea2 100644 --- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs @@ -140,7 +140,7 @@ namespace Umbraco.Web return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes); } - //if there's a prefix applied, we need to create a new html helper with a filtered ModelState collection so that it only looks for + //if there's a prefix applied, we need to create a new HTML helper with a filtered ModelState collection so that it only looks for //specific model state with the prefix. var filteredHtmlHelper = new HtmlHelper(htmlHelper.ViewContext, htmlHelper.ViewDataContainer.FilterContainer(prefix)); return filteredHtmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes); @@ -736,7 +736,7 @@ namespace Umbraco.Web object additionalRouteVals = null) { - //ensure that the multipart/form-data is added to the html attributes + //ensure that the multipart/form-data is added to the HTML attributes if (htmlAttributes.ContainsKey("enctype") == false) { htmlAttributes.Add("enctype", "multipart/form-data"); diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs index be14df8e5a..6cf5092bb0 100644 --- a/src/Umbraco.Web/HtmlStringUtilities.cs +++ b/src/Umbraco.Web/HtmlStringUtilities.cs @@ -11,15 +11,15 @@ using Umbraco.Web.WebApi.Filters; namespace Umbraco.Web { /// - /// Provides utility methods for UmbracoHelper for working with strings and html in views. + /// Provides utility methods for UmbracoHelper for working with strings and HTML in views. /// public sealed class HtmlStringUtilities { /// - /// Replaces text line breaks with html line breaks + /// Replaces text line breaks with HTML line breaks /// /// The text. - /// The text with text line breaks replaced with html linebreaks (
) + /// The text with text line breaks replaced with HTML line breaks (
) public HtmlString ReplaceLineBreaksForHtml(string text) { return new HtmlString(text.Replace("\r\n", @"
").Replace("\n", @"
").Replace("\r", @"
")); @@ -257,8 +257,8 @@ namespace Umbraco.Web string firstTrim = outputtr.ReadToEnd().Replace(" ", " ").Trim(); - //Check to see if there is an empty char between the hellip and the output string - //if there is, remove it + // Check to see if there is an empty char between the hellip and the output string + // if there is, remove it if (addElipsis && lengthReached && string.IsNullOrWhiteSpace(firstTrim) == false) { result = firstTrim[firstTrim.Length - hellip.Length - 1] == ' ' ? firstTrim.Remove(firstTrim.Length - hellip.Length - 1, 1) : firstTrim; @@ -275,9 +275,9 @@ namespace Umbraco.Web } /// - /// Returns the length of the words from a html block + /// Returns the length of the words from a HTML block /// - /// Html text + /// HTML text /// Amount of words you would like to measure /// /// diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs index 0006227f58..5f520653f5 100644 --- a/src/Umbraco.Web/HttpCookieExtensions.cs +++ b/src/Umbraco.Web/HttpCookieExtensions.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web /// Extension methods used to check/set cookie values /// /// - /// This should 100% supercede the StateManager.Cookies + /// This should 100% supersede the StateManager.Cookies /// internal static class HttpCookieExtensions { diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs index 83e4b727b2..ed9903e07a 100644 --- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs +++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs @@ -88,7 +88,7 @@ namespace Umbraco.Web /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters. /// /// - /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated + /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated /// /// /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example: @@ -196,7 +196,7 @@ namespace Umbraco.Web /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters /// /// - /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated + /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated /// /// /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example: @@ -275,7 +275,7 @@ namespace Umbraco.Web /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters /// /// - /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated + /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated /// /// /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example: @@ -383,7 +383,7 @@ namespace Umbraco.Web if (ratioMode == ImageCropRatioMode.Width && height != null) { - // if only height specified then assume a sqaure + // if only height specified then assume a square if (width == null) { width = height; @@ -395,7 +395,7 @@ namespace Umbraco.Web if (ratioMode == ImageCropRatioMode.Height && width != null) { - // if only width specified then assume a sqaure + // if only width specified then assume a square if (height == null) { height = width; diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs index c8e862abcb..bf371bacf0 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs @@ -58,7 +58,7 @@ namespace Umbraco.Web.Install.Controllers var installSteps = _installSteps.GetStepsForCurrentInstallType().ToArray(); - //only get the steps that are targetting the current install type + //only get the steps that are targeting the current install type steps.AddRange(installSteps); setup.Steps = steps; diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs index 26e24bd966..6c166e734b 100644 --- a/src/Umbraco.Web/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs @@ -211,9 +211,9 @@ namespace Umbraco.Web.Install } catch (Exception) { - //This is not 100% accurate btw because it could turn out that the current user doesn't - //have access to read the current permissions but does have write access. - //I think this is an edge case however + // This is not 100% accurate because it could turn out that the current user doesn't + // have access to read the current permissions but does have write access. + // I think this is an edge case however return false; } diff --git a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs index 83aa037097..e135a83e81 100644 --- a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs @@ -9,11 +9,11 @@ namespace Umbraco.Web.Install { /// /// Ensures authorization occurs for the installer if it has already completed. - /// If install has not yet occured then the authorization is successful. + /// If install has not yet occurred then the authorization is successful. /// internal class HttpInstallAuthorizeAttribute : AuthorizeAttribute { - // todo - cannot inject UmbracoContext nor RuntimeState in the attribute, read: + // TODO: cannot inject UmbracoContext nor RuntimeState in the attribute, read: // http://stackoverflow.com/questions/30096903/dependency-injection-inside-a-filterattribute-in-asp-net-mvc-6 // https://www.cuttingedge.it/blogs/steven/pivot/entry.php?id=98 - don't do it! // http://blog.ploeh.dk/2014/06/13/passive-attributes/ - passive attributes diff --git a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs index 238bb7c6eb..2041228a3e 100644 --- a/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Install/InstallAuthorizeAttribute.cs @@ -9,7 +9,7 @@ namespace Umbraco.Web.Install { /// /// Ensures authorization occurs for the installer if it has already completed. - /// If install has not yet occured then the authorization is successful + /// If install has not yet occurred then the authorization is successful /// internal class InstallAuthorizeAttribute : AuthorizeAttribute { diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs index 9132f5cd49..7b53ecb966 100644 --- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs @@ -21,7 +21,7 @@ namespace Umbraco.Web.Install.InstallSteps /// This is the first UI step for a brand new install /// /// - /// By default this will show the user view which is the most basic information to configure a new install, but if an install get's interupted because of an + /// By default this will show the user view which is the most basic information to configure a new install, but if an install get's interrupted because of an /// error, etc... and the end-user refreshes the installer then we cannot show the user screen because they've already entered that information so instead we'll /// display a simple continue installation view. /// diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs index 3e836397fd..55d7d49ba9 100644 --- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs @@ -35,7 +35,7 @@ namespace Umbraco.Web.Install.InstallSteps public override Task ExecuteAsync(object model) { //During a new install we'll log the default user in (which is id = 0). - // During an upgrade, the user will already need to be logged in in order to run the installer. + // During an upgrade, the user will already need to be logged in order to run the installer. var security = new WebSecurity(_httpContext, _userService, _globalSettings); //we do this check here because for upgrades the user will already be logged in, for brand new installs, diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs index 80fda66661..3ddc675405 100644 --- a/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs @@ -32,7 +32,7 @@ namespace Umbraco.Web.Install.InstallSteps public override bool RequiresExecution(object model) { var installSteps = InstallStatusTracker.GetStatus().ToArray(); - //this step relies on the preious one completed - because it has stored some information we need + //this step relies on the previous one completed - because it has stored some information we need if (installSteps.Any(x => x.Name == "StarterKitDownload" && x.AdditionalData.ContainsKey("packageId")) == false) { return false; diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs index 8bd699f293..8a61f9230c 100644 --- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs @@ -52,7 +52,7 @@ namespace Umbraco.Web.Install.InstallSteps public override bool RequiresExecution(object model) { var installSteps = InstallStatusTracker.GetStatus().ToArray(); - //this step relies on the preious one completed - because it has stored some information we need + //this step relies on the previous one completed - because it has stored some information we need if (installSteps.Any(x => x.Name == "StarterKitDownload" && x.AdditionalData.ContainsKey("packageId")) == false) { return false; diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs index b7187da743..17c5859e91 100755 --- a/src/Umbraco.Web/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web/Macros/MacroRenderer.cs @@ -29,7 +29,7 @@ namespace Umbraco.Web.Macros { private readonly IProfilingLogger _plogger; - // todo: there are many more things that would need to be injected in here + // TODO: there are many more things that would need to be injected in here public MacroRenderer(IProfilingLogger plogger) { @@ -226,7 +226,7 @@ namespace Umbraco.Web.Macros // still, this is ugly. The macro should have a Content property // referring to IPublishedContent we're rendering the macro against, - // this is all soooo convoluted ;-( + // this is all so convoluted ;-( public MacroContent Render(MacroModel macro, Hashtable pageElements, int pageId, Hashtable attributes) { @@ -547,7 +547,7 @@ namespace Umbraco.Web.Macros private static string EncodeMacroAttribute(string attributeContents) { - // replace linebreaks + // replace line breaks attributeContents = attributeContents.Replace("\n", "\\n").Replace("\r", "\\r"); // replace quotes diff --git a/src/Umbraco.Web/Macros/MacroTagParser.cs b/src/Umbraco.Web/Macros/MacroTagParser.cs index cbfc1ce0f7..8e3f116614 100644 --- a/src/Umbraco.Web/Macros/MacroTagParser.cs +++ b/src/Umbraco.Web/Macros/MacroTagParser.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Macros /// persist all macro formats like {?UMBRACO_MACRO macroAlias=\"myMacro\" /} /// /// - /// The html attributes to be added to the div + /// The HTML attributes to be added to the div /// /// /// This converts the persisted macro format to this: @@ -77,11 +77,11 @@ namespace Umbraco.Web.Macros /// /// /// - /// This is required because when editors are using the rte, the html that is contained in the editor might actually be displaying + /// This is required because when editors are using the rte, the HTML that is contained in the editor might actually be displaying /// the entire macro content, when the data is submitted the editor will clear most of this data out but we'll still need to parse it properly - /// and ensure the correct sytnax is persisted to the db. + /// and ensure the correct syntax is persisted to the db. /// - /// When a macro is inserted into the rte editor, the html will be: + /// When a macro is inserted into the rte editor, the HTML will be: /// /// {div class='umb-macro-holder'} /// @@ -134,7 +134,7 @@ namespace Umbraco.Web.Macros } /// - /// This will accept a text block and seach/parse it for macro markup. + /// This will accept a text block and search/parse it for macro markup. /// When either a text block or a a macro is found, it will call the callback method. /// /// diff --git a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs index 84164bc47f..e6577dea1f 100644 --- a/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs +++ b/src/Umbraco.Web/Media/EmbedProviders/OEmbedResponse.cs @@ -47,7 +47,7 @@ namespace Umbraco.Web.Media.EmbedProviders /// /// Gets the HTML. /// - /// The response html + /// The response HTML public string GetHtml() { if (Type == "photo") diff --git a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs index e116e1994f..86bd12c15e 100644 --- a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs +++ b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs @@ -99,7 +99,7 @@ namespace Umbraco.Web.Media.Exif /// Returns an unsigned rational number converted from the first /// eight bytes of the given byte array. The first four bytes are /// assumed to be the numerator and the next four bytes are the - /// denumerator. + /// denominator. /// Numbers are converted from the given byte-order to platform byte-order. /// public static MathEx.UFraction32 ToURational(byte[] data, ByteOrder frombyteorder) @@ -115,7 +115,7 @@ namespace Umbraco.Web.Media.Exif /// Returns a signed rational number converted from the first /// eight bytes of the given byte array. The first four bytes are /// assumed to be the numerator and the next four bytes are the - /// denumerator. + /// denominator. /// Numbers are converted from the given byte-order to platform byte-order. /// public static MathEx.Fraction32 ToSRational(byte[] data, ByteOrder frombyteorder) diff --git a/src/Umbraco.Web/Media/Exif/ExifProperty.cs b/src/Umbraco.Web/Media/Exif/ExifProperty.cs index 3a6efcab0b..588d3d9f92 100644 --- a/src/Umbraco.Web/Media/Exif/ExifProperty.cs +++ b/src/Umbraco.Web/Media/Exif/ExifProperty.cs @@ -17,7 +17,7 @@ namespace Umbraco.Web.Media.Exif /// public ExifTag Tag { get { return mTag; } } /// - /// Gets the IFD section contaning this property. + /// Gets the IFD section containing this property. /// public IFD IFD { get { return mIFD; } } /// diff --git a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs index 08d1f40afd..68769eb1f3 100644 --- a/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs +++ b/src/Umbraco.Web/Media/Exif/ExifPropertyFactory.cs @@ -17,7 +17,7 @@ namespace Umbraco.Web.Media.Exif /// Byte or component count. /// Field data as an array of bytes. /// Byte order of value. - /// IFD section containing this propery. + /// IFD section containing this property. /// The encoding to be used for text metadata when the source encoding is unknown. /// an ExifProperty initialized from the interoperability parameters. public static ExifProperty Get(ushort tag, ushort type, uint count, byte[] value, BitConverterEx.ByteOrder byteOrder, IFD ifd, Encoding encoding) diff --git a/src/Umbraco.Web/Media/Exif/ExifTag.cs b/src/Umbraco.Web/Media/Exif/ExifTag.cs index a65d75d7c7..5c85b9558d 100644 --- a/src/Umbraco.Web/Media/Exif/ExifTag.cs +++ b/src/Umbraco.Web/Media/Exif/ExifTag.cs @@ -95,7 +95,7 @@ namespace Umbraco.Web.Media.Exif // Rating Rating = IFD.Zeroth + 0x4746, RatingPercent = IFD.Zeroth + 0x4749, - // Microsoft specifing padding and offset tags + // Microsoft specifying padding and offset tags ZerothIFDPadding = IFD.Zeroth + 0xea1c, // **************************** // EXIF Tags @@ -157,7 +157,7 @@ namespace Umbraco.Web.Media.Exif SubjectDistanceRange = IFD.EXIF + 41996, ImageUniqueID = IFD.EXIF + 42016, InteroperabilityIFDPointer = IFD.EXIF + 40965, - // Microsoft specifing padding and offset tags + // Microsoft specifying padding and offset tags ExifIFDPadding = IFD.EXIF + 0xea1c, OffsetSchema = IFD.EXIF + 0xea1d, // **************************** diff --git a/src/Umbraco.Web/Media/Exif/JPEGFile.cs b/src/Umbraco.Web/Media/Exif/JPEGFile.cs index d7a5d322dc..35c3788abd 100644 --- a/src/Umbraco.Web/Media/Exif/JPEGFile.cs +++ b/src/Umbraco.Web/Media/Exif/JPEGFile.cs @@ -338,7 +338,7 @@ namespace Umbraco.Web.Media.Exif // Create a memory stream to write the APP0 section to MemoryStream ms = new MemoryStream(); - // JFIF identifer + // JFIF identifier ms.Write(Encoding.ASCII.GetBytes("JFIF\0"), 0, 5); // Write tags @@ -431,7 +431,7 @@ namespace Umbraco.Web.Media.Exif // Create a memory stream to write the APP0 section to MemoryStream ms = new MemoryStream(); - // JFIF identifer + // JFIF identifier ms.Write(Encoding.ASCII.GetBytes("JFXX\0"), 0, 5); // Write tags @@ -704,13 +704,13 @@ namespace Umbraco.Web.Media.Exif return false; } - // We will need these bitconverter to write byte-ordered data + // We will need these BitConverters to write byte-ordered data BitConverterEx bceExif = new BitConverterEx(BitConverterEx.SystemByteOrder, ByteOrder); // Create a memory stream to write the APP1 section to MemoryStream ms = new MemoryStream(); - // Exif identifer + // Exif identifier ms.Write(Encoding.ASCII.GetBytes("Exif\0\0"), 0, 6); // TIFF header @@ -812,7 +812,7 @@ namespace Umbraco.Web.Media.Exif currentdataoffset + interop.Data.Length > makerNoteOffset && ifd.ContainsKey(ExifTag.MakerNote)) { - // Delay writing this field until we write makernote data + // Delay writing this field until we write the creator's note data fieldqueue.Enqueue(field); continue; } @@ -847,7 +847,7 @@ namespace Umbraco.Web.Media.Exif } // Fields containing offsets to other IFDs - // Just store their offets, we will write the values later on when we know the lengths of IFDs + // Just store their offsets, we will write the values later on when we know the lengths of IFDs if (ifdtype == IFD.Zeroth && interop.TagID == 0x8769) exifIFDFieldOffset = stream.Position; else if (ifdtype == IFD.Zeroth && interop.TagID == 0x8825) diff --git a/src/Umbraco.Web/Media/Exif/MathEx.cs b/src/Umbraco.Web/Media/Exif/MathEx.cs index 508c5025f7..735358c40a 100644 --- a/src/Umbraco.Web/Media/Exif/MathEx.cs +++ b/src/Umbraco.Web/Media/Exif/MathEx.cs @@ -251,7 +251,7 @@ namespace Umbraco.Web.Media.Exif { return new Fraction32(f1.Numerator * f2.Numerator, f1.Denominator * f2.Denominator); } - // Divison + // Division public static Fraction32 operator /(Fraction32 f, int n) { return new Fraction32(f.Numerator / n, f.Denominator / System.Math.Abs(n)); @@ -893,7 +893,7 @@ namespace Umbraco.Web.Media.Exif { return new UFraction32(f1.Numerator * f2.Numerator, f1.Denominator * f2.Denominator); } - // Divison + // Division public static UFraction32 operator /(UFraction32 f, uint n) { return new UFraction32(f.Numerator / n, f.Denominator / n); diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs index 48eb06c88a..a01958be01 100644 --- a/src/Umbraco.Web/ModelStateExtensions.cs +++ b/src/Umbraco.Web/ModelStateExtensions.cs @@ -87,7 +87,7 @@ namespace Umbraco.Web // if there are assigned member names, we combine the member name with the owner name // so that we can try to match it up to a real field. otherwise, we assume that the // validation message is for the overall owner. - // Owner = the component being validated, like a content property but could be just an html field on another editor + // Owner = the component being validated, like a content property but could be just an HTML field on another editor var withNames = false; var delimitedParts = string.Join(".", parts); diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs b/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs index 51352a5412..86b30652bb 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentSortOrder.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Models.ContentEditing /// An array of integer Ids representing the sort order /// /// - /// Of course all of these Ids should be at the same level in the heirarchy!! + /// Of course all of these Ids should be at the same level in the hierarchy!! /// [DataMember(Name = "idSortOrder", IsRequired = true)] [Required] diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs index 5b986a0679..aff79d7b9d 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentVariationDisplay.cs @@ -72,7 +72,7 @@ namespace Umbraco.Web.Models.ContentEditing /// This is used to add custom localized messages/strings to the response for the app to use for localized UI purposes. /// /// - /// The notifications assigned to a variant are currently only used to show custom messagse in the save/publish dialogs. + /// The notifications assigned to a variant are currently only used to show custom messages in the save/publish dialogs. /// [DataMember(Name = "notifications")] [ReadOnly(true)] diff --git a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs b/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs index a0ab02768c..72a28f633f 100644 --- a/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs +++ b/src/Umbraco.Web/Models/ContentEditing/DictionaryTranslationSave.cs @@ -9,7 +9,7 @@ namespace Umbraco.Web.Models.ContentEditing public class DictionaryTranslationSave { /// - /// Gets or sets the iso code. + /// Gets or sets the ISO code. /// [DataMember(Name = "isoCode")] public string IsoCode { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs index 0c633d0319..6cb2ccffaf 100644 --- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs +++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs @@ -54,7 +54,7 @@ namespace Umbraco.Web.Models.ContentEditing /// This will only be populated for some entities like macros /// /// - /// This is overrideable to specify different validation attributes if required + /// It is possible to override this to specify different validation attributes if required /// [DataMember(Name = "alias")] public virtual string Alias { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs index c443175260..55e140d6f3 100644 --- a/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/RelationTypeDisplay.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.Models.ContentEditing public string ParentObjectTypeName { get; set; } /// - /// Gets or sets the Childs object type id + /// Gets or sets the Child's object type id /// /// Corresponds to the NodeObjectType in the umbracoNode table [DataMember(Name = "childObjectType", IsRequired = true)] diff --git a/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs b/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs index 5394636bbf..af35412a49 100644 --- a/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs +++ b/src/Umbraco.Web/Models/ContentEditing/SimpleNotificationModel.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.Models.ContentEditing public List Notifications { get; private set; } /// - /// A default msg + /// A default message /// [DataMember(Name = "message")] public string Message { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs b/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs index 604e726e6f..4c958656ef 100644 --- a/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs +++ b/src/Umbraco.Web/Models/ContentEditing/TabbedContentItem.cs @@ -22,13 +22,13 @@ namespace Umbraco.Web.Models.ContentEditing // note // once a [DataContract] has been defined on a class, with a [DataMember] property, - // one simply cannot ignore that property anymore - [IgnoreDataMember] on an overriden + // one simply cannot ignore that property anymore - [IgnoreDataMember] on an overridden // property is ignored, and 'newing' the property means that it's the base property // which is used // // OTOH, Json.NET is happy having [JsonIgnore] on overrides, even though the base // property is [JsonProperty]. so, forcing [JsonIgnore] here, but really, we should - // rething the whole thing. + // rethink the whole thing. /// /// Override the properties property to ensure we don't serialize this diff --git a/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs b/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs index 22c177190d..ce4c053099 100644 --- a/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs +++ b/src/Umbraco.Web/Models/ContentEditing/TreeSearchResult.cs @@ -24,7 +24,7 @@ namespace Umbraco.Web.Models.ContentEditing /// /// This is optional but if specified should be the name of a method on the jsSvc angular service to use, if not - /// specfied than it will expect the method to be called `format(searchResult, appAlias, treeAlias)` + /// specified than it will expect the method to be called `format(searchResult, appAlias, treeAlias)` /// [DataMember(Name = "jsMethod")] public string JsFormatterMethod { get; set; } diff --git a/src/Umbraco.Web/Models/ImageCropMode.cs b/src/Umbraco.Web/Models/ImageCropMode.cs index 03fe6676cb..1e168d03e0 100644 --- a/src/Umbraco.Web/Models/ImageCropMode.cs +++ b/src/Umbraco.Web/Models/ImageCropMode.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.Models Crop, /// - /// Resizes the image to the given dimensions. If the set dimensions do not match the aspect ratio of the original image then the output is resized to the maximum possible value in each direction while aintaining the original aspect ratio. + /// Resizes the image to the given dimensions. If the set dimensions do not match the aspect ratio of the original image then the output is resized to the maximum possible value in each direction while maintaining the original aspect ratio. /// Max, diff --git a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs index 7db491ad2e..01e57bd872 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.Models.Mapping var langs = context.Mapper.Map, IEnumerable>(allLanguages, null, context).ToList(); - //create a variant for each lang, then we'll populate the values + //create a variant for each language, then we'll populate the values var variants = langs.Select(x => { //We need to set the culture in the mapping context since this is needed to ensure that the correct property values @@ -55,13 +55,13 @@ namespace Umbraco.Web.Models.Mapping //Put the default language first in the list & then sort rest by a-z var defaultLang = variants.SingleOrDefault(x => x.Language.IsDefault); - //Remove the default lang from the list for now + //Remove the default language from the list for now variants.Remove(defaultLang); //Sort the remaining languages a-z variants = variants.OrderBy(x => x.Name).ToList(); - //Insert the default lang as the first item + //Insert the default language as the first item variants.Insert(0, defaultLang); return variants; diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs index ba8076b457..257a53cf1a 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeProfileExtensions.cs @@ -195,7 +195,7 @@ namespace Umbraco.Web.Models.Mapping { // handle property groups and property types // note that ContentTypeSave has - // - all groups, inherited and local; only *one* occurence per group *name* + // - all groups, inherited and local; only *one* occurrence per group *name* // - potentially including the generic properties group // - all properties, inherited and local // @@ -296,7 +296,7 @@ namespace Umbraco.Web.Models.Mapping PropertyType destProperty; if (sourceProperty.Id > 0) { - // updateg an existing property + // updating an existing property // ensure it is still there, then map/update destProperty = destOrigProperties.FirstOrDefault(x => x.Id == sourceProperty.Id); if (destProperty != null) @@ -310,7 +310,7 @@ namespace Umbraco.Web.Models.Mapping } // insert a new property, or update an existing property that has - // been deletedin the meantime and we need to re-create + // been deleted in the meantime and we need to re-create // map/create destProperty = Mapper.Map(sourceProperty); return destProperty; diff --git a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs index b3af04603c..01fcfa6f13 100644 --- a/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/DictionaryMapperProfile.cs @@ -47,7 +47,7 @@ namespace Umbraco.Web.Models.Mapping (src, dest) => { // build up the path to make it possible to set active item in tree - // TODO check if there is a better way + // TODO: check if there is a better way if (src.ParentId.HasValue) { var ids = new List { -1 }; @@ -112,7 +112,7 @@ namespace Umbraco.Web.Models.Mapping } /// - /// Goes up the dictoinary tree to get all parent ids + /// Goes up the dictionary tree to get all parent ids /// /// /// The parent id. diff --git a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs index ea29b671a6..13c6af2fda 100644 --- a/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs @@ -45,13 +45,13 @@ namespace Umbraco.Web.Models.Mapping //Put the default language first in the list & then sort rest by a-z var defaultLang = langs.SingleOrDefault(x => x.IsDefault); - //Remove the default lang from the list for now + //Remove the default language from the list for now langs.Remove(defaultLang); //Sort the remaining languages a-z langs = langs.OrderBy(x => x.Name).ToList(); - //Insert the default lang as the first item + //Insert the default language as the first item langs.Insert(0, defaultLang); return langs; diff --git a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs index a50a4f190e..1be74ce583 100644 --- a/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs +++ b/src/Umbraco.Web/Models/Mapping/MacroMapperProfile.cs @@ -35,7 +35,7 @@ namespace Umbraco.Web.Models.Mapping .AfterMap((property, parameter) => { //map the view and the config - // we need to show the depracated ones for backwards compatibility + // we need to show the deprecated ones for backwards compatibility var paramEditor = Current.ParameterEditors[property.EditorAlias]; // todo - include/filter deprecated?! if (paramEditor == null) { diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs index e32531e61a..c8391abdb4 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesResolver.cs @@ -14,7 +14,7 @@ using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Models.Mapping { /// - /// A custom tab/property resolver for members which will ensure that the built-in membership properties are or arent' displayed + /// A custom tab/property resolver for members which will ensure that the built-in membership properties are or aren't displayed /// depending on if the member type has these properties /// /// @@ -38,7 +38,7 @@ namespace Umbraco.Web.Models.Mapping } /// - /// Overriden to deal with custom member properties and permissions. + /// Overridden to deal with custom member properties and permissions. public override IEnumerable> Resolve(IMember source, MemberDisplay destination, IEnumerable> destMember, ResolutionContext context) { var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider(); @@ -52,7 +52,7 @@ namespace Umbraco.Web.Models.Mapping if (provider.IsUmbracoMembershipProvider() == false) { - //it's a generic provider so update the locked out property based on our known constant alias + // it's a generic provider so update the locked out property based on our known constant alias var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == Constants.Conventions.Member.IsLockedOut); if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1") { @@ -64,8 +64,8 @@ namespace Umbraco.Web.Models.Mapping { var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)provider; - //This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier - // if we just had all of the membeship provider fields on the member table :( + // This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier + // if we just had all of the membership provider fields on the member table :( // TODO: But is there a way to map the IMember.IsLockedOut to the property ? i dunno. var isLockedOutProperty = resolved.SelectMany(x => x.Properties).FirstOrDefault(x => x.Alias == umbracoProvider.LockPropertyTypeAlias); if (isLockedOutProperty?.Value != null && isLockedOutProperty.Value.ToString() != "1") @@ -82,7 +82,7 @@ namespace Umbraco.Web.Models.Mapping { var memberTypeLink = string.Format("#/member/memberTypes/edit/{0}", source.ContentTypeId); - //Replace the doctype property + // Replace the doctype property var docTypeProperty = resolved.SelectMany(x => x.Properties) .First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); docTypeProperty.Value = new List @@ -135,7 +135,7 @@ namespace Umbraco.Web.Models.Mapping { Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password", Label = _localizedTextService.Localize("password"), - //NOTE: The value here is a json value - but the only property we care about is the generatedPassword one if it exists, the newPassword exists + // NOTE: The value here is a json value - but the only property we care about is the generatedPassword one if it exists, the newPassword exists // only when creating a new member and we want to have a generated password pre-filled. Value = new Dictionary { @@ -143,12 +143,12 @@ namespace Umbraco.Web.Models.Mapping {"generatedPassword", member.GetAdditionalDataValueIgnoreCase("GeneratedPassword", null)}, {"newPassword", member.GetAdditionalDataValueIgnoreCase("NewPassword", null)}, }, - //TODO: Hard coding this because the changepassword doesn't necessarily need to be a resolvable (real) property editor + // TODO: Hard coding this because the changepassword doesn't necessarily need to be a resolvable (real) property editor View = "changepassword", - //initialize the dictionary with the configuration from the default membership provider + // initialize the dictionary with the configuration from the default membership provider Config = new Dictionary(membersProvider.GetConfiguration(_userService)) { - //the password change toggle will only be displayed if there is already a password assigned. + // the password change toggle will only be displayed if there is already a password assigned. {"hasPassword", member.RawPasswordValue.IsNullOrWhiteSpace() == false} } }, @@ -180,21 +180,21 @@ namespace Umbraco.Web.Models.Mapping var umbracoContext = _umbracoContextAccessor.UmbracoContext; - //now update the IsSensitive value + // now update the IsSensitive value foreach (var prop in result) { - //check if this property is flagged as sensitive + // check if this property is flagged as sensitive var isSensitiveProperty = memberType.IsSensitiveProperty(prop.Alias); - //check permissions for viewing sensitive data + // check permissions for viewing sensitive data if (isSensitiveProperty && (umbracoContext == null || umbracoContext.Security.CurrentUser.HasAccessToSensitiveData() == false)) { - //mark this property as sensitive + // mark this property as sensitive prop.IsSensitive = true; - //mark this property as readonly so that it does not post any data + // mark this property as readonly so that it does not post any data prop.Readonly = true; - //replace this editor with a sensitivevalue + // replace this editor with a sensitive value prop.View = "sensitivevalue"; - //clear the value + // clear the value prop.Value = null; } } @@ -211,7 +211,7 @@ namespace Umbraco.Web.Models.Mapping /// /// /// If the membership provider installed is the umbraco membership provider, then we will allow changing the username, however if - /// the membership provider is a custom one, we cannot allow chaning the username because MembershipProvider's do not actually natively + /// the membership provider is a custom one, we cannot allow changing the username because MembershipProvider's do not actually natively /// allow that. /// internal static ContentPropertyDisplay GetLoginProperty(IMemberService memberService, IMember member, ILocalizedTextService localizedText) @@ -225,7 +225,7 @@ namespace Umbraco.Web.Models.Mapping var scenario = memberService.GetMembershipScenario(); - //only allow editing if this is a new member, or if the membership provider is the umbraco one + // only allow editing if this is a new member, or if the membership provider is the Umbraco one if (member.HasIdentity == false || scenario == MembershipScenario.NativeUmbraco) { prop.View = "textbox"; diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs index ab33c3886b..2f2af047f7 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs @@ -98,10 +98,10 @@ namespace Umbraco.Web.Models.Mapping //re-assign genericProps.Properties = contentProps; - //Show or hide properties tab based on wether it has or not any properties + //Show or hide properties tab based on whether it has or not any properties if (genericProps.Properties.Any() == false) { - //loop throug the tabs, remove the one with the id of zero and exit the loop + //loop through the tabs, remove the one with the id of zero and exit the loop for (var i = 0; i < tabs.Count; i++) { if (tabs[i].Id != 0) continue; diff --git a/src/Umbraco.Web/Models/PackageInstallModel.cs b/src/Umbraco.Web/Models/PackageInstallModel.cs index c4dbbfde2a..b489604261 100644 --- a/src/Umbraco.Web/Models/PackageInstallModel.cs +++ b/src/Umbraco.Web/Models/PackageInstallModel.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.Models public string ZipFileName { get; set; } /// - /// During installation this can be used to track any pending appdomain restarts + /// During installation this can be used to track any pending AppDomain restarts /// [DataMember(Name = "isRestarting")] public bool IsRestarting { get; set; } diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs index 12acb6b0c8..c7e38ab7f0 100644 --- a/src/Umbraco.Web/Models/PublishedContentBase.cs +++ b/src/Umbraco.Web/Models/PublishedContentBase.cs @@ -10,7 +10,7 @@ namespace Umbraco.Web.Models /// /// Provide an abstract base class for IPublishedContent implementations. /// - /// This base class does which (a) consitently resolves and caches the Url, (b) provides an implementation + /// This base class does which (a) consistently resolves and caches the Url, (b) provides an implementation /// for this[alias], and (c) provides basic content set management. [DebuggerDisplay("Content Id: {Id}, Name: {Name}")] public abstract class PublishedContentBase : IPublishedContent diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs index 44845bfd43..86a5459a74 100644 --- a/src/Umbraco.Web/Models/RegisterModel.cs +++ b/src/Umbraco.Web/Models/RegisterModel.cs @@ -77,7 +77,7 @@ namespace Umbraco.Web.Models public bool UsernameIsEmail { get; set; } /// - /// Specifies if the member should be logged in if they are succesfully created + /// Specifies if the member should be logged in if they are successfully created /// public bool LoginOnSuccess { get; set; } diff --git a/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs b/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs index 819d74f8e7..e25c317716 100644 --- a/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs +++ b/src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs @@ -63,7 +63,7 @@ } /// - /// Sets the node style to show that it is is not published + /// Sets the node style to show that it is not published /// /// public static void SetNotPublishedStyle(this TreeNode treeNode) diff --git a/src/Umbraco.Web/Mvc/ControllerExtensions.cs b/src/Umbraco.Web/Mvc/ControllerExtensions.cs index 1906e6ba81..d7a693be2d 100644 --- a/src/Umbraco.Web/Mvc/ControllerExtensions.cs +++ b/src/Umbraco.Web/Mvc/ControllerExtensions.cs @@ -165,7 +165,7 @@ namespace Umbraco.Web.Mvc /// Normally in MVC the way that the View object gets assigned to the result is to Execute the ViewResult, this however /// will write to the Response output stream which isn't what we want. Instead, this method will use the same logic inside /// of MVC to assign the View object to the result but without executing it. - /// This is only relavent for view results of PartialViewResult or ViewResult. + /// This is only relevant for view results of PartialViewResult or ViewResult. /// /// /// diff --git a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs index 380ec4cd4e..567e9ca145 100644 --- a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs +++ b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs @@ -13,7 +13,7 @@ namespace Umbraco.Web.Mvc { base.OnResultExecuting(filterContext); - // could happens if exception (but afaik this wouldn't happen in MVC) + // could happens if exception (but AFAIK this wouldn't happen in MVC) if (filterContext.HttpContext == null || filterContext.HttpContext.Response == null || filterContext.HttpContext.Response.Cache == null) { diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs index a28afe1713..62a7c48d2b 100644 --- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs +++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs @@ -73,7 +73,7 @@ namespace Umbraco.Web.Mvc /// protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); - // todo - try lazy property injection? + // TODO: try lazy property injection? private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance(); /// @@ -86,7 +86,7 @@ namespace Umbraco.Web.Mvc { base.OnActionExecuted(filterContext); - //First we need to check if the pcr has been set, if it has we're going to ignore this and not actually do anything + // First we need to check if the published content request has been set, if it has we're going to ignore this and not actually do anything if (UmbracoContext.Current.PublishedRequest != null) { return; diff --git a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs index 6bc799baa5..6d2f1ce501 100644 --- a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs +++ b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs @@ -29,7 +29,7 @@ namespace Umbraco.Web.Mvc // ControllerBuilder.Current when setting up Mvc and WebApi, it cannot be ctored by // the IoC container - and yet we don't want that ctor to resolve the factories // as that happen before everything is configured - so, passing a factories - // accessor func. + // accessor function. _factoriesAccessor = factoriesAccessor; } diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs index 03d6e2905c..e3f4b45ce6 100644 --- a/src/Umbraco.Web/Mvc/PluginController.cs +++ b/src/Umbraco.Web/Mvc/PluginController.cs @@ -27,7 +27,7 @@ namespace Umbraco.Web.Mvc // note // properties marked as [Inject] below will be property-injected (vs constructor-injected) in - // order to keep the constuctor as light as possible, so that ppl implementing eg a SurfaceController + // order to keep the constructor as light as possible, so that ppl implementing eg a SurfaceController // don't need to implement complex constructors + need to refactor them each time we change ours. // this means that these properties have a setter. // what can go wrong? diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index c9123175b1..10efb54552 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -49,7 +49,7 @@ namespace Umbraco.Web.Mvc #region IRouteHandler Members /// - /// Assigns the correct controller based on the Umbraco request and returns a standard MvcHandler to prcess the response, + /// Assigns the correct controller based on the Umbraco request and returns a standard MvcHandler to process the response, /// this also stores the render model into the data tokens for the current RouteData. /// /// @@ -428,7 +428,7 @@ namespace Umbraco.Web.Mvc // Set the session state requirements requestContext.HttpContext.SetSessionStateBehavior(GetSessionStateBehavior(requestContext, routeDef.ControllerName)); - // reset the friendly path so in the controllers and anything occuring after this point in time, + // reset the friendly path so in the controllers and anything occurring after this point in time, //the URL is reset back to the original request. requestContext.HttpContext.RewritePath(UmbracoContext.OriginalRequestUrl.PathAndQuery); diff --git a/src/Umbraco.Web/Mvc/Strings.Designer.cs b/src/Umbraco.Web/Mvc/Strings.Designer.cs index a897e5349c..40269241a5 100644 --- a/src/Umbraco.Web/Mvc/Strings.Designer.cs +++ b/src/Umbraco.Web/Mvc/Strings.Designer.cs @@ -62,12 +62,12 @@ namespace Umbraco.Web.Mvc { /// /// Looks up a localized string similar to <?xml version="1.0"?> - ///<configuration> /// - /// <configSections> - /// <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> - /// <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" /> - /// <section name="page [rest of string was truncated]";. + ///<configuration> + /// <configSections> + /// <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> + /// <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" /> + /// < [rest of string was truncated]";. /// internal static string WebConfigTemplate { get { diff --git a/src/Umbraco.Web/Mvc/Strings.resx b/src/Umbraco.Web/Mvc/Strings.resx index fd82fa3865..1d4028f594 100644 --- a/src/Umbraco.Web/Mvc/Strings.resx +++ b/src/Umbraco.Web/Mvc/Strings.resx @@ -37,7 +37,7 @@ mimetype set. The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not + ResXResourceReader how to stop persisting the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format @@ -121,4 +121,4 @@ ..\..\umbraco.web.ui\views\web.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - \ No newline at end of file + diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs index 8b76a2069d..fa0b1c5458 100644 --- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs @@ -85,7 +85,7 @@ namespace Umbraco.Web.Mvc } /// - /// Override to to ensure no redirect occurs + /// Override to ensure no redirect occurs /// /// protected override void HandleUnauthorizedRequest(AuthorizationContext filterContext) diff --git a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs index 9769945f37..36ec76b3d9 100644 --- a/src/Umbraco.Web/Mvc/UmbracoPageResult.cs +++ b/src/Umbraco.Web/Mvc/UmbracoPageResult.cs @@ -94,7 +94,7 @@ namespace Umbraco.Web.Mvc /// /// When POSTing to MVC but rendering in WebForms we need to do some trickery, we'll create a dummy viewcontext with all of the - /// current modelstate, tempdata, viewdata so that if we're rendering partial view macros within the webforms view, they will + /// current model state, tempdata, viewdata so that if we're rendering partial view macros within the webforms view, they will /// get all of this merged into them. /// /// diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs index 164fb7acf7..0c95e1d446 100644 --- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs @@ -11,7 +11,7 @@ namespace Umbraco.Web.Mvc { public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler { - // todo - try lazy property injection? + // TODO: - try lazy property injection? private PublishedRouter PublishedRouter => Core.Composing.Current.Factory.GetInstance(); /// @@ -54,20 +54,21 @@ namespace Umbraco.Web.Mvc request.PublishedContent = found; umbracoContext.PublishedRequest = request; - //allows inheritors to change the pcr + // allows inheritors to change the published content request PreparePublishedContentRequest(umbracoContext.PublishedRequest); - //create the render model + // create the render model var renderModel = new ContentModel(umbracoContext.PublishedRequest.PublishedContent); - //assigns the required tokens to the request + // assigns the required tokens to the request requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, renderModel); requestContext.RouteData.DataTokens.Add(Core.Constants.Web.PublishedDocumentRequestDataToken, umbracoContext.PublishedRequest); requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbracoContext); - //this is used just for a flag that this is an umbraco custom route + + // this is used just for a flag that this is an umbraco custom route requestContext.RouteData.DataTokens.Add(Core.Constants.Web.CustomRouteDataToken, true); - //Here we need to detect if a SurfaceController has posted + // Here we need to detect if a SurfaceController has posted var formInfo = RenderRouteHandler.GetFormInfo(requestContext); if (formInfo != null) { @@ -78,7 +79,7 @@ namespace Umbraco.Web.Mvc PublishedRequest = umbracoContext.PublishedRequest }; - //set the special data token to the current route definition + // set the special data token to the current route definition requestContext.RouteData.DataTokens[Core.Constants.Web.UmbracoRouteDefinitionDataToken] = def; return RenderRouteHandler.HandlePostedValues(requestContext, formInfo); diff --git a/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs b/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs index c1b6fee8eb..2852e80619 100644 --- a/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs +++ b/src/Umbraco.Web/Mvc/ViewDataContainerExtensions.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.Mvc { var newContainer = new ViewDataContainer(); newContainer.ViewData.ModelState.Merge(container.ViewData.ModelState, prefix); - //change the html field name too + //change the HTML field name too newContainer.ViewData.TemplateInfo.HtmlFieldPrefix = prefix; return newContainer; } diff --git a/src/Umbraco.Web/OwinExtensions.cs b/src/Umbraco.Web/OwinExtensions.cs index e7e1e85b50..6961f5c915 100644 --- a/src/Umbraco.Web/OwinExtensions.cs +++ b/src/Umbraco.Web/OwinExtensions.cs @@ -44,7 +44,7 @@ namespace Umbraco.Web } /// - /// Nasty little hack to get httpcontextbase from an owin context + /// Nasty little hack to get HttpContextBase from an owin context /// /// /// diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs index 2b32e9d774..6d87bfe495 100644 --- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs @@ -42,7 +42,7 @@ namespace Umbraco.Web.PropertyEditors /// Gets a value indicating whether a property is an upload field. /// /// The property. - /// A value indicating whether a property is an upload field, and (optionaly) has a non-empty value. + /// A value indicating whether a property is an upload field, and (optionally) has a non-empty value. private static bool IsUploadField(Property property) { return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField; @@ -61,7 +61,7 @@ namespace Umbraco.Web.PropertyEditors } /// - /// Look through all propery values stored against the property and resolve any file paths stored + /// Look through all property values stored against the property and resolve any file paths stored /// /// /// diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs index c238f93467..8c2f7ac488 100644 --- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs @@ -4,7 +4,7 @@ using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { /// - /// Represents the configuration for the gid value editor. + /// Represents the configuration for the grid value editor. /// public class GridConfiguration { diff --git a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs index 4a74925816..fe86bb9a6e 100644 --- a/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/GridConfigurationEditor.cs @@ -3,8 +3,8 @@ namespace Umbraco.Web.PropertyEditors { /// - /// Represents the configuration for the gid value editor. + /// Represents the configuration for the grid value editor. /// public class GridConfigurationEditor : ConfigurationEditor { } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs index 2ca58b06e2..fff11a28a5 100644 --- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs @@ -57,7 +57,7 @@ namespace Umbraco.Web.PropertyEditors /// Gets a value indicating whether a property is an image cropper field. /// /// The property. - /// A value indicating whether a property is an image cropper field, and (optionaly) has a non-empty value. + /// A value indicating whether a property is an image cropper field, and (optionally) has a non-empty value. private static bool IsCropperField(Property property) { return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper; @@ -69,7 +69,7 @@ namespace Umbraco.Web.PropertyEditors /// The property value. /// A value indicating whether to log the error. /// The json object corresponding to the property value. - /// In case of an error, optionaly logs the error and returns null. + /// In case of an error, optionally logs the error and returns null. private JObject GetJObject(string value, bool writeLog) { if (string.IsNullOrWhiteSpace(value)) @@ -100,7 +100,7 @@ namespace Umbraco.Web.PropertyEditors } /// - /// Look through all propery values stored against the property and resolve any file paths stored + /// Look through all property values stored against the property and resolve any file paths stored /// /// /// diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs index 6ee0d23d95..78f2189829 100644 --- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs @@ -166,7 +166,7 @@ namespace Umbraco.Web.PropertyEditors if (value == null || string.IsNullOrEmpty(value.ToString())) return null; - // if we dont have a json structure, we will get it from the property type + // if we don't have a json structure, we will get it from the property type var val = value.ToString(); if (val.DetectIsJson()) return val; diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs index a52ee2138e..75fe581d5b 100644 --- a/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.PropertyEditors /// public override Dictionary ToConfigurationEditor(MultiNodePickerConfiguration configuration) { - // sanitize configuraiton + // sanitize configuration var output = base.ToConfigurationEditor(configuration); output["multiPicker"] = configuration.MaxNumber > 1 ? true : false; diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs index 59a96a0e41..a7d05799d9 100644 --- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringConfigurationEditor.cs @@ -6,7 +6,7 @@ using Umbraco.Core.PropertyEditors.Validators; namespace Umbraco.Web.PropertyEditors { /// - /// Represents the configuration editor for a multiple testring value editor. + /// Represents the configuration editor for a multiple textstring value editor. /// internal class MultipleTextStringConfigurationEditor : ConfigurationEditor { @@ -35,7 +35,7 @@ namespace Umbraco.Web.PropertyEditors public override MultipleTextStringConfiguration FromConfigurationEditor(IDictionary editorValues, MultipleTextStringConfiguration configuration) { // todo this isn't pretty - //the values from the editor will be min/max fieds and we need to format to json in one field + //the values from the editor will be min/max fields and we need to format to json in one field // is the editor sending strings or ints or?! var min = (editorValues.ContainsKey("min") ? editorValues["min"].ToString() : "0").TryConvertTo(); var max = (editorValues.ContainsKey("max") ? editorValues["max"].ToString() : "0").TryConvertTo(); diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs index 31b65c6357..207e914061 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs @@ -101,7 +101,7 @@ namespace Umbraco.Web.PropertyEditors if (!(val is string strVal)) yield break; - //index the stripped html values + //index the stripped HTML values yield return new KeyValuePair>(property.Alias, new object[] { strVal.StripHtml() }); //store the raw value yield return new KeyValuePair>($"{UmbracoExamineIndex.RawFieldPrefix}{property.Alias}", new object[] { strVal }); diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs index 9199707d10..4cebc5c829 100644 --- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs +++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs @@ -22,7 +22,7 @@ namespace Umbraco.Web.PropertyEditors { var result = new Result(); - //todo cache embed doc + // TODO: cache embed doc var xmlConfig = new XmlDocument(); xmlConfig.Load(IOHelper.GetRootDirectorySafe() + Path.DirectorySeparatorChar + "config" + Path.DirectorySeparatorChar + "EmbeddedMedia.config"); diff --git a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs index 1e671ba044..5d396980e3 100644 --- a/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/TagConfigurationEditor.cs @@ -33,7 +33,7 @@ namespace Umbraco.Web.PropertyEditors public override TagConfiguration FromConfigurationEditor(IDictionary editorValues, TagConfiguration configuration) { - // the front-end editor retuns the string value of the storage type + // the front-end editor returns the string value of the storage type // pure Json could do with // [JsonConverter(typeof(StringEnumConverter))] // but here we're only deserializing to object and it's too late diff --git a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs index bc0c281f98..15c39bf994 100644 --- a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs +++ b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs @@ -10,7 +10,7 @@ namespace Umbraco.Web.PropertyEditors /// /// /// DO NOT inherit from UmbracoAuthorizedJsonController since we don't want to use the angularized - /// json formatter as it causes probs. + /// json formatter as it causes problems. /// [PluginController("UmbracoApi")] public class TagsDataController : UmbracoAuthorizedApiController diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs index 0612c85020..c96e9ff9a3 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters public override object ConvertIntermediateToObject(IPublishedElement owner, PublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview) { - // convert markup to html for frontend rendering. + // convert markup to HTML for frontend rendering. // source should come from ConvertSource and be a string (or null) already var mark = new Markdown(); return new HtmlString(inter == null ? string.Empty : mark.Transform((string)inter)); diff --git a/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs b/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs index 88dd20c516..38dc6fb3ae 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueListUniqueValueValidator.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.PropertyEditors if (!(value is JArray json)) yield break; // we ensure that values are unique - // (those are are not empty - empty values are removed when persisting anyways) + // (those are not empty - empty values are removed when persisting anyways) var groupedValues = json.OfType() .Where(x => x["value"] != null) @@ -38,4 +38,4 @@ namespace Umbraco.Web.PropertyEditors } } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs index cf10ed5f3a..ccdac5664d 100644 --- a/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/IPublishedSnapshotService.cs @@ -17,7 +17,7 @@ namespace Umbraco.Web.PublishedCache * to find out how to get that navigator. * * Because a cache such as NuCache is contextual i.e. it has a "snapshot" thing and remains - * consistent over the snapshot, the navigator has to come come from the "current" snapshot. + * consistent over the snapshot, the navigator has to come from the "current" snapshot. * * So although everything should be injected... we also need a notion of "the current published * snapshot". This is provided by the IPublishedSnapshotAccessor. @@ -105,7 +105,7 @@ namespace Umbraco.Web.PublishedCache * rely on cache refreshers CacheUpdated events to update itself, as these events are external * and the order-of-execution of the handlers cannot be guaranteed, which means that some * user code may run before Umbraco is finished updating itself. Instead, the cache refreshers - * explicitely notify the service of changes. + * explicitly notify the service of changes. * */ diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs index 44d38c8f3a..d983a880cc 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs @@ -93,7 +93,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // if in a domain then start with the root node of the domain // and follow the path // note: if domain has a path (eg example.com/en) which is not recommended anymore - // then then /en part of the domain is basically ignored here... + // then /en part of the domain is basically ignored here... content = GetById(preview, startNodeId); content = FollowRoute(content, parts, 0, culture); } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs index 01f0bbad9b..ed17420645 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/SerializerBase.cs @@ -60,7 +60,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource case 'D': return PrimitiveSerializer.DateTime.ReadFrom(stream); default: - throw new NotSupportedException($"Cannot deserialize unknow type '{type}'."); + throw new NotSupportedException($"Cannot deserialize unknown type '{type}'."); } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs index 068a1866ee..18bf3ead13 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/Navigable/NavigableContentType.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.Navigable // note - PublishedContentType are immutable ie they do not _change_ when the actual IContentTypeComposition // changes, but they are replaced by a new instance, so our map here will clean itself automatically and - // we don't have to manage cache - ConditionalWeakTable does not prevent keys from beeing GCed + // we don't have to manage cache - ConditionalWeakTable does not prevent keys from being GCed private static readonly ConditionalWeakTable TypesMap = new ConditionalWeakTable(); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs index 0423084285..f4449008f9 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.PublishedCache.NuCache composition.SetPublishedSnapshotService(); // add the NuCache health check (hidden from type finder) - // todo - no NuCache health check yet + // TODO: no NuCache health check yet //composition.HealthChecks().Add(); } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs index 69c672ab98..3dee81f1bb 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs @@ -370,7 +370,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // notes: // _contentNode.ChildContentIds is an unordered int[] - // need needs to fetch & sort - do it only once, lazyily, though + // needs to fetch & sort - do it only once, lazily, though // Q: perfs-wise, is it better than having the store managed an ordered list } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index 8675aefd1a..889ce72ce0 100755 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -58,18 +58,18 @@ namespace Umbraco.Web.PublishedCache.NuCache // define constant - determines whether to use cache when previewing // to store eg routes, property converted values, anything - caching // means faster execution, but uses memory - not sure if we want it - // so making it configureable. + // so making it configurable. public static readonly bool FullCacheWhenPreviewing = true; // define constant - determines whether to cache the published content // objects (in the elements cache, or snapshot cache, depending on preview) - // or to refetch them all the time. caching is faster but uses more + // or to re-fetch them all the time. caching is faster but uses more // memory. not sure what we want. public static readonly bool CachePublishedContentChildren = true; // define constant - determines whether to cache the content cache root // objects (in the elements cache, or snapshot cache, depending on preview) - // or to refecth them all the time. caching is faster but uses more + // or to re-fetch them all the time. caching is faster but uses more // memory - not sure what we want. public static readonly bool CacheContentCacheRoots = true; @@ -88,7 +88,7 @@ namespace Umbraco.Web.PublishedCache.NuCache : base(publishedSnapshotAccessor, variationContextAccessor) { //if (Interlocked.Increment(ref _singletonCheck) > 1) - // throw new Exception("Singleton must be instancianted only once!"); + // throw new Exception("Singleton must be instantiated only once!"); _serviceContext = serviceContext; _publishedContentTypeFactory = publishedContentTypeFactory; @@ -140,14 +140,14 @@ namespace Umbraco.Web.PublishedCache.NuCache var localMediaDbPath = IOHelper.MapPath("~/App_Data/NuCache.Media.db"); _localDbExists = System.IO.File.Exists(localContentDbPath) && System.IO.File.Exists(localMediaDbPath); - // if both local dbs exist then GetTree will open them, else new dbs will be created + // if both local databases exist then GetTree will open them, else new databases will be created _localContentDb = BTree.GetTree(localContentDbPath, _localDbExists); _localMediaDb = BTree.GetTree(localMediaDbPath, _localDbExists); } // stores are created with a db so they can write to it, but they do not read from it, // stores need to be populated, happens in OnResolutionFrozen which uses _localDbExists to - // figure out whether it can read the dbs or it should populate them from sql + // figure out whether it can read the databases or it should populate them from sql _contentStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localContentDb); _mediaStore = new ContentStore(publishedSnapshotAccessor, variationContextAccessor, logger, _localMediaDb); } @@ -194,7 +194,7 @@ namespace Umbraco.Web.PublishedCache.NuCache _logger.Fatal(ex, "Panic, exception while loading cache data."); } - // finaly, cache is ready! + // finally, cache is ready! _isReady = true; } } @@ -253,7 +253,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // //// indicates that the snapshot cache should reuse the application request cache //// otherwise a new cache object would be created for the snapshot specifically, - //// which is the default - web boot manager uses this to optimze facades + //// which is the default - web boot manager uses this to optimize facades //public bool PublishedSnapshotCacheIsApplicationRequestCache; public bool IgnoreLocalDb; diff --git a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs index b0231368af..30f6e7e638 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/SnapDictionary.cs @@ -58,7 +58,7 @@ namespace Umbraco.Web.PublishedCache.NuCache // // so when getting a read-lock, // either we are write-locked or not, but if not, we won't be write-locked - // otoh the write-lock may be released in the meantime + // on the other hand the write-lock may be released in the meantime // Lock has a 'forceGen' parameter: // used to start a set of changes that may not commit, to isolate the set from any pending diff --git a/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs b/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs index 6d69b96e0c..62f72a27aa 100644 --- a/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs +++ b/src/Umbraco.Web/PublishedCache/PublishedElementPropertyBase.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.PublishedCache // define constant - determines whether to use cache when previewing // to store eg routes, property converted values, anything - caching // means faster execution, but uses memory - not sure if we want it - // so making it configureable. + // so making it configurable. private const bool FullCacheWhenPreviewing = true; public PublishedElementPropertyBase(PublishedPropertyType propertyType, IPublishedElement element, bool previewing, PropertyCacheLevel referenceCacheLevel, object sourceValue = null, IPublishedSnapshotAccessor publishedSnapshotAccessor = null) diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs index a395db1da5..4e206f73d7 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DictionaryPublishedContent.cs @@ -124,7 +124,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } /// - /// Flag to get/set if this was laoded from examine cache + /// Flag to get/set if this was loaded from examine cache /// internal bool LoadedFromExamine { get; } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index dadf40a33b..5521cabe76 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -119,7 +119,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache { if (ex is FileNotFoundException) { - //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco + //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco //See this thread: http://examine.cdodeplex.com/discussions/264341 //Catch the exception here for the time being, and just fallback to GetMedia //TODO: Need to fix examine in LB scenarios! @@ -245,7 +245,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } catch (FileNotFoundException) { - //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco + //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco //See this thread: http://examine.cdodeplex.com/discussions/264341 //Catch the exception here for the time being, and just fallback to GetMedia //TODO: Need to fix examine in LB scenarios! @@ -302,7 +302,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache { if (ex is FileNotFoundException) { - //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco + //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco //See this thread: http://examine.cdodeplex.com/discussions/264341 //Catch the exception here for the time being, and just fallback to GetMedia //TODO: Need to fix examine in LB scenarios! @@ -485,7 +485,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } /// - /// A Helper methods to return the children for media whther it is based on examine or xml + /// A Helper methods to return the children for media whether it is based on examine or xml /// /// /// @@ -532,14 +532,14 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } //if there's no result then return null. Previously we defaulted back to library.GetMedia below - //but this will always get called for when we are getting descendents since many items won't have + //but this will always get called for when we are getting descendants since many items won't have //children and then we are hitting the database again! //So instead we're going to rely on Examine to have the correct results like it should. return Enumerable.Empty(); } catch (FileNotFoundException) { - //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco + //Currently examine is throwing FileNotFound exceptions when we have a load balanced filestore and a node is published in umbraco //See this thread: http://examine.cdodeplex.com/discussions/264341 //Catch the exception here for the time being, and just fallback to GetMedia } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs index 0d7d188dac..0153cca18b 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache /// Represents the Xml storage for the Xml published cache. /// /// - /// One instance of is instanciated by the and + /// One instance of is instantiated by the and /// then passed to all instances that are created (one per request). /// This class should *not* be public. /// @@ -751,7 +751,7 @@ AND (umbracoNode.id=@id)"; { // using that one method because we want to have proper indent // and in addition, writing async is never fully async because - // althouth the writer is async, xml.WriteTo() will not async + // although the writer is async, xml.WriteTo() will not async // that one almost works but... "The elements are indented as long as the element // does not contain mixed content. Once the WriteString or WriteWhitespace method @@ -918,7 +918,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; // assumes xml lock private void LoadXmlTreeFromDatabaseLocked(SafeXmlReaderWriter safeXml) { - // initialise the document ready for the composition of content + // initialize the document ready for the composition of content var xml = new XmlDocument(); InitializeXml(xml, GetDtd()); @@ -973,7 +973,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; var xmlDtos = scope.Database.Query(ReadMoreCmsContentXmlSql, new { /*@nodeObjectType =*/ nodeObjectType }); - // Initialise the document ready for the final composition of content + // Initialize the document ready for the final composition of content InitializeXml(xmlDoc, string.Empty); XmlNode parent = null; @@ -1102,7 +1102,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; id = content.Id }); - // 'using' the enumerator ensures that the enumeration is properly terminated even if abandonned + // 'using' the enumerator ensures that the enumeration is properly terminated even if abandoned // otherwise, it would leak an open reader & an un-released database connection // see PetaPoco.Query(Type[] types, Delegate cb, string sql, params object[] args) // and read http://blogs.msdn.com/b/oldnewthing/archive/2008/08/14/8862242.aspx @@ -1348,7 +1348,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder"; if (docNode.Name == currentNode.Name) { // name has not changed, safe to just update the current node - // by transfering values eg copying the attributes, and importing the data elements + // by transferring values eg copying the attributes, and importing the data elements TransferValuesFromDocumentXmlToPublishedXml(docNode, currentNode); // if moving, move the node to the new parent @@ -1819,7 +1819,7 @@ WHERE cmsPreviewXml.nodeId IN ( long total; do { - // .GetPagedResultsByQuery implicitely adds ({Constants.DatabaseSchema.Tables.Document}.newest = 1) which + // .GetPagedResultsByQuery implicitly adds ({Constants.DatabaseSchema.Tables.Document}.newest = 1) which // is what we want for preview (ie latest version of a content, published or not) var descendants = _documentRepository.GetPage(query, pageIndex++, groupSize, out total, null, Ordering.By("Path")); const bool published = true; // previewXml contains edit content! diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs index c656562236..83d25d3e49 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStoreFilePersister.cs @@ -72,7 +72,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache { // if _released is false then we're going to setup a timer // then the runner wants to shutdown & run immediately - // this sets _released to true & the timer will trigger eventualy & who cares? + // this sets _released to true & the timer will trigger eventually & who cares? // if _released is true, either it's a normal release, or // a runner shutdown, in which case we won't be able to // add a new task, and so we'll run immediately diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs index 3250dbc2ce..f2a49f7f60 100644 --- a/src/Umbraco.Web/PublishedElementExtensions.cs +++ b/src/Umbraco.Web/PublishedElementExtensions.cs @@ -145,7 +145,7 @@ namespace Umbraco.Web } #endregion - + #region ToIndexedArray public static IndexedArrayItem[] ToIndexedArray(this IEnumerable source) diff --git a/src/Umbraco.Web/RouteCollectionExtensions.cs b/src/Umbraco.Web/RouteCollectionExtensions.cs index 7fe80db10d..08630820b7 100644 --- a/src/Umbraco.Web/RouteCollectionExtensions.cs +++ b/src/Umbraco.Web/RouteCollectionExtensions.cs @@ -84,7 +84,7 @@ namespace Umbraco.Web } /// - /// Extension method to manually regsiter an area + /// Extension method to manually register an area /// /// /// @@ -103,7 +103,7 @@ namespace Umbraco.Web } ///// - ///// Extension method to manually regsiter an area from the container + ///// Extension method to manually register an area from the container ///// ///// ///// diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs index bd85d02dab..f20aa95c0d 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs @@ -52,7 +52,7 @@ namespace Umbraco.Web.Routing return false; } - // Apending any querystring from the incoming request to the redirect url. + // Appending any querystring from the incoming request to the redirect url. url = string.IsNullOrEmpty(frequest.Uri.Query) ? url : url + frequest.Uri.Query; _logger.Debug("Route {Route} matches content {ContentId} with url '{Url}', redirecting.", route, content.Id, url); diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs index fc1712dfbd..ff629609d3 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs @@ -59,8 +59,7 @@ namespace Umbraco.Web.Routing // there may be spaces as in "/foo/bar, /foo/nil" // these should probably be taken care of earlier on - // TODO - // can we normalize the values so that they contain no whitespaces, and no leading slashes? + // TODO: can we normalize the values so that they contain no whitespaces, and no leading slashes? // and then the comparisons in IsMatch can be way faster - and allocate way less strings const string propertyAlias = Constants.Conventions.Content.UrlAlias; diff --git a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs index 91343b7d49..259c6b5d41 100644 --- a/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs +++ b/src/Umbraco.Web/Routing/IContentLastChanceFinder.cs @@ -4,7 +4,7 @@ /// Provides a method to try to find and assign an Umbraco document to a PublishedContentRequest /// when everything else has failed. /// - /// Identical to but required in order to differenciate them in ioc. + /// Identical to but required in order to differentiate them in ioc. public interface IContentLastChanceFinder : IContentFinder { } } diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs index 6814761572..540f6d727d 100644 --- a/src/Umbraco.Web/Routing/PublishedRequest.cs +++ b/src/Umbraco.Web/Routing/PublishedRequest.cs @@ -93,7 +93,7 @@ namespace Umbraco.Web.Routing /// /// When the event triggers, no preparation has been done. It is still possible to /// modify the request's Uri property, for example to restore its original, public-facing value - /// that might have been modified by an in-between equipement such as a load-balancer. + /// that might have been modified by an in-between equipment such as a load-balancer. public static event EventHandler Preparing; /// @@ -274,7 +274,7 @@ namespace Umbraco.Web.Routing return true; } - // NOTE - can we stil get it with whitespaces in it due to old legacy bugs? + // NOTE - can we still get it with whitespaces in it due to old legacy bugs? alias = alias.Replace(" ", ""); var model = _publishedRouter.GetTemplate(alias); @@ -357,7 +357,7 @@ namespace Umbraco.Web.Routing } // note: do we want to have an ordered list of alternate cultures, - // to allow for fallbacks when doing dictionnary lookup and such? + // to allow for fallbacks when doing dictionary lookup and such? #endregion @@ -430,7 +430,7 @@ namespace Umbraco.Web.Routing } /// - /// Indicates that the content requet should trigger a redirect, with a specified status code. + /// Indicates that the content request should trigger a redirect, with a specified status code. /// /// The url to redirect to. /// The status code (300-308). @@ -507,7 +507,8 @@ namespace Umbraco.Web.Routing #region Legacy - // for legacy/webforms code - todo - get rid of it eventually + // for legacy/webforms code - + // TODO: get rid of it eventually internal page UmbracoPage { get diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs index b95977c3a3..94980a7a10 100644 --- a/src/Umbraco.Web/Routing/PublishedRouter.cs +++ b/src/Umbraco.Web/Routing/PublishedRouter.cs @@ -55,7 +55,7 @@ namespace Umbraco.Web.Routing // todo // in 7.7 this is cached in the PublishedContentRequest, which ... makes little sense // killing it entirely, if we need cache, just implement it properly !! - // this is all soooo weird + // this is all so weird public Func> GetRolesForLogin { get; } public PublishedRequest CreateRequest(UmbracoContext umbracoContext, Uri uri = null) @@ -691,7 +691,7 @@ namespace Umbraco.Web.Routing // read the alternate template alias, from querystring, form, cookie or server vars, // only if the published content is the initial once, else the alternate template // does not apply - // + optionnally, apply the alternate template on internal redirects + // + optionally, apply the alternate template on internal redirects var useAltTemplate = request.IsInitialPublishedContent || (_webRoutingSection.InternalRedirectPreservesTemplate && request.IsInternalRedirectPublishedContent); var altTemplate = useAltTemplate diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs index 669039f087..7795543320 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs @@ -92,7 +92,7 @@ namespace Umbraco.Web.Redirects // we cannot rely only on ContentCacheRefresher because when CacheUpdated triggers the old // route is gone // - // this is all verrrry weird but it seems to work + // this is all very weird but it seems to work ContentService.Publishing += ContentService_Publishing; ContentService.Published += ContentService_Published; diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs index b7f4e13432..26c8faca58 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs @@ -255,7 +255,7 @@ namespace Umbraco.Web.Runtime { var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1(); var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", - //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back + //include the AppDomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back // to worker A again, in theory the %temp% folder should already be empty but we really want to make sure that its not // utilizing an old path appDomainHash); diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs index b4d122b64f..d9e3c3c980 100644 --- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs +++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs @@ -434,12 +434,12 @@ namespace Umbraco.Web.Scheduling private async Task GetNextBackgroundTask2(CancellationToken shutdownToken) { - // exit if cancelling + // exit if canceling if (shutdownToken.IsCancellationRequested) return null; - // if keepalive is false then don't block, exit if there is - // no task in the buffer - yes, there is a race cond, which + // if KeepAlive is false then don't block, exit if there is + // no task in the buffer - yes, there is a race condition, which // we'll take care of if (_options.KeepAlive == false && _tasks.Count == 0) return null; @@ -482,7 +482,7 @@ namespace Umbraco.Web.Scheduling var latched = bgTask as ILatchedBackgroundTask; if (latched == null || latched.IsLatched == false) return bgTask; - // support cancelling awaiting + // support canceling awaiting // read https://github.com/dotnet/corefx/issues/2704 // read http://stackoverflow.com/questions/27238232/how-can-i-cancel-task-whenall var tokenTaskSource = new TaskCompletionSource(); @@ -519,7 +519,7 @@ namespace Umbraco.Web.Scheduling try { if (bgTask.IsAsync) - //configure await = false since we don't care about the context, we're on a background thread. + // configure await = false since we don't care about the context, we're on a background thread. await bgTask.RunAsync(token).ConfigureAwait(false); else bgTask.Run(); @@ -706,7 +706,7 @@ namespace Umbraco.Web.Scheduling // immediate parameter is true, the registered object must call the UnregisterObject method before returning; // otherwise, its registration will be removed by the application manager. - _logger.Info("{LogPrefix} Cancelling tasks", _logPrefix); + _logger.Info("{LogPrefix} Canceling tasks", _logPrefix); Shutdown(true, true); // cancel all tasks, wait for the current one to end Terminate(true); } diff --git a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs index 7a51890c12..58df54a07e 100644 --- a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs +++ b/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs @@ -9,9 +9,9 @@ namespace Umbraco.Web.Scheduling /// /// Implement by overriding PerformRun or PerformRunAsync and then IsAsync accordingly, /// depending on whether the task is implemented as a sync or async method. Run nor RunAsync are - /// sealed here as overriding them would break recurrence. And then optionnally override + /// sealed here as overriding them would break recurrence. And then optionally override /// RunsOnShutdown, in order to indicate whether the latched task should run immediately on - /// shutdown, or just be abandonned (default). + /// shutdown, or just be abandoned (default). public abstract class RecurringTaskBase : LatchedBackgroundTaskBase { private readonly IBackgroundTaskRunner _runner; diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs index 115a28504c..66037a0456 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs @@ -44,7 +44,7 @@ namespace Umbraco.Web.Scheduling ScheduledTaskTimes.Add(t.Alias, DateTime.Now); } - // Add 1 second to timespan to compensate for differencies in timer + // Add 1 second to timespan to compensate for differences in timer else if ( new TimeSpan( DateTime.Now.Ticks - ((DateTime)ScheduledTaskTimes[t.Alias]).Ticks).TotalSeconds + 1 >= t.Interval) diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs index cd4f5ac933..d400ccc077 100644 --- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs +++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs @@ -65,7 +65,7 @@ namespace Umbraco.Web.Scheduling public void Terminate() { - // the appdomain / maindom / whatever takes care of stopping background task runners + // the AppDomain / maindom / whatever takes care of stopping background task runners } private void RegisterBackgroundTasksOnce(object sender, RoutableAttemptEventArgs e) diff --git a/src/Umbraco.Web/Search/ExamineComponent.cs b/src/Umbraco.Web/Search/ExamineComponent.cs index 4735780231..871f90a319 100644 --- a/src/Umbraco.Web/Search/ExamineComponent.cs +++ b/src/Umbraco.Web/Search/ExamineComponent.cs @@ -71,7 +71,7 @@ namespace Umbraco.Web.Search public void Initialize() { - //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the appdomain + //we want to tell examine to use a different fs lock instead of the default NativeFSFileLock which could cause problems if the AppDomain //terminates and in some rare cases would only allow unlocking of the file if IIS is forcefully terminated. Instead we'll rely on the simplefslock //which simply checks the existence of the lock file DirectoryFactory.DefaultLockFactory = d => @@ -91,7 +91,7 @@ namespace Umbraco.Web.Search if (!examineShutdownRegistered) { - _logger.Debug("Examine shutdown not registered, this appdomain is not the MainDom, Examine will be disabled"); + _logger.Debug("Examine shutdown not registered, this AppDomain is not the MainDom, Examine will be disabled"); //if we could not register the shutdown examine ourselves, it means we are not maindom! in this case all of examine should be disabled! Suspendable.ExamineEvents.SuspendIndexers(_logger); @@ -174,7 +174,7 @@ namespace Umbraco.Web.Search lock (IsConfiguredLocker) { - //double chekc + //double check if (_isConfigured) return; _isConfigured = true; @@ -218,7 +218,7 @@ namespace Umbraco.Web.Search else // RefreshNode or RefreshBranch (maybe trashed) { // don't try to be too clever - refresh entirely - // there has to be race conds in there ;-( + // there has to be race conditions in there ;-( var content = contentService.GetById(payload.Id); if (content == null) @@ -585,7 +585,7 @@ namespace Umbraco.Web.Search } #endregion - #region Defered Actions + #region Deferred Actions private class DeferedActions { private readonly List _actions = new List(); diff --git a/src/Umbraco.Web/Search/ExamineComposer.cs b/src/Umbraco.Web/Search/ExamineComposer.cs index 7aab3cfd8f..5a897144f9 100644 --- a/src/Umbraco.Web/Search/ExamineComposer.cs +++ b/src/Umbraco.Web/Search/ExamineComposer.cs @@ -45,7 +45,7 @@ namespace Umbraco.Web.Search composition.RegisterUnique, MediaValueSetBuilder>(); composition.RegisterUnique, MemberValueSetBuilder>(); - //We want to manage Examine's appdomain shutdown sequence ourselves so first we'll disable Examine's default behavior + //We want to manage Examine's AppDomain shutdown sequence ourselves so first we'll disable Examine's default behavior //and then we'll use MainDom to control Examine's shutdown - this MUST be done in Compose ie before ExamineManager //is instantiated, as the value is used during instantiation ExamineManager.DisableDefaultHostingEnvironmentRegistration(); diff --git a/src/Umbraco.Web/Security/AuthenticationExtensions.cs b/src/Umbraco.Web/Security/AuthenticationExtensions.cs index 66fbd8e201..1fa75a214b 100644 --- a/src/Umbraco.Web/Security/AuthenticationExtensions.cs +++ b/src/Umbraco.Web/Security/AuthenticationExtensions.cs @@ -34,21 +34,21 @@ namespace Umbraco.Web.Security { if (http == null) throw new ArgumentNullException(nameof(http)); - //if there was a ticket, it's not expired, - it should not be renewed or its renewable + // if there was a ticket, it's not expired, - it should not be renewed or its renewable if (ticket?.Properties.ExpiresUtc != null && ticket.Properties.ExpiresUtc.Value > DateTimeOffset.UtcNow && (renewTicket == false || http.RenewUmbracoAuthTicket())) { try { - //get the Umbraco user identity + // get the Umbraco user identity if (!(ticket.Identity is UmbracoBackOfficeIdentity identity)) throw new InvalidOperationException("The AuthenticationTicket specified does not contain the correct Identity type"); - //set the principal object + // set the principal object var principal = new ClaimsPrincipal(identity); - //It is actually not good enough to set this on the current app Context and the thread, it also needs + // It is actually not good enough to set this on the current app Context and the thread, it also needs // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually - // an underlying fault of asp.net not propogating the User correctly. + // an underlying fault of asp.net not propagating the User correctly. if (HttpContext.Current != null) { HttpContext.Current.User = principal; @@ -56,7 +56,7 @@ namespace Umbraco.Web.Security http.User = principal; Thread.CurrentPrincipal = principal; - //This is a back office request, we will also set the culture/ui culture + // This is a back office request, we will also set the culture/ui culture Thread.CurrentThread.CurrentCulture = Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(identity.Culture); @@ -67,7 +67,7 @@ namespace Umbraco.Web.Security { if (ex is FormatException || ex is JsonReaderException) { - //this will occur if the cookie data is invalid + // this will occur if the cookie data is invalid http.UmbracoLogout(); } else @@ -99,17 +99,17 @@ namespace Umbraco.Web.Security if (http == null) throw new ArgumentNullException(nameof(http)); if (http.User == null) return null; //there's no user at all so no identity - //If it's already a UmbracoBackOfficeIdentity + // If it's already a UmbracoBackOfficeIdentity var backOfficeIdentity = http.User.GetUmbracoIdentity(); if (backOfficeIdentity != null) return backOfficeIdentity; if (authenticateRequestIfNotFound == false) return null; - //even if authenticateRequestIfNotFound is true we cannot continue if the request is actually authenticated + // even if authenticateRequestIfNotFound is true we cannot continue if the request is actually authenticated // which would mean something strange is going on that it is not an umbraco identity. if (http.User.Identity.IsAuthenticated) return null; - //So the user is not authed but we've been asked to do the auth if authenticateRequestIfNotFound = true, + // So the user is not authed but we've been asked to do the auth if authenticateRequestIfNotFound = true, // which might occur in old webforms style things or for routes that aren't included as a back office request. // in this case, we are just reverting to authing using the cookie. @@ -237,8 +237,8 @@ namespace Umbraco.Web.Security /// private static void Logout(this HttpContextBase http, string cookieName) { - //We need to clear the sessionId from the database. This is legacy code to do any logging out and shouldn't really be used at all but in any case - //we need to make sure the session is cleared. Due to the legacy nature of this it means we need to use singletons + // We need to clear the sessionId from the database. This is legacy code to do any logging out and shouldn't really be used at all but in any case + // we need to make sure the session is cleared. Due to the legacy nature of this it means we need to use singletons if (http.User != null) { var claimsIdentity = http.User.Identity as ClaimsIdentity; @@ -254,23 +254,23 @@ namespace Umbraco.Web.Security } if (http == null) throw new ArgumentNullException("http"); - //clear the preview cookie and external login + // clear the preview cookie and external login var cookies = new[] { cookieName, Constants.Web.PreviewCookieName, Constants.Security.BackOfficeExternalCookieName }; foreach (var c in cookies) { - //remove from the request + // remove from the request http.Request.Cookies.Remove(c); - //expire from the response + // expire from the response var formsCookie = http.Response.Cookies[c]; if (formsCookie != null) { - //this will expire immediately and be removed from the browser + // this will expire immediately and be removed from the browser formsCookie.Expires = DateTime.Now.AddYears(-1); } else { - //ensure there's def an expired cookie + // ensure there's def an expired cookie http.Response.Cookies.Add(new HttpCookie(c) { Expires = DateTime.Now.AddYears(-1) }); } } @@ -287,7 +287,7 @@ namespace Umbraco.Web.Security var secureFormat = owinCtx.GetUmbracoAuthTicketDataProtector(); - //get the ticket + // get the ticket try { @@ -314,17 +314,17 @@ namespace Umbraco.Web.Security var owinCtx = http.GetOwinContext(); var secureFormat = owinCtx.GetUmbracoAuthTicketDataProtector(); - //will only happen in tests + // will only happen in tests if (secureFormat == null) return null; - //get the ticket + // get the ticket try { return GetAuthTicket(secureFormat, asDictionary, cookieName); } catch (Exception) { - //occurs when decryption fails + // occurs when decryption fails http.Logout(cookieName); return null; } @@ -341,7 +341,7 @@ namespace Umbraco.Web.Security { return null; } - //get the ticket + // get the ticket return secureDataFormat.Unprotect(formsCookie); } diff --git a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs index b711fe76cf..4315d3a762 100644 --- a/src/Umbraco.Web/Security/BackOfficeSignInManager.cs +++ b/src/Umbraco.Web/Security/BackOfficeSignInManager.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Security } /// - /// Borrowed from Micorosoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type + /// Borrowed from Microsoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type /// /// /// @@ -148,7 +148,7 @@ namespace Umbraco.Web.Security } /// - /// Borrowed from Micorosoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type + /// Borrowed from Microsoft's underlying sign in manager which is not flexible enough to tell it to use a different cookie type /// /// /// diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs index ce51f82c43..a7256b257d 100644 --- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs +++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs @@ -211,7 +211,7 @@ namespace Umbraco.Web.Security contentSectionConfig.NotificationEmailAddress, new EmailSender()); - //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to suport it + //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to support it //// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user //// You can write your own provider and plug in here. @@ -250,7 +250,7 @@ namespace Umbraco.Web.Security /// protected virtual IPasswordHasher GetDefaultPasswordHasher(MembershipProviderBase provider) { - //if the current user membership provider is unkown (this would be rare), then return the default password hasher + //if the current user membership provider is unknown (this would be rare), then return the default password hasher if (provider.IsUmbracoUsersProvider() == false) return new PasswordHasher(); @@ -459,7 +459,7 @@ namespace Umbraco.Web.Security } /// - /// This is copied from the underlying .NET base class since they decied to not expose it + /// This is copied from the underlying .NET base class since they decided to not expose it /// /// /// @@ -471,7 +471,7 @@ namespace Umbraco.Web.Security } /// - /// This is copied from the underlying .NET base class since they decied to not expose it + /// This is copied from the underlying .NET base class since they decided to not expose it /// /// private IUserSecurityStampStore GetSecurityStore() @@ -483,7 +483,7 @@ namespace Umbraco.Web.Security } /// - /// This is copied from the underlying .NET base class since they decied to not expose it + /// This is copied from the underlying .NET base class since they decided to not expose it /// /// private static string NewSecurityStamp() @@ -534,14 +534,14 @@ namespace Umbraco.Web.Security /// - /// Overides the microsoft ASP.NET user managment method + /// Overrides the Microsoft ASP.NET user management method /// /// /// /// returns a Async Task /// /// - /// Doesnt set fail attempts back to 0 + /// Doesn't set fail attempts back to 0 /// public override async Task AccessFailedAsync(int userId) { diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs index dace264996..dba7a8c33a 100644 --- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs +++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs @@ -123,7 +123,7 @@ namespace Umbraco.Web.Security } } - //Hack! we need to suppress the stupid forms authentcation module but we can only do that by using non owin stuff + //Hack! we need to suppress the stupid forms authentication module but we can only do that by using non owin stuff if (HttpContext.Current != null && HttpContext.Current.Response != null) { HttpContext.Current.Response.SuppressFormsAuthenticationRedirect = true; diff --git a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs index 4756390d06..81407afe50 100644 --- a/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs +++ b/src/Umbraco.Web/Security/IdentityAuditEventArgs.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Security; namespace Umbraco.Web.Security { /// - /// This class is used by events raised from hthe BackofficeUserManager + /// This class is used by events raised from the BackofficeUserManager /// public class IdentityAuditEventArgs : EventArgs { @@ -30,7 +30,7 @@ namespace Umbraco.Web.Security public int AffectedUser { get; private set; } /// - /// If a user is perfoming an action on a different user, then this will be set. Otherwise it will be -1 + /// If a user is performing an action on a different user, then this will be set. Otherwise it will be -1 /// public int PerformingUser { get; private set; } diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index db93df953f..79eb27bc3c 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -486,7 +486,7 @@ namespace Umbraco.Web.Security ////This is a rudimentary check to see what data template we should render //// if developers want to change the template they can do so dynamically in their views or controllers //// for a given property. - ////These are the default built-in MVC template types: “Boolean”, “Decimal”, “EmailAddress”, “HiddenInput”, “Html”, “Object”, “String”, “Text”, and “Url” + ////These are the default built-in MVC template types: “Boolean”, “Decimal”, “EmailAddress”, “HiddenInput”, “HTML”, “Object”, “String”, “Text”, and “Url” //// by default we'll render a text box since we've defined that metadata on the UmbracoProperty.Value property directly. //if (prop.DataTypeId == new Guid(Constants.PropertyEditors.TrueFalse)) //{ @@ -706,7 +706,7 @@ namespace Umbraco.Web.Security /// /// /// - /// Returns successful if the membershipuser required updating, otherwise returns failed if it didn't require updating. + /// Returns successful if the membership user required updating, otherwise returns failed if it didn't require updating. /// internal Attempt UpdateMember(MembershipUser member, MembershipProvider provider, string email = null, @@ -763,7 +763,7 @@ namespace Umbraco.Web.Security if (provider.IsUmbracoMembershipProvider() == false) { - throw new NotSupportedException("An IMember model can only be retreived when using the built-in Umbraco membership providers"); + throw new NotSupportedException("An IMember model can only be retrieved when using the built-in Umbraco membership providers"); } var username = provider.GetCurrentUserName(); var member = _memberService.GetByUsername(username); diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs index 1b528c2ba9..413023c27c 100644 --- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Security.Providers /// protected override bool PerformChangePassword(string username, string oldPassword, string newPassword) { - //NOTE: due to backwards compatibilty reasons (and UX reasons), this provider doesn't care about the old password and + //NOTE: due to backwards compatibility reasons (and UX reasons), this provider doesn't care about the old password and // allows simply setting the password manually so we don't really care about the old password. // This is allowed based on the overridden AllowManuallyChangingPassword option. @@ -354,7 +354,7 @@ namespace Umbraco.Web.Security.Providers // cause all distributed cache to execute - which will clear out some caches we don't want. // http://issues.umbraco.org/issue/U4-3451 - // when upgrating from 7.2 to 7.3 trying to save will throw + // when upgrading from 7.2 to 7.3 trying to save will throw if (UmbracoVersion.Current >= new Version(7, 3, 0, 0)) MemberService.Save(member, false); } @@ -594,7 +594,7 @@ namespace Umbraco.Web.Security.Providers //TODO: In v8 we aren't going to have an overload to disable events, so we'll need to make a different method // for this type of thing (i.e. UpdateLastLogin or similar). - // when upgrating from 7.2 to 7.3 trying to save will throw + // when upgrading from 7.2 to 7.3 trying to save will throw if (UmbracoVersion.Current >= new Version(7, 3, 0, 0)) MemberService.Save(member, false); diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs index e5e1394aea..58b6c6ad1c 100644 --- a/src/Umbraco.Web/Security/SessionIdValidator.cs +++ b/src/Umbraco.Web/Security/SessionIdValidator.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.Security /// /// /// This uses another cookie to track the last checked time which is done for a few reasons: - /// * We can't use the user's auth ticket to do thsi because we'd be re-issuing the auth ticket all of the time and it would never expire + /// * We can't use the user's auth ticket to do this because we'd be re-issuing the auth ticket all of the time and it would never expire /// plus the auth ticket size is much larger than this small value /// * This will execute quite often (every minute per user) and in some cases there might be several requests that end up re-issuing the cookie so the cookie value should be small /// * We want to avoid the user lookup if it's not required so that will only happen when the time diff is great enough in the cookie diff --git a/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs b/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs index c65c010204..3824935559 100644 --- a/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs +++ b/src/Umbraco.Web/Security/UmbracoAuthTicketDataProtector.cs @@ -5,7 +5,7 @@ using Umbraco.Core; namespace Umbraco.Web.Security { /// - /// This is used so that we can retrive the auth ticket protector from an IOwinContext + /// This is used so that we can retrieve the auth ticket protector from an IOwinContext /// internal class UmbracoAuthTicketDataProtector : DisposableObjectSlim { diff --git a/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs b/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs index 0dc73f5214..19cd602657 100644 --- a/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs +++ b/src/Umbraco.Web/Security/UmbracoSecureDataFormat.cs @@ -38,7 +38,7 @@ namespace Umbraco.Web.Security } /// - /// Unprotects the cookie + /// Un-protects the cookie /// /// /// diff --git a/src/Umbraco.Web/Security/WebAuthExtensions.cs b/src/Umbraco.Web/Security/WebAuthExtensions.cs index d38345e48c..aa06616d90 100644 --- a/src/Umbraco.Web/Security/WebAuthExtensions.cs +++ b/src/Umbraco.Web/Security/WebAuthExtensions.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.Security { //It is actually not good enough to set this on the current app Context and the thread, it also needs // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually - // an underlying fault of asp.net not propogating the User correctly. + // an underlying fault of asp.net not propagating the User correctly. if (HttpContext.Current != null) { HttpContext.Current.User = principal; @@ -51,7 +51,7 @@ namespace Umbraco.Web.Security { //It is actually not good enough to set this on the current app Context and the thread, it also needs // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually - // an underlying fault of asp.net not propogating the User correctly. + // an underlying fault of asp.net not propagating the User correctly. if (HttpContext.Current != null) { HttpContext.Current.User = principal; diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs index 18ef806ad1..54ff1bba3f 100644 --- a/src/Umbraco.Web/Security/WebSecurity.cs +++ b/src/Umbraco.Web/Security/WebSecurity.cs @@ -223,7 +223,7 @@ namespace Umbraco.Web.Security // Check for console access if (user == null || (requiresApproval && user.IsApproved == false) || (user.IsLockedOut && RequestIsInUmbracoApplication(_httpContext))) { - if (throwExceptions) throw new ArgumentException("You have no priviledges to the umbraco console. Please contact your administrator"); + if (throwExceptions) throw new ArgumentException("You have no privileges to the umbraco console. Please contact your administrator"); return ValidateRequestAttempt.FailedNoPrivileges; } return ValidateRequestAttempt.Success; diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index db786655b4..ff87719b12 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -177,7 +177,7 @@ namespace Umbraco.Web.Templates /// /// /// To achieve this we temporarily change the output text writer of the current HttpResponse, then - /// execute the controller via the handler which innevitably writes the result to the text writer + /// execute the controller via the handler which inevitably writes the result to the text writer /// that has been assigned to the response. Then we change the response textwriter back to the original /// before continuing . /// diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs index c8b13562cd..b4a91f8ab8 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs @@ -137,7 +137,7 @@ namespace Umbraco.Web.Trees //If treeGroupName == null then its third party if (treeGroupName.IsNullOrWhiteSpace()) { - //This is used for the localisation key + //This is used for the localization key //treeHeaders/thirdPartyGroup treeGroupName = "thirdPartyGroup"; } diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs index cce40eb047..ba851191b2 100644 --- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs @@ -62,7 +62,7 @@ namespace Umbraco.Web.Trees var treeNode = CreateTreeNode(entity, Constants.ObjectTypes.DocumentBlueprint, id, queryStrings, "icon-item-arrangement", true); treeNode.Path = $"-1,{entity.Id}"; treeNode.NodeType = "document-type-blueprints"; - //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. + // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now. treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);"; return treeNode; })); diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 8113a85690..b50f06e14e 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -58,7 +58,7 @@ namespace Umbraco.Web.Trees var allowedUserOptions = GetAllowedUserMenuItemsForNode(entity); if (CanUserAccessNode(entity, allowedUserOptions, culture)) { - //Special check to see if it ia a container, if so then we'll hide children. + //Special check to see if it is a container, if so then we'll hide children. var isContainer = entity.IsContainer; // && (queryStrings.Get("isDialog") != "true"); var node = CreateTreeNode( diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index c7420d8d9c..7c0e7c736d 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -429,7 +429,7 @@ namespace Umbraco.Web.Trees } /// - /// Determins if the user has access to view the node/document + /// Determines if the user has access to view the node/document /// /// The Document to check permissions against /// A list of MenuItems that the user has permissions to execute on the current document diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs index 3c6b9c782c..65a2aa3fb5 100644 --- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs @@ -43,7 +43,7 @@ namespace Umbraco.Web.Trees var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren, ""); node.Path = dt.Path; node.NodeType = "container"; - //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. + // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now. node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; return node; })); @@ -57,7 +57,7 @@ namespace Umbraco.Web.Trees .Select(dt => { // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to. - // need this check to keep supporting sites where childs have already been created. + // need this check to keep supporting sites where children have already been created. var hasChildren = dt.HasChildren; var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, "icon-item-arrangement", hasChildren); diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs index 8b38bee865..e60bbe49ed 100644 --- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs @@ -38,8 +38,8 @@ namespace Umbraco.Web.Trees var node = CreateTreeNode(dt, Constants.ObjectTypes.DataType, id, queryStrings, "icon-folder", dt.HasChildren); node.Path = dt.Path; node.NodeType = "container"; - //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. - node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; + // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now. + node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; return node; })); diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs index 6c8f576732..4ff3697a17 100644 --- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs @@ -45,7 +45,7 @@ namespace Umbraco.Web.Trees /// All of the query string parameters passed from jsTree /// /// - /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end + /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end /// to the back end to be used in the query for model data. /// protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs index b93c1ac9e3..8420126db4 100644 --- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs +++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs @@ -36,12 +36,12 @@ namespace Umbraco.Web.Trees var node = CreateTreeNode(dt.Id.ToString(), id, queryStrings, dt.Name, "icon-folder", dt.HasChildren, ""); node.Path = dt.Path; node.NodeType = "container"; - //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now. + // TODO: This isn't the best way to ensure a no operation process for clicking a node but it works for now. node.AdditionalData["jsClickCallback"] = "javascript:void(0);"; return node; })); - //if the request is for folders only then just return + // if the request is for folders only then just return if (queryStrings["foldersonly"].IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1") return nodes; nodes.AddRange( @@ -50,7 +50,7 @@ namespace Umbraco.Web.Trees .Select(dt => { // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to. - // need this check to keep supporting sites where childs have already been created. + // need this check to keep supporting sites where children have already been created. var hasChildren = dt.HasChildren; var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, "icon-thumbnails", hasChildren); @@ -69,7 +69,7 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { - //set the default to create + // set the default to create menu.DefaultMenuAlias = ActionNew.ActionAlias; // root actions @@ -81,7 +81,7 @@ namespace Umbraco.Web.Trees var container = Services.EntityService.Get(int.Parse(id), UmbracoObjectTypes.MediaTypeContainer); if (container != null) { - //set the default to create + // set the default to create menu.DefaultMenuAlias = ActionNew.ActionAlias; menu.Items.Add(Services.TextService, opensDialog: true); @@ -93,7 +93,7 @@ namespace Umbraco.Web.Trees if (container.HasChildren == false) { - //can delete doc type + // can delete doc type menu.Items.Add(Services.TextService, opensDialog: true); } menu.Items.Add(new RefreshNode(Services.TextService, true)); @@ -107,7 +107,7 @@ namespace Umbraco.Web.Trees { menu.Items.Add(Services.TextService, opensDialog: true); - //no move action if this is a child doc type + // no move action if this is a child doc type if (parent == null) { menu.Items.Add(Services.TextService, true, opensDialog: true); @@ -116,7 +116,7 @@ namespace Umbraco.Web.Trees else { menu.Items.Add(Services.TextService, opensDialog: true); - //no move action if this is a child doc type + // no move action if this is a child doc type if (parent == null) { menu.Items.Add(Services.TextService, true, opensDialog: true); diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs index d06d768f2d..7b4c049353 100644 --- a/src/Umbraco.Web/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs @@ -44,7 +44,7 @@ namespace Umbraco.Web.Trees /// All of the query string parameters passed from jsTree /// /// - /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end + /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end /// to the back end to be used in the query for model data. /// protected abstract TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings); @@ -115,7 +115,7 @@ namespace Umbraco.Web.Trees /// /// JSON markup for jsTree /// - /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end + /// We are allowing an arbitrary number of query strings to be passed in so that developers are able to persist custom data from the front-end /// to the back end to be used in the query for model data. /// [HttpQueryStringFilter("queryStrings")] @@ -389,7 +389,7 @@ namespace Umbraco.Web.Trees } /// - /// An event that allows developers to modify the meun that is being rendered + /// An event that allows developers to modify the menu that is being rendered /// /// /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection. diff --git a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs index c794110d88..3221023ca2 100644 --- a/src/Umbraco.Web/Trees/UrlHelperExtensions.cs +++ b/src/Umbraco.Web/Trees/UrlHelperExtensions.cs @@ -39,7 +39,7 @@ namespace Umbraco.Web.Trees //to convert a filepath to a tree syncing path string. //removes the basepath from the path - //and normalises paths - / is used consistently between trees and editors + //and normalizes paths - / is used consistently between trees and editors basePath = basePath.TrimStart("~"); virtualPath = virtualPath.TrimStart("~"); virtualPath = virtualPath.Substring(basePath.Length); diff --git a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs index cd7270ac62..9b6aa96e37 100644 --- a/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs +++ b/src/Umbraco.Web/UI/JavaScript/AssetInitialization.cs @@ -38,7 +38,7 @@ namespace Umbraco.Web.UI.JavaScript var dependencies = assets.Select(x => { // most declarations with be made relative to the /umbraco folder, so things - // ike lib/blah/blah.js so we need to turn them into absolutes here + // like lib/blah/blah.js so we need to turn them into absolutes here if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative)) { return new BasicFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath }; diff --git a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs index f1f57a03a7..b5235c7938 100644 --- a/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs +++ b/src/Umbraco.Web/UI/JavaScript/ClientDependencyConfiguration.cs @@ -35,7 +35,7 @@ namespace Umbraco.Web.UI.JavaScript /// The version of Umbraco we're upgrading to /// A date value to use in the hash to prevent this method from updating the version on each startup /// Allows the developer to specify the date precision for the hash (i.e. "yyyyMMdd" would be a precision for the day) - /// Boolean to indicate succesful update of the ClientDependency.config file + /// Boolean to indicate successful update of the ClientDependency.config file public bool UpdateVersionNumber(SemVersion version, DateTime date, string dateFormat) { var byteContents = Encoding.Unicode.GetBytes(version + date.ToString(dateFormat)); @@ -56,7 +56,7 @@ namespace Umbraco.Web.UI.JavaScript //CDF requires an INT, and although this isn't fail safe, it will work for our purposes. We are not hashing for crypto purposes //so there could be some collisions with this conversion but it's not a problem for our purposes //It's also important to note that the long.GetHashCode() implementation in .NET is this: return (int) this ^ (int) (this >> 32); - //which means that this value will not change per appdomain like some GetHashCode implementations. + //which means that this value will not change per AppDomain like some GetHashCode implementations. intHash = longResult.GetHashCode(); } diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs index 2f320ef839..f223fe5310 100644 --- a/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs +++ b/src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs @@ -8,10 +8,11 @@ // //------------------------------------------------------------------------------ -namespace Umbraco.Web.UI.JavaScript { +namespace Umbraco.Web.UI.JavaScript +{ using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,44 +23,52 @@ namespace Umbraco.Web.UI.JavaScript { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - + internal class Resources + { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { + internal Resources() + { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if (object.ReferenceEquals(resourceMan, null)) + { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.UI.JavaScript.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { + internal static global::System.Globalization.CultureInfo Culture + { + get + { return resourceCulture; } - set { + set + { resourceCulture = value; } } - + /// /// Looks up a localized string similar to [ /// 'lib/jquery/jquery.min.js', @@ -80,12 +89,14 @@ namespace Umbraco.Web.UI.JavaScript { /// 'lib/angular-animate/angular-animate.js', /// [rest of string was truncated]";. /// - internal static string JsInitialize { - get { + internal static string JsInitialize + { + get + { return ResourceManager.GetString("JsInitialize", resourceCulture); } } - + /// /// Looks up a localized string similar to LazyLoad.js("##JsInitialize##", function () { /// //we need to set the legacy UmbClientMgr path @@ -99,12 +110,14 @@ namespace Umbraco.Web.UI.JavaScript { ///}); ///. /// - internal static string Main { - get { + internal static string Main + { + get + { return ResourceManager.GetString("Main", resourceCulture); } } - + /// /// Looks up a localized string similar to [ /// '../lib/jquery/jquery.min.js', @@ -122,12 +135,14 @@ namespace Umbraco.Web.UI.JavaScript { ///] ///. /// - internal static string PreviewInitialize { - get { + internal static string PreviewInitialize + { + get + { return ResourceManager.GetString("PreviewInitialize", resourceCulture); } } - + /// /// Looks up a localized string similar to //TODO: This would be nicer as an angular module so it can be injected into stuff... that'd be heaps nicer, but ///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want @@ -139,8 +154,10 @@ namespace Umbraco.Web.UI.JavaScript { /////define a global static object ///Umbraco.Sys.ServerVariables = ##Variables## ;. /// - internal static string ServerVariables { - get { + internal static string ServerVariables + { + get + { return ResourceManager.GetString("ServerVariables", resourceCulture); } } diff --git a/src/Umbraco.Web/UI/JavaScript/Resources.resx b/src/Umbraco.Web/UI/JavaScript/Resources.resx index 34cea3a2d4..95526f51e7 100644 --- a/src/Umbraco.Web/UI/JavaScript/Resources.resx +++ b/src/Umbraco.Web/UI/JavaScript/Resources.resx @@ -37,7 +37,7 @@ mimetype set. The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not + ResXResourceReader how to stop persisting the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format @@ -130,4 +130,4 @@ servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - \ No newline at end of file + diff --git a/src/Umbraco.Web/UI/Pages/BasePage.cs b/src/Umbraco.Web/UI/Pages/BasePage.cs index a8fbc92722..c0c266367a 100644 --- a/src/Umbraco.Web/UI/Pages/BasePage.cs +++ b/src/Umbraco.Web/UI/Pages/BasePage.cs @@ -40,9 +40,9 @@ namespace Umbraco.Web.UI.Pages public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); /// - /// Gets the Html helper. + /// Gets the HTML helper. /// - /// This html helper is created with an empty context and page so it may not have all of the functionality expected. + /// This HTML helper is created with an empty context and page so it may not have all of the functionality expected. public HtmlHelper Html => _html ?? (_html = new HtmlHelper(new ViewContext(), new ViewPage())); /// diff --git a/src/Umbraco.Web/UI/Pages/ClientTools.cs b/src/Umbraco.Web/UI/Pages/ClientTools.cs index 6988877fa2..92b879dad1 100644 --- a/src/Umbraco.Web/UI/Pages/ClientTools.cs +++ b/src/Umbraco.Web/UI/Pages/ClientTools.cs @@ -126,10 +126,10 @@ namespace Umbraco.Web.UI.Pages } /// - /// A reference to the umbraco UI component "speechbubble". The speechbubble appears in the lower right corner of the screen, notifying users of events + /// A reference to the umbraco UI component "speechbubble". The speech bubble appears in the lower right corner of the screen, notifying users of events /// - /// The speechbubble icon. - /// The speechbubble header. + /// The speech bubble icon. + /// The speech bubble header. /// The body text public ClientTools ShowSpeechBubble(SpeechBubbleIcon i, string header, string body) { diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs index d8d0d65b55..1ce518a653 100644 --- a/src/Umbraco.Web/UmbracoApplicationBase.cs +++ b/src/Umbraco.Web/UmbracoApplicationBase.cs @@ -86,7 +86,7 @@ namespace Umbraco.Web // which means that this will be called *many* times for different apps when Umbraco runs public override void Init() { - // note: base.Init() is what initializes all of the httpmodules, ties up a bunch of stuff with IIS, etc... + // note: base.Init() is what initializes all of the http modules, ties up a bunch of stuff with IIS, etc... // therefore, since OWIN is an HttpModule when running in IIS/ASP.Net the OWIN startup is not executed // until this method fires and by that time - Umbraco has booted already diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs index e2d4ecfc39..48d0d571ee 100644 --- a/src/Umbraco.Web/UmbracoComponentRenderer.cs +++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs @@ -132,7 +132,7 @@ namespace Umbraco.Web // looks for a lower case match. WTF. the whole macro concept needs to be rewritten. - //NOTE: the value could have html encoded values, so we need to deal with that + //NOTE: the value could have HTML encoded values, so we need to deal with that macroProps.Add(i.Key.ToLowerInvariant(), (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value); } var renderer = new MacroRenderer(Current.ProfilingLogger); diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index 41ac309653..49a3832483 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -260,7 +260,7 @@ namespace Umbraco.Web /// ctor will have to have another parameter added only for this one method which is annoying and doesn't make a ton of sense /// since the UmbracoContext itself doesn't use this. /// - /// TODO The alternative is to have a IDomainHelperAccessor singleton which is cached per UmbracoContext + /// TODO: The alternative is to have a IDomainHelperAccessor singleton which is cached per UmbracoContext /// internal DomainHelper GetDomainHelper(ISiteDomainHelper siteDomainHelper) => _domainHelper ?? (_domainHelper = new DomainHelper(PublishedSnapshot.Domains, siteDomainHelper)); diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index ee57054dc9..110c3e84d0 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -770,10 +770,10 @@ namespace Umbraco.Web #region Strings /// - /// Replaces text line breaks with html line breaks + /// Replaces text line breaks with HTML line breaks /// /// The text. - /// The text with text line breaks replaced with html linebreaks (
) + /// The text with text line breaks replaced with HTML line breaks (
) public IHtmlString ReplaceLineBreaksForHtml(string text) { return StringUtilities.ReplaceLineBreaksForHtml(text); @@ -791,7 +791,7 @@ namespace Umbraco.Web } /// - /// Strips all html tags from a given string, all contents of the tags will remain. + /// Strips all HTML tags from a given string, all contents of the tags will remain. /// public HtmlString StripHtml(IHtmlString html, params string[] tags) { @@ -799,7 +799,7 @@ namespace Umbraco.Web } /// - /// Strips all html tags from a given string, all contents of the tags will remain. + /// Strips all HTML tags from a given string, all contents of the tags will remain. /// public HtmlString StripHtml(string html, params string[] tags) { @@ -831,7 +831,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(IHtmlString html, int length) { @@ -839,7 +839,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis) { @@ -847,7 +847,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(IHtmlString html, int length, bool addElipsis, bool treatTagsAsContent) { @@ -855,7 +855,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(string html, int length) { @@ -863,7 +863,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(string html, int length, bool addElipsis) { @@ -871,7 +871,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given length, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given length, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString Truncate(string html, int length, bool addElipsis, bool treatTagsAsContent) { @@ -881,7 +881,7 @@ namespace Umbraco.Web #region Truncate by Words /// - /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString TruncateByWords(string html, int words) { @@ -891,7 +891,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString TruncateByWords(string html, int words, bool addElipsis) { @@ -901,7 +901,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString TruncateByWords(IHtmlString html, int words) { @@ -911,7 +911,7 @@ namespace Umbraco.Web } /// - /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them + /// Truncates a string to a given amount of words, can add a ellipsis at the end (...). Method checks for open HTML tags, and makes sure to close them /// public IHtmlString TruncateByWords(IHtmlString html, int words, bool addElipsis) { diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs index eb6fc54fbb..9c413402b8 100644 --- a/src/Umbraco.Web/UmbracoInjectedModule.cs +++ b/src/Umbraco.Web/UmbracoInjectedModule.cs @@ -107,7 +107,7 @@ namespace Umbraco.Web } /// - /// Processses the Umbraco Request + /// Processes the Umbraco Request /// /// /// @@ -150,9 +150,9 @@ namespace Umbraco.Web // note: requestModule.UmbracoRewrite also did some stripping of &umbPage // from the querystring... that was in v3.x to fix some issues with pre-forms - // auth. Paul Sterling confirmed in jan. 2013 that we can get rid of it. + // auth. Paul Sterling confirmed in Jan. 2013 that we can get rid of it. - // instanciate, prepare and process the published content request + // instantiate, prepare and process the published content request // important to use CleanedUmbracoUrl - lowercase path-only version of the current url var request = _publishedRouter.CreateRequest(umbracoContext); umbracoContext.PublishedRequest = request; @@ -347,7 +347,7 @@ namespace Umbraco.Web context.RewritePath(rewritePath, "", "", false); //if it is MVC we need to do something special, we are not using TransferRequest as this will - //require us to rewrite the path with query strings and then reparse the query strings, this would + //require us to rewrite the path with query strings and then re-parse the query strings, this would //also mean that we need to handle IIS 7 vs pre-IIS 7 differently. Instead we are just going to create //an instance of the UrlRoutingModule and call it's PostResolveRequestCache method. This does: // * Looks up the route based on the new rewritten URL @@ -380,7 +380,7 @@ namespace Umbraco.Web context.RewritePath(rewritePath, "", query, false); //if it is MVC we need to do something special, we are not using TransferRequest as this will - //require us to rewrite the path with query strings and then reparse the query strings, this would + //require us to rewrite the path with query strings and then re-parse the query strings, this would //also mean that we need to handle IIS 7 vs pre-IIS 7 differently. Instead we are just going to create //an instance of the UrlRoutingModule and call it's PostResolveRequestCache method. This does: // * Looks up the route based on the new rewritten URL diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs index 9f90c803c6..a4de3c412e 100644 --- a/src/Umbraco.Web/UriUtility.cs +++ b/src/Umbraco.Web/UriUtility.cs @@ -223,7 +223,7 @@ namespace Umbraco.Web #endregion /// - /// Returns an faull url with the host, port, etc... + /// Returns an full url with the host, port, etc... /// /// An absolute path (i.e. starts with a '/' ) /// diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs index 0a04539967..1397ffc818 100644 --- a/src/Umbraco.Web/UrlHelperExtensions.cs +++ b/src/Umbraco.Web/UrlHelperExtensions.cs @@ -177,7 +177,7 @@ namespace Umbraco.Web public static string GetCacheBustHash() { //make a hash of umbraco and client dependency version - //in case the user bypasses the installer and just bumps the web.config or clientdep config + //in case the user bypasses the installer and just bumps the web.config or client dependency config //if in debug mode, always burst the cache if (GlobalSettings.DebugMode) diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs index 490ad9a6a7..2835bc02dc 100644 --- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs @@ -32,7 +32,7 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be + /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be /// set to false if using the result of this method for CSS. /// /// @@ -56,7 +56,7 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be + /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be /// set to false if using the result of this method for CSS. /// /// @@ -102,7 +102,7 @@ namespace Umbraco.Web /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters /// /// - /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated + /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated /// /// /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example: @@ -120,7 +120,7 @@ namespace Umbraco.Web /// /// /// - /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be + /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be /// set to false if using the result of this method for CSS. /// /// @@ -183,7 +183,7 @@ namespace Umbraco.Web /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters /// /// - /// Add a serialised date of the last edit of the item to ensure client cache refresh when updated + /// Add a serialized date of the last edit of the item to ensure client cache refresh when updated /// /// /// These are any query string parameters (formatted as query strings) that ImageProcessor supports. For example: @@ -201,7 +201,7 @@ namespace Umbraco.Web /// /// /// - /// Whether to HTML encode this URL - default is true - w3c standards require html attributes to be html encoded but this can be + /// Whether to HTML encode this URL - default is true - w3c standards require HTML attributes to be HTML encoded but this can be /// set to false if using the result of this method for CSS. /// /// diff --git a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs index 99e08a4597..cfb7ddb6bc 100644 --- a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs @@ -21,7 +21,7 @@ namespace Umbraco.Web.WebApi.Filters } //NOTE: Until we upgraded to WebApi 2, this didn't work correctly and we had to revert to using // HttpContext.Current responses. I've changed this back to what it should be now since it works - // and now with WebApi2, the HttpContext.Current responses dont! Anyways, all good now. + // and now with WebApi2, the HttpContext.Current responses don't! Anyways, all good now. actionExecutedContext.Response.Headers.CacheControl = new CacheControlHeaderValue() { NoCache = true, diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs index 233ce39e52..6e6ec35b1b 100644 --- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs @@ -44,7 +44,7 @@ namespace Umbraco.Web.WebApi.Filters //cleanup any files associated foreach (var f in contentItem.UploadedFiles) { - //track all temp folders so we can remove old files afterwords + //track all temp folders so we can remove old files afterwards var dir = Path.GetDirectoryName(f.TempFilePath); if (tempFolders.Contains(dir) == false) { @@ -104,7 +104,7 @@ namespace Umbraco.Web.WebApi.Filters { if (f.TempFilePath.IsNullOrWhiteSpace() == false) { - //track all temp folders so we can remove old files afterwords + //track all temp folders so we can remove old files afterwards var dir = Path.GetDirectoryName(f.TempFilePath); if (tempFolders.Contains(dir) == false) { diff --git a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs index d56411952d..522c3af8bb 100644 --- a/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/OverridableAuthorizationAttribute.cs @@ -37,7 +37,7 @@ namespace Umbraco.Web.WebApi.Filters return; } - //if the controller is allowing overridable authorization at the action level and there are action level authorization attributes + //if the controller is allowing authorization to be overridden at the action level and there are action level authorization attributes // then exit and let the action level auth attribute(s) execute. if (actionContext.ActionDescriptor.ControllerDescriptor.GetCustomAttributes().Any() diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs index bbb91efd64..37a8f8a4b4 100644 --- a/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/UmbracoApplicationAuthorizeAttribute.cs @@ -18,7 +18,7 @@ namespace Umbraco.Web.WebApi.Filters private readonly string[] _appNames; /// - /// Constructor to set any number of applications that the user needs access to to be authorized + /// Constructor to set any number of applications that the user needs access to be authorized /// /// /// If the user has access to any of the specified apps, they will be authorized. diff --git a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs index 6390ead73e..c67ec2f6a7 100644 --- a/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs +++ b/src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs @@ -74,7 +74,7 @@ namespace Umbraco.Web.WebApi // But it deadlocks. See https://stackoverflow.com/questions/15201255 for details, which // points to https://msdn.microsoft.com/en-us/magazine/jj991977.aspx which contains more // details under "Async All the Way" - see also https://olitee.com/2015/01/c-async-await-common-deadlock-scenario/ - // which contains a simplified explaination: ReadAsMultipartAsync is meant to be awaited, + // which contains a simplified explanation: ReadAsMultipartAsync is meant to be awaited, // not used in the non-async .Result way, and there is nothing we can do about it. // // Alas, model binders cannot be async "all the way", so we have to wrap in a task, to diff --git a/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs b/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs index 5bd429b598..96c9c0e9a0 100644 --- a/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs +++ b/src/Umbraco.Web/WebApi/HttpRequestMessageExtensions.cs @@ -62,7 +62,7 @@ namespace Umbraco.Web.WebApi } /// - /// Create a 403 (Forbidden) response indicating that hte current user doesn't have access to the resource + /// Create a 403 (Forbidden) response indicating that the current user doesn't have access to the resource /// requested or the action it needs to take. /// /// @@ -131,7 +131,7 @@ namespace Umbraco.Web.WebApi } /// - /// Creates a succressful response with notifications in the result to be displayed in the UI + /// Creates a successful response with notifications in the result to be displayed in the UI /// /// /// diff --git a/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs b/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs index 5dd641b25c..fac3a633a4 100644 --- a/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs +++ b/src/Umbraco.Web/WebApi/SessionHttpControllerRouteHandler.cs @@ -10,7 +10,7 @@ namespace Umbraco.Web.WebApi /// /// /// WebApi controllers (and REST in general) shouldn't have session state enabled since it's stateless, - /// enabling session state puts additional locks on requests so only use this when absolutley needed + /// enabling session state puts additional locks on requests so only use this when absolutely needed /// internal class SessionHttpControllerRouteHandler : HttpControllerRouteHandler { diff --git a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs b/src/Umbraco.Web/_Legacy/Controls/TabPage.cs index 4a5be34d7c..5be5bf1147 100644 --- a/src/Umbraco.Web/_Legacy/Controls/TabPage.cs +++ b/src/Umbraco.Web/_Legacy/Controls/TabPage.cs @@ -14,7 +14,7 @@ namespace Umbraco.Web._Legacy.Controls public class TabPage : WebControl { - // Ensure that a TabPage cannot be instatiated outside + // Ensure that a TabPage cannot be instantiated outside // this assembly -> New instances of a tabpage can only be retrieved through the tabview private bool _hasMenu = true; protected LiteralControl ErrorHeaderControl = new LiteralControl(); diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs index f276afeca9..94e1b6e923 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs +++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web._Legacy.PackageActions /// /// /// - /// true if executed successfully + /// True if executed succesfully public bool Execute(string packageName, XElement xmlData) { diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs index cfa93dc0f6..5390d3d30a 100644 --- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs +++ b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs @@ -197,7 +197,7 @@ namespace Umbraco.Web._Legacy.UI ITaskReturnUrl returnUrlTask = typeInstance as LegacyDialogTask; if (returnUrlTask != null) { - // if castable to LegacyDialogTask: add in additionalValues + // if it is possible to cast to LegacyDialogTask: add in additionalValues ((LegacyDialogTask) returnUrlTask).AdditionalValues = additionalValues; } else diff --git a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs index 56d596e24d..1c2fdcb72b 100644 --- a/src/Umbraco.Web/umbraco.presentation/default.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs @@ -60,7 +60,7 @@ namespace umbraco }; FireBeforeRequestInit(args); - //if we are cancelling then return and don't proceed + //if we are canceling then return and don't proceed if (args.Cancel) return; // reset the friendly path so it's used by forms, etc. diff --git a/src/Umbraco.Web/umbraco.presentation/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs index 74cfb9bf25..bbbc67bb26 100644 --- a/src/Umbraco.Web/umbraco.presentation/item.cs +++ b/src/Umbraco.Web/umbraco.presentation/item.cs @@ -88,7 +88,7 @@ namespace umbraco } else { - //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent) + //get the value the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent) var elt = elements[_fieldName]; if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false) _fieldContent = elt.ToString().Trim(); @@ -108,7 +108,7 @@ namespace umbraco } else { - //get the vaue the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent) + //get the value the legacy way (this will not parse locallinks, etc... since that is handled with ipublishedcontent) var elt = elements[altFieldName]; if (elt != null && string.IsNullOrEmpty(elt.ToString()) == false) _fieldContent = elt.ToString().Trim(); @@ -135,7 +135,7 @@ namespace umbraco /// private string GetRecursiveValueLegacy(IDictionary elements) { - using (Current.ProfilingLogger.DebugDuration("Checking recusively")) + using (Current.ProfilingLogger.DebugDuration("Checking recursively")) { var content = ""; diff --git a/src/Umbraco.Web/umbraco.presentation/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs index 0c9b0c6ff3..3b879c5b02 100644 --- a/src/Umbraco.Web/umbraco.presentation/page.cs +++ b/src/Umbraco.Web/umbraco.presentation/page.cs @@ -51,7 +51,7 @@ namespace umbraco /// /// The difference between creating the page with PublishedContentRequest vs an IPublishedContent item is /// that the PublishedContentRequest takes into account how a template is assigned during the routing process whereas - /// with an IPublishedContent item, the template id is asssigned purely based on the default. + /// with an IPublishedContent item, the template id is assigned purely based on the default. /// internal page(PublishedRequest frequest) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs index 58d219e0c6..0997d2675e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs @@ -53,7 +53,7 @@ namespace dashboardUtilities } else { - Current.Logger.Debug("Access to unallowed feedproxy attempted: {RequestUrl}", requestUri); + Current.Logger.Debug("Access to unallowed feed proxy attempted: {RequestUrl}", requestUri); } } catch (Exception ex) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs index 584ad4ca7f..b47f48804e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoPage.Master.cs @@ -6,7 +6,7 @@ using System.Web.Mvc; using System.Web.UI; using System.Web.UI.WebControls; -//This is only in case an upgrade goes wrong and the the /masterpages/ files are not copied over +//This is only in case an upgrade goes wrong and the /masterpages/ files are not copied over //which would result in an error. so we have kept the old namespaces intact with references to new ones using StackExchange.Profiling; using Umbraco.Core.Configuration; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs index 1672053023..f3552cdb4d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/DisableEventValidation.cs @@ -8,7 +8,7 @@ using System.ComponentModel; namespace umbraco.presentation.templateControls { /// - /// This control disables request validation (equalevant of setting validateRequest to false in page directive) + /// This control disables request validation (equivalent of setting validateRequest to false in page directive) /// [ToolboxData("<{0}:DisableRequestValidation runat=\"server\">")] [Designer("umbraco.presentation.templateControls.ItemDesigner, Umbraco.Web")] diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs index 8473341ca8..f6f2510818 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Item.cs @@ -145,7 +145,7 @@ namespace umbraco.presentation.templateControls #endregion - #region Overriden Control Methods + #region Overridden Control Methods /// /// Raises the event. diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs index 67e82b3822..0b91be5faf 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs @@ -134,7 +134,7 @@ namespace umbraco.presentation.templateControls } /// - /// Inits the specified item. To be called from the OnInit method of Item. + /// Initializes the specified item. To be called from the OnInit method of Item. /// /// The item. public virtual void Init(Item item) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs index 0d54ce2a02..a6aa51752e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Macro.cs @@ -159,7 +159,7 @@ namespace umbraco.presentation.templateControls if (int.TryParse(Attributes["Cache"], out cacheDuration)) tempMacro.CacheDuration = cacheDuration; else - Context.Trace.Warn("Template", "Cache attribute is in incorect format (should be an integer)."); + Context.Trace.Warn("Template", "Cache attribute is in incorrect format (should be an integer)."); } var renderer = new MacroRenderer(Current.ProfilingLogger);