diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 4fe812dbeb..0c7d51334e 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -32,9 +32,9 @@ - - - + + + diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index fbe2cbe439..f7fbad09bd 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -22,10 +22,7 @@ - - - - + @@ -51,6 +48,8 @@ + + > diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index b31e79056f..7cb235f023 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,3 +1,3 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) 7.3.0 -beta3 \ No newline at end of file +RC \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index dbc0f2d41d..ae85cd82ea 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -12,4 +12,4 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("7.3.0")] -[assembly: AssemblyInformationalVersion("7.3.0-beta3")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("7.3.0-RC")] \ No newline at end of file diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs index 7e306a6361..4aef011d05 100644 --- a/src/Umbraco.Core/ApplicationContext.cs +++ b/src/Umbraco.Core/ApplicationContext.cs @@ -2,6 +2,7 @@ using System.Configuration; using System.Threading; using System.Threading.Tasks; +using System.Web; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; @@ -259,22 +260,13 @@ namespace Umbraco.Core { get { - // if initialized, return - if (_umbracoApplicationUrl != null) return _umbracoApplicationUrl; - - // try settings - ServerEnvironmentHelper.TrySetApplicationUrlFromSettings(this, ProfilingLogger.Logger, UmbracoConfig.For.UmbracoSettings()); - - // and return what we have, may be null + ApplicationUrlHelper.EnsureApplicationUrl(this); return _umbracoApplicationUrl; } - set - { - _umbracoApplicationUrl = value; - } } - internal string _umbracoApplicationUrl; // internal for tests + // ReSharper disable once InconsistentNaming + internal string _umbracoApplicationUrl; private Lazy _configured; internal MainDom MainDom { get; private set; } @@ -379,6 +371,11 @@ namespace Umbraco.Core internal set { _services = value; } } + internal ServerRole GetCurrentServerRole() + { + var registrar = ServerRegistrarResolver.Current.Registrar as IServerRegistrar2; + return registrar == null ? ServerRole.Unknown : registrar.GetCurrentServerRole(); + } private volatile bool _disposed; private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim(); diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index ed5265446f..30f59875e8 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). /// /// The version comment. - public static string CurrentComment { get { return "beta3"; } } + public static string CurrentComment { get { return "RC"; } } // Get the version of the umbraco.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx diff --git a/src/Umbraco.Core/Constants-ObjectTypes.cs b/src/Umbraco.Core/Constants-ObjectTypes.cs index 4f225aaccb..f737a68f02 100644 --- a/src/Umbraco.Core/Constants-ObjectTypes.cs +++ b/src/Umbraco.Core/Constants-ObjectTypes.cs @@ -2,13 +2,13 @@ namespace Umbraco.Core { - public static partial class Constants - { - /// - /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management. - /// - public static class ObjectTypes - { + public static partial class Constants + { + /// + /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management. + /// + public static class ObjectTypes + { /// /// Guid for a doc type container /// @@ -19,84 +19,89 @@ namespace Umbraco.Core /// public const string MediaTypeContainer = "42AEF799-B288-4744-9B10-BE144B73CDC4"; - /// - /// Guid for a Content Item object. - /// - public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A"; + /// + /// Guid for a Content Item object. + /// + public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A"; - /// - /// Guid for a Content Item Type object. - /// - public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532"; + /// + /// Guid for a Content Item Type object. + /// + public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532"; - /// - /// Guid for the Content Recycle Bin. - /// - public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8"; + /// + /// Guid for the Content Recycle Bin. + /// + public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8"; - /// - /// Guid for a DataType object. - /// - public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C"; + /// + /// Guid for a DataType object. + /// + public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C"; - /// - /// Guid for a Document object. - /// - public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972"; + /// + /// Guid for a Document object. + /// + public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972"; - /// - /// Guid for a Document Type object. - /// - public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB"; + /// + /// Guid for a Document Type object. + /// + public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB"; - /// - /// Guid for a Media object. - /// - public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C"; + /// + /// Guid for a Media object. + /// + public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C"; - /// - /// Guid for the Media Recycle Bin. - /// - public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113"; + /// + /// Guid for the Media Recycle Bin. + /// + public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113"; - /// - /// Guid for a Media Type object. - /// - public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E"; + /// + /// Guid for a Media Type object. + /// + public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E"; - /// - /// Guid for a Member object. - /// - public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560"; + /// + /// Guid for a Member object. + /// + public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560"; - /// - /// Guid for a Member Group object. - /// - public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728"; + /// + /// Guid for a Member Group object. + /// + public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728"; - /// - /// Guid for a Member Type object. - /// - public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43"; + /// + /// Guid for a Member Type object. + /// + public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43"; - /// - /// Guid for a Stylesheet object. - /// + /// + /// Guid for a Stylesheet object. + /// [Obsolete("This no longer exists in the database")] public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840"; [Obsolete("This no longer exists in the database")] internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111"; - /// - /// Guid for the System Root. - /// - public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D"; + /// + /// Guid for the System Root. + /// + public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D"; - /// - /// Guid for a Template object. - /// - public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D"; - } - } + /// + /// Guid for a Template object. + /// + public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D"; + + /// + /// Guid for a Lock object. + /// + public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41"; + } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs index b72afa265f..82e3a1ff3f 100644 --- a/src/Umbraco.Core/Constants-System.cs +++ b/src/Umbraco.Core/Constants-System.cs @@ -26,6 +26,8 @@ public const int DefaultMediaListViewDataTypeId = -96; public const int DefaultMembersListViewDataTypeId = -97; + // identifiers for lock objects + public const int ServersLock = -331; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/DelegateExtensions.cs b/src/Umbraco.Core/DelegateExtensions.cs new file mode 100644 index 0000000000..78450448e2 --- /dev/null +++ b/src/Umbraco.Core/DelegateExtensions.cs @@ -0,0 +1,44 @@ +using System; +using System.Diagnostics; +using System.Threading; + +namespace Umbraco.Core +{ + public static class DelegateExtensions + { + public static Attempt RetryUntilSuccessOrTimeout(this Func> task, TimeSpan timeout, TimeSpan pause) + { + if (pause.TotalMilliseconds < 0) + { + throw new ArgumentException("pause must be >= 0 milliseconds"); + } + var stopwatch = Stopwatch.StartNew(); + do + { + var result = task(); + if (result) { return result; } + Thread.Sleep((int)pause.TotalMilliseconds); + } + while (stopwatch.Elapsed < timeout); + return Attempt.Fail(); + } + + public static Attempt RetryUntilSuccessOrMaxAttempts(this Func> task, int totalAttempts, TimeSpan pause) + { + if (pause.TotalMilliseconds < 0) + { + throw new ArgumentException("pause must be >= 0 milliseconds"); + } + int attempts = 0; + do + { + attempts++; + var result = task(attempts); + if (result) { return result; } + Thread.Sleep((int)pause.TotalMilliseconds); + } + while (attempts < totalAttempts); + return Attempt.Fail(); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index 2d87f634f4..286acf0285 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -152,12 +152,7 @@ namespace Umbraco.Core.IO /// A value indicating whether the filepath is valid. internal static bool VerifyEditPath(string filePath, string validDir) { - if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false) - filePath = MapPath(filePath); - if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false) - validDir = MapPath(validDir); - - return filePath.StartsWith(validDir); + return VerifyEditPath(filePath, new[] { validDir }); } /// @@ -182,15 +177,31 @@ namespace Umbraco.Core.IO /// A value indicating whether the filepath is valid. internal static bool VerifyEditPath(string filePath, IEnumerable validDirs) { + // this is called from ScriptRepository, PartialViewRepository, etc. + // filePath is the fullPath (rooted, filesystem path, can be trusted) + // validDirs are virtual paths (eg ~/Views) + // + // except that for templates, filePath actually is a virtual path + + //TODO + // what's below is dirty, there are too many ways to get the root dir, etc. + // not going to fix everything today + + var mappedRoot = MapPath(SystemDirectories.Root); + if (filePath.StartsWith(mappedRoot) == false) + filePath = MapPath(filePath); + + // yes we can (see above) + //// don't trust what we get, it may contain relative segments + //filePath = Path.GetFullPath(filePath); + foreach (var dir in validDirs) { var validDir = dir; - if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false) - filePath = MapPath(filePath); - if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false) + if (validDir.StartsWith(mappedRoot) == false) validDir = MapPath(validDir); - if (filePath.StartsWith(validDir)) + if (PathStartsWith(filePath, validDir, Path.DirectorySeparatorChar)) return true; } @@ -219,11 +230,8 @@ namespace Umbraco.Core.IO /// A value indicating whether the filepath is valid. internal static bool VerifyFileExtension(string filePath, List validFileExtensions) { - if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false) - filePath = MapPath(filePath); - var f = new FileInfo(filePath); - - return validFileExtensions.Contains(f.Extension.Substring(1)); + var ext = Path.GetExtension(filePath); + return ext != null && validFileExtensions.Contains(ext.TrimStart('.')); } /// @@ -240,6 +248,16 @@ namespace Umbraco.Core.IO return true; } + public static bool PathStartsWith(string path, string root, char separator) + { + // either it is identical to root, + // or it is root + separator + anything + + if (path.StartsWith(root, StringComparison.OrdinalIgnoreCase) == false) return false; + if (path.Length == root.Length) return true; + if (path.Length < root.Length) return false; + return path[root.Length] == separator; + } /// /// Returns the path to the root of the application, by getting the path to where the assembly where this diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index 13df315960..47daff932d 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.IO; +using System.IO; using System.Linq; using Umbraco.Core.Logging; @@ -9,7 +8,12 @@ namespace Umbraco.Core.IO { public class PhysicalFileSystem : IFileSystem { - internal string RootPath { get; private set; } + // the rooted, filesystem path, using directory separator chars, NOT ending with a separator + // eg "c:" or "c:\path\to\site" or "\\server\path" + private readonly string _rootPath; + + // the ??? url, using url separator chars, NOT ending with a separator + // eg "" (?) or "/Scripts" or ??? private readonly string _rootUrl; public PhysicalFileSystem(string virtualRoot) @@ -18,8 +22,13 @@ namespace Umbraco.Core.IO if (virtualRoot.StartsWith("~/") == false) throw new ArgumentException("The virtualRoot argument must be a virtual path and start with '~/'"); - RootPath = IOHelper.MapPath(virtualRoot); + _rootPath = IOHelper.MapPath(virtualRoot); + _rootPath = EnsureDirectorySeparatorChar(_rootPath); + _rootPath = _rootPath.TrimEnd(Path.DirectorySeparatorChar); + _rootUrl = IOHelper.ResolveUrl(virtualRoot); + _rootUrl = EnsureUrlSeparatorChar(_rootUrl); + _rootUrl = _rootUrl.TrimEnd('/'); } public PhysicalFileSystem(string rootPath, string rootUrl) @@ -33,18 +42,31 @@ namespace Umbraco.Core.IO if (rootPath.StartsWith("~/")) throw new ArgumentException("The rootPath argument cannot be a virtual path and cannot start with '~/'"); - RootPath = rootPath; - _rootUrl = rootUrl; + // rootPath should be... rooted, as in, it's a root path! + // but the test suite App.config cannot really "root" anything so we'll have to do it here + + //var localRoot = AppDomain.CurrentDomain.BaseDirectory; + var localRoot = IOHelper.GetRootDirectorySafe(); + if (Path.IsPathRooted(rootPath) == false) + { + rootPath = Path.Combine(localRoot, rootPath); + } + + rootPath = EnsureDirectorySeparatorChar(rootPath); + rootUrl = EnsureUrlSeparatorChar(rootUrl); + + _rootPath = rootPath.TrimEnd(Path.DirectorySeparatorChar); + _rootUrl = rootUrl.TrimEnd('/'); } public IEnumerable GetDirectories(string path) { - path = EnsureTrailingSeparator(GetFullPath(path)); + var fullPath = GetFullPath(path); try { - if (Directory.Exists(path)) - return Directory.EnumerateDirectories(path).Select(GetRelativePath); + if (Directory.Exists(fullPath)) + return Directory.EnumerateDirectories(fullPath).Select(GetRelativePath); } catch (UnauthorizedAccessException ex) { @@ -65,12 +87,13 @@ namespace Umbraco.Core.IO public void DeleteDirectory(string path, bool recursive) { - if (DirectoryExists(path) == false) + var fullPath = GetFullPath(path); + if (Directory.Exists(fullPath) == false) return; try { - Directory.Delete(GetFullPath(path), recursive); + Directory.Delete(fullPath, recursive); } catch (DirectoryNotFoundException ex) { @@ -80,7 +103,8 @@ namespace Umbraco.Core.IO public bool DirectoryExists(string path) { - return Directory.Exists(GetFullPath(path)); + var fullPath = GetFullPath(path); + return Directory.Exists(fullPath); } public void AddFile(string path, Stream stream) @@ -90,17 +114,17 @@ namespace Umbraco.Core.IO public void AddFile(string path, Stream stream, bool overrideIfExists) { - var fsRelativePath = GetRelativePath(path); + var fullPath = GetFullPath(path); + var exists = File.Exists(fullPath); + if (exists && overrideIfExists == false) + throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path)); - var exists = FileExists(fsRelativePath); - if (exists && overrideIfExists == false) throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path)); - - EnsureDirectory(Path.GetDirectoryName(fsRelativePath)); + Directory.CreateDirectory(Path.GetDirectoryName(fullPath)); // ensure it exists if (stream.CanSeek) stream.Seek(0, 0); - using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath))) + using (var destination = (Stream)File.Create(fullPath)) stream.CopyTo(destination); } @@ -111,9 +135,7 @@ namespace Umbraco.Core.IO public IEnumerable GetFiles(string path, string filter) { - var fsRelativePath = GetRelativePath(path); - - var fullPath = EnsureTrailingSeparator(GetFullPath(fsRelativePath)); + var fullPath = GetFullPath(path); try { @@ -140,12 +162,13 @@ namespace Umbraco.Core.IO public void DeleteFile(string path) { - if (!FileExists(path)) + var fullPath = GetFullPath(path); + if (File.Exists(fullPath) == false) return; try { - File.Delete(GetFullPath(path)); + File.Delete(fullPath); } catch (FileNotFoundException ex) { @@ -155,39 +178,86 @@ namespace Umbraco.Core.IO public bool FileExists(string path) { - return File.Exists(GetFullPath(path)); + var fullpath = GetFullPath(path); + return File.Exists(fullpath); } + // beware, many things depend on how the GetRelative/AbsolutePath methods work! + + /// + /// Gets the relative path. + /// + /// The full path or url. + /// The path, relative to this filesystem's root. + /// + /// The relative path is relative to this filesystem's root, not starting with any + /// directory separator. If input was recognized as a url (path), then output uses url (path) separator + /// chars. + /// public string GetRelativePath(string fullPathOrUrl) { - var relativePath = fullPathOrUrl - .TrimStart(_rootUrl) - .Replace('/', Path.DirectorySeparatorChar) - .TrimStart(RootPath) - .TrimStart(Path.DirectorySeparatorChar); + // test url + var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char - return relativePath; + if (IOHelper.PathStartsWith(path, _rootUrl, '/')) // if it starts with the root url... + return path.Substring(_rootUrl.Length) // strip it + .TrimStart('/'); // it's relative + + // test path + path = EnsureDirectorySeparatorChar(fullPathOrUrl); + + if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar)) // if it starts with the root path + return path.Substring(_rootPath.Length) // strip it + .TrimStart(Path.DirectorySeparatorChar); // it's relative + + // unchanged - including separators + return fullPathOrUrl; } + /// + /// Gets the full path. + /// + /// The full or relative path. + /// The full path. + /// + /// On the physical filesystem, the full path is the rooted (ie non-relative), safe (ie within this + /// filesystem's root) path. All separators are converted to Path.DirectorySeparatorChar. + /// public string GetFullPath(string path) { - //if the path starts with a '/' then it's most likely not a FS relative path which is required so convert it - if (path.StartsWith("/")) - { - path = GetRelativePath(path); - } + // normalize + var opath = path; + path = EnsureDirectorySeparatorChar(path); - return !path.StartsWith(RootPath) - ? Path.Combine(RootPath, path) - : path; + // not sure what we are doing here - so if input starts with a (back) slash, + // we assume it's not a FS relative path and we try to convert it... but it + // really makes little sense? + if (path.StartsWith(Path.DirectorySeparatorChar.ToString())) + path = GetRelativePath(path); + + // if already a full path, return + if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar)) + return path; + + // else combine and sanitize, ie GetFullPath will take care of any relative + // segments in path, eg '../../foo.tmp' - it may throw a SecurityException + // if the combined path reaches illegal parts of the filesystem + var fpath = Path.Combine(_rootPath, path); + fpath = Path.GetFullPath(fpath); + + // at that point, path is within legal parts of the filesystem, ie we have + // permissions to reach that path, but it may nevertheless be outside of + // our root path, due to relative segments, so better check + if (IOHelper.PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar)) + return fpath; + + throw new FileSecurityException("File '" + opath + "' is outside this filesystem's root."); } public string GetUrl(string path) { - return _rootUrl.TrimEnd("/") + "/" + path - .TrimStart(Path.DirectorySeparatorChar) - .Replace(Path.DirectorySeparatorChar, '/') - .TrimEnd("/"); + path = EnsureUrlSeparatorChar(path).Trim('/'); + return _rootUrl + "/" + path; } public DateTimeOffset GetLastModified(string path) @@ -214,9 +284,19 @@ namespace Umbraco.Core.IO protected string EnsureTrailingSeparator(string path) { - if (!path.EndsWith(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)) - path = path + Path.DirectorySeparatorChar; + return path.EnsureEndsWith(Path.DirectorySeparatorChar); + } + protected string EnsureDirectorySeparatorChar(string path) + { + path = path.Replace('/', Path.DirectorySeparatorChar); + path = path.Replace('\\', Path.DirectorySeparatorChar); + return path; + } + + protected string EnsureUrlSeparatorChar(string path) + { + path = path.Replace('\\', '/'); return path; } diff --git a/src/Umbraco.Core/Logging/ParallelForwardingAppender.cs b/src/Umbraco.Core/Logging/ParallelForwardingAppender.cs index 92c4f7589b..cf7efdb4c4 100644 --- a/src/Umbraco.Core/Logging/ParallelForwardingAppender.cs +++ b/src/Umbraco.Core/Logging/ParallelForwardingAppender.cs @@ -22,8 +22,8 @@ namespace Umbraco.Core.Logging private CancellationTokenSource _loggingCancelationTokenSource; private CancellationToken _loggingCancelationToken; private Task _loggingTask; - private Double _shutdownFlushTimeout = 5; - private TimeSpan _shutdownFlushTimespan = TimeSpan.FromSeconds(5); + private Double _shutdownFlushTimeout = 1; + private TimeSpan _shutdownFlushTimespan = TimeSpan.FromSeconds(1); private static readonly Type ThisType = typeof(ParallelForwardingAppender); private volatile bool _shutDownRequested; private int? _bufferSize = DefaultBufferSize; diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs index 571c916123..e30d188339 100644 --- a/src/Umbraco.Core/Manifest/ManifestParser.cs +++ b/src/Umbraco.Core/Manifest/ManifestParser.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text; using System.Text.RegularExpressions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -140,11 +141,22 @@ namespace Umbraco.Core.Manifest { var result = new List(); foreach (var m in manifestFileContents) - { - if (m.IsNullOrWhiteSpace()) continue; + { + var manifestContent = m; + + if (manifestContent.IsNullOrWhiteSpace()) continue; + + // Strip byte object marker, JSON.NET does not like it + var preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); + + // Strangely StartsWith(preamble) would always return true + if (manifestContent.Substring(0, 1) == preamble) + manifestContent = manifestContent.Remove(0, preamble.Length); + + if (manifestContent.IsNullOrWhiteSpace()) continue; //remove any comments first - var replaced = CommentsSurround.Replace(m, match => " "); + var replaced = CommentsSurround.Replace(manifestContent, match => " "); replaced = CommentsLine.Replace(replaced, match => ""); JObject deserialized; @@ -154,7 +166,7 @@ namespace Umbraco.Core.Manifest } catch (Exception ex) { - LogHelper.Error("An error occurred parsing manifest with contents: " + m, ex); + LogHelper.Error("An error occurred parsing manifest with contents: " + manifestContent, ex); continue; } diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs index ae4aac6a1c..8ead6da5f8 100644 --- a/src/Umbraco.Core/Models/File.cs +++ b/src/Umbraco.Core/Models/File.cs @@ -2,6 +2,8 @@ using System.IO; using System.Reflection; using System.Runtime.Serialization; +using System.Text; +using Umbraco.Core.IO; using Umbraco.Core.Models.EntityBase; namespace Umbraco.Core.Models @@ -15,12 +17,20 @@ namespace Umbraco.Core.Models { private string _path; private string _originalPath; - private string _content = string.Empty; //initialize to empty string, not null - protected File(string path) + // initialize to string.Empty so that it is possible to save a new file, + // should use the lazyContent ctor to set it to null when loading existing. + // cannot simply use HasIdentity as some classes (eg Script) override it + // in a weird way. + private string _content; + internal Func GetFileContent { get; set; } + + protected File(string path, Func getFileContent = null) { - _path = path; + _path = SanitizePath(path); _originalPath = _path; + GetFileContent = getFileContent; + _content = getFileContent != null ? null : string.Empty; } private static readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo(x => x.Content); @@ -28,6 +38,14 @@ namespace Umbraco.Core.Models private string _alias; private string _name; + private static string SanitizePath(string path) + { + return path + .Replace('\\', System.IO.Path.DirectorySeparatorChar) + .Replace('/', System.IO.Path.DirectorySeparatorChar); + //.TrimStart(System.IO.Path.DirectorySeparatorChar); + } + /// /// Gets or sets the Name of the File including extension /// @@ -71,7 +89,7 @@ namespace Umbraco.Core.Models SetPropertyValueAndDetectChanges(o => { - _path = value; + _path = SanitizePath(value); return _path; }, _path, PathSelector); } @@ -96,15 +114,26 @@ namespace Umbraco.Core.Models /// /// Gets or sets the Content of a File /// + /// Marked as DoNotClone, because it should be lazy-reloaded from disk. [DataMember] + [DoNotClone] public virtual string Content { - get { return _content; } + get + { + if (_content != null) + return _content; + + // else, must lazy-load, and ensure it's not null + if (GetFileContent != null) + _content = GetFileContent(this); + return _content ?? (_content = string.Empty); + } set { SetPropertyValueAndDetectChanges(o => { - _content = value; + _content = value ?? string.Empty; // cannot set to null return _content; }, _content, ContentSelector); } @@ -121,17 +150,32 @@ namespace Umbraco.Core.Models return true; } + // this exists so that class that manage name and alias differently, eg Template, + // can implement their own cloning - (though really, not sure it's even needed) + protected virtual void DeepCloneNameAndAlias(File clone) + { + // set fields that have a lazy value, by forcing evaluation of the lazy + clone._name = Name; + clone._alias = Alias; + } + public override object DeepClone() { - var clone = (File)base.DeepClone(); - //turn off change tracking + var clone = (File) base.DeepClone(); + + // clear fields that were memberwise-cloned and that we don't want to clone + clone._content = null; + + // turn off change tracking clone.DisableChangeTracking(); - //need to manually assign since they are readonly properties - clone._alias = Alias; - clone._name = Name; - //this shouldn't really be needed since we're not tracking + + // ... + DeepCloneNameAndAlias(clone); + + // this shouldn't really be needed since we're not tracking clone.ResetDirtyProperties(false); - //re-enable tracking + + // re-enable tracking clone.EnableChangeTracking(); return clone; diff --git a/src/Umbraco.Core/Models/IPublishedContentWithKey.cs b/src/Umbraco.Core/Models/IPublishedContentWithKey.cs new file mode 100644 index 0000000000..b0e71221b2 --- /dev/null +++ b/src/Umbraco.Core/Models/IPublishedContentWithKey.cs @@ -0,0 +1,14 @@ +using System; + +namespace Umbraco.Core.Models +{ + /// + /// Represents a cached content with a GUID key. + /// + /// This is temporary, because we cannot add the Key property to IPublishedContent without + /// breaking backward compatibility. With v8, it will be merged into IPublishedContent. + public interface IPublishedContentWithKey : IPublishedContent + { + Guid Key { get; } + } +} diff --git a/src/Umbraco.Core/Models/IServerRegistration.cs b/src/Umbraco.Core/Models/IServerRegistration.cs index 9eb6815bbe..8053ea0a6e 100644 --- a/src/Umbraco.Core/Models/IServerRegistration.cs +++ b/src/Umbraco.Core/Models/IServerRegistration.cs @@ -18,6 +18,11 @@ namespace Umbraco.Core.Models /// bool IsActive { get; set; } + /// + /// Gets or sets a value indicating whether the server is master. + /// + bool IsMaster { get; set; } + /// /// Gets the date and time the registration was created. /// diff --git a/src/Umbraco.Core/Models/PartialView.cs b/src/Umbraco.Core/Models/PartialView.cs index d483de4176..75914820f0 100644 --- a/src/Umbraco.Core/Models/PartialView.cs +++ b/src/Umbraco.Core/Models/PartialView.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; -using System.Text.RegularExpressions; -using Umbraco.Core.IO; +using Umbraco.Core.Services; namespace Umbraco.Core.Models { @@ -15,12 +12,14 @@ namespace Umbraco.Core.Models [DataContract(IsReference = true)] public class PartialView : File, IPartialView { - public PartialView(string path) - : base(path) - { - base.Path = path; - } + : this(path, null) + { } + internal PartialView(string path, Func getFileContent) + : base(path, getFileContent) + { } + + internal PartialViewType ViewType { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/PartialViewType.cs b/src/Umbraco.Core/Models/PartialViewType.cs new file mode 100644 index 0000000000..2b45448271 --- /dev/null +++ b/src/Umbraco.Core/Models/PartialViewType.cs @@ -0,0 +1,9 @@ +namespace Umbraco.Core.Models +{ + internal enum PartialViewType : byte + { + Unknown = 0, // default + PartialView = 1, + PartialViewMacro = 2 + } +} diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs index 8c0eeef86f..fef066e0b1 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs @@ -62,9 +62,20 @@ namespace Umbraco.Core.Models.PublishedContent // model and therefore returned the original content unchanged. var model = content.CreateModel(); - var extended = model == content // == means the factory did not create a model - ? new PublishedContentExtended(content) // so we have to extend - : model; // else we can use what the factory returned + IPublishedContent extended; + if (model == content) // == means the factory did not create a model + { + // so we have to extend + var contentWithKey = content as IPublishedContentWithKey; + extended = contentWithKey == null + ? new PublishedContentExtended(content) + : new PublishedContentWithKeyExtended(contentWithKey); + } + else + { + // else we can use what the factory returned + extended = model; + } // so extended should always implement IPublishedContentExtended, however if // by mistake the factory returned a different object that does not implement diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyExtended.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyExtended.cs new file mode 100644 index 0000000000..492fd79796 --- /dev/null +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyExtended.cs @@ -0,0 +1,14 @@ +using System; + +namespace Umbraco.Core.Models.PublishedContent +{ + public class PublishedContentWithKeyExtended : PublishedContentExtended, IPublishedContentWithKey + { + // protected for models, internal for PublishedContentExtended static Extend method + protected internal PublishedContentWithKeyExtended(IPublishedContentWithKey content) + : base(content) + { } + + public Guid Key { get { return ((IPublishedContentWithKey) Content).Key; } } + } +} diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyModel.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyModel.cs new file mode 100644 index 0000000000..4761a52617 --- /dev/null +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyModel.cs @@ -0,0 +1,13 @@ +using System; + +namespace Umbraco.Core.Models.PublishedContent +{ + public abstract class PublishedContentWithKeyModel : PublishedContentModel, IPublishedContentWithKey + { + protected PublishedContentWithKeyModel(IPublishedContentWithKey content) + : base (content) + { } + + public Guid Key { get { return ((IPublishedContentWithKey) Content).Key; } } + } +} diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyWrapped.cs new file mode 100644 index 0000000000..35d7dd6f1f --- /dev/null +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWithKeyWrapped.cs @@ -0,0 +1,17 @@ +using System; + +namespace Umbraco.Core.Models.PublishedContent +{ + /// + /// Provides an abstract base class for IPublishedContentWithKey implementations that + /// wrap and extend another IPublishedContentWithKey. + /// + public class PublishedContentWithKeyWrapped : PublishedContentWrapped, IPublishedContentWithKey + { + protected PublishedContentWithKeyWrapped(IPublishedContentWithKey content) + : base(content) + { } + + public virtual Guid Key { get { return ((IPublishedContentWithKey) Content).Key; } } + } +} diff --git a/src/Umbraco.Core/Models/Rdbms/AccessDto.cs b/src/Umbraco.Core/Models/Rdbms/AccessDto.cs index ba2cb6d767..37b1dbddd8 100644 --- a/src/Umbraco.Core/Models/Rdbms/AccessDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/AccessDto.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Security.AccessControl; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -30,11 +31,11 @@ namespace Umbraco.Core.Models.Rdbms public int NoAccessNodeId { get; set; } [Column("createDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime CreateDate { get; set; } [Column("updateDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime UpdateDate { get; set; } [ResultColumn] diff --git a/src/Umbraco.Core/Models/Rdbms/AccessRuleDto.cs b/src/Umbraco.Core/Models/Rdbms/AccessRuleDto.cs index a98dfb9450..78e3444e56 100644 --- a/src/Umbraco.Core/Models/Rdbms/AccessRuleDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/AccessRuleDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -25,11 +26,11 @@ namespace Umbraco.Core.Models.Rdbms public string RuleType { get; set; } [Column("createDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime CreateDate { get; set; } [Column("updateDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime UpdateDate { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs b/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs index 9b1fa02dae..3bd85cccf6 100644 --- a/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/ContentVersionDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -23,7 +24,7 @@ namespace Umbraco.Core.Models.Rdbms public Guid VersionId { get; set; } [Column("VersionDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime VersionDate { get; set; } [ResultColumn] diff --git a/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs b/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs index de087667b2..88e04087c9 100644 --- a/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/DocumentDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -38,7 +39,7 @@ namespace Umbraco.Core.Models.Rdbms public DateTime? ExpiresDate { get; set; } [Column("updateDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime UpdateDate { get; set; } [Column("templateId")] diff --git a/src/Umbraco.Core/Models/Rdbms/ExternalLoginDto.cs b/src/Umbraco.Core/Models/Rdbms/ExternalLoginDto.cs index 652c9df714..803c25fdfc 100644 --- a/src/Umbraco.Core/Models/Rdbms/ExternalLoginDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/ExternalLoginDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -27,7 +28,7 @@ namespace Umbraco.Core.Models.Rdbms public string ProviderKey { get; set; } [Column("createDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime CreateDate { get; set; } diff --git a/src/Umbraco.Core/Models/Rdbms/LogDto.cs b/src/Umbraco.Core/Models/Rdbms/LogDto.cs index 3c2a6a61a5..be67b5873a 100644 --- a/src/Umbraco.Core/Models/Rdbms/LogDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/LogDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -21,7 +22,7 @@ namespace Umbraco.Core.Models.Rdbms public int NodeId { get; set; } [Column("Datestamp")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime Datestamp { get; set; } [Column("logHeader")] diff --git a/src/Umbraco.Core/Models/Rdbms/MigrationDto.cs b/src/Umbraco.Core/Models/Rdbms/MigrationDto.cs index ffd000278d..5ab339fe01 100644 --- a/src/Umbraco.Core/Models/Rdbms/MigrationDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/MigrationDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -19,7 +20,7 @@ namespace Umbraco.Core.Models.Rdbms public string Name { get; set; } [Column("createDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime CreateDate { get; set; } [Column("version")] diff --git a/src/Umbraco.Core/Models/Rdbms/NodeDto.cs b/src/Umbraco.Core/Models/Rdbms/NodeDto.cs index d7a859ef06..7003c58e77 100644 --- a/src/Umbraco.Core/Models/Rdbms/NodeDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/NodeDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -48,7 +49,7 @@ namespace Umbraco.Core.Models.Rdbms [Column("uniqueID")] [NullSetting(NullSetting = NullSettings.NotNull)] [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoNodeUniqueID")] - [Constraint(Default = "newid()")] + [Constraint(Default = SystemMethods.NewGuid)] public Guid UniqueId { get; set; } [Column("text")] @@ -61,7 +62,7 @@ namespace Umbraco.Core.Models.Rdbms public Guid? NodeObjectType { get; set; } [Column("createDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime CreateDate { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Rdbms/PropertyTypeDto.cs b/src/Umbraco.Core/Models/Rdbms/PropertyTypeDto.cs index 621ace555b..74a6d34289 100644 --- a/src/Umbraco.Core/Models/Rdbms/PropertyTypeDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/PropertyTypeDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -61,7 +62,7 @@ namespace Umbraco.Core.Models.Rdbms [Column("UniqueID")] [NullSetting(NullSetting = NullSettings.NotNull)] - [Constraint(Default = "newid()")] + [Constraint(Default = SystemMethods.NewGuid)] [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsPropertyTypeUniqueID")] public Guid UniqueId { get; set; } } diff --git a/src/Umbraco.Core/Models/Rdbms/RelationDto.cs b/src/Umbraco.Core/Models/Rdbms/RelationDto.cs index e204e42040..368904a5cb 100644 --- a/src/Umbraco.Core/Models/Rdbms/RelationDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/RelationDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -26,7 +27,7 @@ namespace Umbraco.Core.Models.Rdbms public int RelationType { get; set; } [Column("datetime")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime Datetime { get; set; } [Column("comment")] diff --git a/src/Umbraco.Core/Models/Rdbms/ServerRegistrationDto.cs b/src/Umbraco.Core/Models/Rdbms/ServerRegistrationDto.cs index b7bdf265ce..2a3751c083 100644 --- a/src/Umbraco.Core/Models/Rdbms/ServerRegistrationDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/ServerRegistrationDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -23,7 +24,7 @@ namespace Umbraco.Core.Models.Rdbms public string ServerIdentity { get; set; } [Column("registeredDate")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime DateRegistered { get; set; } [Column("lastNotifiedDate")] @@ -33,6 +34,7 @@ namespace Umbraco.Core.Models.Rdbms [Index(IndexTypes.NonClustered)] public bool IsActive { get; set; } - + [Column("isMaster")] + public bool IsMaster { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Rdbms/TaskDto.cs b/src/Umbraco.Core/Models/Rdbms/TaskDto.cs index 75e4d25cb7..e27f7c0a93 100644 --- a/src/Umbraco.Core/Models/Rdbms/TaskDto.cs +++ b/src/Umbraco.Core/Models/Rdbms/TaskDto.cs @@ -1,6 +1,7 @@ using System; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseAnnotations; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; namespace Umbraco.Core.Models.Rdbms { @@ -34,7 +35,7 @@ namespace Umbraco.Core.Models.Rdbms public int UserId { get; set; } [Column("DateTime")] - [Constraint(Default = "getdate()")] + [Constraint(Default = SystemMethods.CurrentDateTime)] public DateTime DateTime { get; set; } [Column("Comment")] diff --git a/src/Umbraco.Core/Models/Script.cs b/src/Umbraco.Core/Models/Script.cs index 71f0684447..325885d9ba 100644 --- a/src/Umbraco.Core/Models/Script.cs +++ b/src/Umbraco.Core/Models/Script.cs @@ -1,7 +1,5 @@ using System; -using System.Linq; using System.Runtime.Serialization; -using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; @@ -15,16 +13,17 @@ namespace Umbraco.Core.Models public class Script : File { public Script(string path) - : base(path) - { - - } + : this(path, (Func) null) + { } + + internal Script(string path, Func getFileContent) + : base(path, getFileContent) + { } [Obsolete("This is no longer used and will be removed from the codebase in future versions")] public Script(string path, IContentSection contentConfig) - : this(path) - { - } + : base(path) + { } /// /// Indicates whether the current entity has an identity, which in this case is a path/name. diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs index 9a871859b6..cee70893d0 100644 --- a/src/Umbraco.Core/Models/ServerRegistration.cs +++ b/src/Umbraco.Core/Models/ServerRegistration.cs @@ -2,7 +2,6 @@ using System.Globalization; using System.Reflection; using Umbraco.Core.Models.EntityBase; -using Umbraco.Core.Sync; namespace Umbraco.Core.Models { @@ -14,10 +13,12 @@ namespace Umbraco.Core.Models private string _serverAddress; private string _serverIdentity; private bool _isActive; + private bool _isMaster; private static readonly PropertyInfo ServerAddressSelector = ExpressionHelper.GetPropertyInfo(x => x.ServerAddress); private static readonly PropertyInfo ServerIdentitySelector = ExpressionHelper.GetPropertyInfo(x => x.ServerIdentity); private static readonly PropertyInfo IsActiveSelector = ExpressionHelper.GetPropertyInfo(x => x.IsActive); + private static readonly PropertyInfo IsMasterSelector = ExpressionHelper.GetPropertyInfo(x => x.IsMaster); /// /// Initialiazes a new instance of the class. @@ -34,7 +35,8 @@ namespace Umbraco.Core.Models /// The date and time the registration was created. /// The date and time the registration was last accessed. /// A value indicating whether the registration is active. - public ServerRegistration(int id, string serverAddress, string serverIdentity, DateTime registered, DateTime accessed, bool isActive) + /// A value indicating whether the registration is master. + public ServerRegistration(int id, string serverAddress, string serverIdentity, DateTime registered, DateTime accessed, bool isActive, bool isMaster) { UpdateDate = accessed; CreateDate = registered; @@ -43,6 +45,7 @@ namespace Umbraco.Core.Models ServerAddress = serverAddress; ServerIdentity = serverIdentity; IsActive = isActive; + IsMaster = isMaster; } /// @@ -108,6 +111,22 @@ namespace Umbraco.Core.Models } } + /// + /// Gets or sets a value indicating whether the server is master. + /// + public bool IsMaster + { + get { return _isMaster; } + set + { + SetPropertyValueAndDetectChanges(o => + { + _isMaster = value; + return _isMaster; + }, _isMaster, IsMasterSelector); + } + } + /// /// Gets the date and time the registration was created. /// @@ -124,7 +143,7 @@ namespace Umbraco.Core.Models /// public override string ToString() { - return string.Format("{{\"{0}\", \"{1}\", {2}active}}", ServerAddress, ServerIdentity, IsActive ? "" : "!"); + return string.Format("{{\"{0}\", \"{1}\", {2}active, {3}master}}", ServerAddress, ServerIdentity, IsActive ? "" : "!", IsMaster ? "" : "!"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Stylesheet.cs b/src/Umbraco.Core/Models/Stylesheet.cs index ca203d835d..060246df54 100644 --- a/src/Umbraco.Core/Models/Stylesheet.cs +++ b/src/Umbraco.Core/Models/Stylesheet.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Data; using System.Linq; using System.Runtime.Serialization; -using System.Text; using Umbraco.Core.IO; using Umbraco.Core.Strings.Css; @@ -16,12 +16,16 @@ namespace Umbraco.Core.Models [DataContract(IsReference = true)] public class Stylesheet : File { - public Stylesheet(string path) - : base(path.EnsureEndsWith(".css")) - { + public Stylesheet(string path) + : this(path, null) + { } + + internal Stylesheet(string path, Func getFileContent) + : base(path.EnsureEndsWith(".css"), getFileContent) + { InitializeProperties(); } - + private Lazy> _properties; private void InitializeProperties() @@ -81,7 +85,7 @@ namespace Umbraco.Core.Models /// /// /// - void Property_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void Property_PropertyChanged(object sender, PropertyChangedEventArgs e) { var prop = (StylesheetProperty) sender; diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs index 3a8cbf8794..4aca88f286 100644 --- a/src/Umbraco.Core/Models/Template.cs +++ b/src/Umbraco.Core/Models/Template.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using System.Drawing; +using System.IO; using System.Reflection; using System.Runtime.Serialization; +using System.Text; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; @@ -29,12 +32,16 @@ namespace Umbraco.Core.Models private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name); public Template(string name, string alias) - : base(string.Empty) + : this(name, alias, (Func) null) + { } + + internal Template(string name, string alias, Func getFileContent) + : base(string.Empty, getFileContent) { _name = name; _alias = alias.ToCleanString(CleanStringType.UnderscoreAlias); _masterTemplateId = new Lazy(() => -1); - } + } [Obsolete("This constructor should not be used, file path is determined by alias, setting the path here will have no affect")] public Template(string path, string name, string alias) @@ -123,7 +130,6 @@ namespace Umbraco.Core.Models Key = Guid.NewGuid(); } - public void SetMasterTemplate(ITemplate masterTemplate) { if (masterTemplate == null) @@ -139,27 +145,9 @@ namespace Umbraco.Core.Models } - public override object DeepClone() + protected override void DeepCloneNameAndAlias(File clone) { - - //We cannot call in to the base classes to clone because the base File class treats Alias, Name.. differently so we need to manually do the clone - - //Memberwise clone on Entity will work since it doesn't have any deep elements - // for any sub class this will work for standard properties as well that aren't complex object's themselves. - var clone = (Template)MemberwiseClone(); - //turn off change tracking - clone.DisableChangeTracking(); - //Automatically deep clone ref properties that are IDeepCloneable - DeepCloneHelper.DeepCloneRefProperties(this, clone); - - //this shouldn't really be needed since we're not tracking - clone.ResetDirtyProperties(false); - //re-enable tracking - clone.EnableChangeTracking(); - - return clone; + // do nothing - prevents File from doing its stuff } - - } } diff --git a/src/Umbraco.Core/Persistence/DatabaseAnnotations/ConstraintAttribute.cs b/src/Umbraco.Core/Persistence/DatabaseAnnotations/ConstraintAttribute.cs index 599f599f85..33c7616687 100644 --- a/src/Umbraco.Core/Persistence/DatabaseAnnotations/ConstraintAttribute.cs +++ b/src/Umbraco.Core/Persistence/DatabaseAnnotations/ConstraintAttribute.cs @@ -20,6 +20,6 @@ namespace Umbraco.Core.Persistence.DatabaseAnnotations /// /// Gets or sets the Default value /// - public string Default { get; set; } + public object Default { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs index b7cacf0899..24c2294b59 100644 --- a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs +++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/SystemMethods.cs @@ -3,8 +3,8 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions public enum SystemMethods { NewGuid, - NewSequentialId, CurrentDateTime, - CurrentUTCDateTime + //NewSequentialId, + //CurrentUTCDateTime } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/DatabasenodeLockExtensions.cs b/src/Umbraco.Core/Persistence/DatabasenodeLockExtensions.cs new file mode 100644 index 0000000000..3e6d245416 --- /dev/null +++ b/src/Umbraco.Core/Persistence/DatabasenodeLockExtensions.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Runtime.CompilerServices; + +namespace Umbraco.Core.Persistence +{ + internal static class DatabaseNodeLockExtensions + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void ValidateDatabase(UmbracoDatabase database) + { + if (database == null) + throw new ArgumentNullException("database"); + if (database.CurrentTransactionIsolationLevel < IsolationLevel.RepeatableRead) + throw new InvalidOperationException("A transaction with minimum RepeatableRead isolation level is required."); + } + + // updating a record within a repeatable-read transaction gets an exclusive lock on + // that record which will be kept until the transaction is ended, effectively locking + // out all other accesses to that record - thus obtaining an exclusive lock over the + // protected resources. + public static void AcquireLockNodeWriteLock(this UmbracoDatabase database, int nodeId) + { + ValidateDatabase(database); + + database.Execute("UPDATE umbracoNode SET sortOrder = (CASE WHEN (sortOrder=1) THEN -1 ELSE 1 END) WHERE id=@id", + new { @id = nodeId }); + } + + // reading a record within a repeatable-read transaction gets a shared lock on + // that record which will be kept until the transaction is ended, effectively preventing + // other write accesses to that record - thus obtaining a shared lock over the protected + // resources. + public static void AcquireLockNodeReadLock(this UmbracoDatabase database, int nodeId) + { + ValidateDatabase(database); + + database.ExecuteScalar("SELECT sortOrder FROM umbracoNode WHERE id=@id", + new { @id = nodeId }); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs b/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs index 9ecc02e213..9c315aef46 100644 --- a/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ServerRegistrationFactory.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence.Factories { public ServerRegistration BuildEntity(ServerRegistrationDto dto) { - var model = new ServerRegistration(dto.Id, dto.ServerAddress, dto.ServerIdentity, dto.DateRegistered, dto.DateAccessed, dto.IsActive); + var model = new ServerRegistration(dto.Id, dto.ServerAddress, dto.ServerIdentity, dto.DateRegistered, dto.DateAccessed, dto.IsActive, dto.IsMaster); //on initial construction we don't want to have dirty properties tracked // http://issues.umbraco.org/issue/U4-1946 model.ResetDirtyProperties(false); @@ -21,6 +21,7 @@ namespace Umbraco.Core.Persistence.Factories ServerAddress = entity.ServerAddress, DateRegistered = entity.CreateDate, IsActive = entity.IsActive, + IsMaster = ((ServerRegistration) entity).IsMaster, DateAccessed = entity.UpdateDate, ServerIdentity = entity.ServerIdentity }; diff --git a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs index d1742dc030..60cde916b6 100644 --- a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs @@ -33,9 +33,9 @@ namespace Umbraco.Core.Persistence.Factories #region Implementation of IEntityFactory - public Template BuildEntity(TemplateDto dto, IEnumerable childDefinitions) + public Template BuildEntity(TemplateDto dto, IEnumerable childDefinitions, Func getFileContent) { - var template = new Template(dto.NodeDto.Text, dto.Alias) + var template = new Template(dto.NodeDto.Text, dto.Alias, getFileContent) { CreateDate = dto.NodeDto.CreateDate, Id = dto.NodeId, diff --git a/src/Umbraco.Core/Persistence/LockedRepository.cs b/src/Umbraco.Core/Persistence/LockedRepository.cs new file mode 100644 index 0000000000..b5d2d672f2 --- /dev/null +++ b/src/Umbraco.Core/Persistence/LockedRepository.cs @@ -0,0 +1,27 @@ +using System; +using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Persistence.UnitOfWork; + +namespace Umbraco.Core.Persistence +{ + internal class LockedRepository + where TRepository : IDisposable, IRepository + { + public LockedRepository(Transaction transaction, IDatabaseUnitOfWork unitOfWork, TRepository repository) + { + Transaction = transaction; + UnitOfWork = unitOfWork; + Repository = repository; + } + + public Transaction Transaction { get; private set; } + public IDatabaseUnitOfWork UnitOfWork { get; private set; } + public TRepository Repository { get; private set; } + + public void Commit() + { + UnitOfWork.Commit(); + Transaction.Complete(); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/LockingRepository.cs b/src/Umbraco.Core/Persistence/LockingRepository.cs new file mode 100644 index 0000000000..f513073e71 --- /dev/null +++ b/src/Umbraco.Core/Persistence/LockingRepository.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Persistence.UnitOfWork; + +namespace Umbraco.Core.Persistence +{ + internal class LockingRepository + where TRepository : IDisposable, IRepository + { + private readonly IDatabaseUnitOfWorkProvider _uowProvider; + private readonly Func _repositoryFactory; + private readonly int[] _readLockIds, _writeLockIds; + + public LockingRepository(IDatabaseUnitOfWorkProvider uowProvider, Func repositoryFactory, + IEnumerable readLockIds, IEnumerable writeLockIds) + { + Mandate.ParameterNotNull(uowProvider, "uowProvider"); + Mandate.ParameterNotNull(repositoryFactory, "repositoryFactory"); + + _uowProvider = uowProvider; + _repositoryFactory = repositoryFactory; + _readLockIds = readLockIds == null ? new int[0] : readLockIds.ToArray(); + _writeLockIds = writeLockIds == null ? new int[0] : writeLockIds.ToArray(); + } + + public void WithReadLocked(Action> action, bool autoCommit = true) + { + var uow = _uowProvider.GetUnitOfWork(); + using (var transaction = uow.Database.GetTransaction(IsolationLevel.RepeatableRead)) + { + foreach (var lockId in _readLockIds) + uow.Database.AcquireLockNodeReadLock(lockId); + + using (var repository = _repositoryFactory(uow)) + { + action(new LockedRepository(transaction, uow, repository)); + if (autoCommit == false) return; + uow.Commit(); + transaction.Complete(); + } + } + } + + public TResult WithReadLocked(Func, TResult> func, bool autoCommit = true) + { + var uow = _uowProvider.GetUnitOfWork(); + using (var transaction = uow.Database.GetTransaction(IsolationLevel.RepeatableRead)) + { + foreach (var lockId in _readLockIds) + uow.Database.AcquireLockNodeReadLock(lockId); + + using (var repository = _repositoryFactory(uow)) + { + var ret = func(new LockedRepository(transaction, uow, repository)); + if (autoCommit == false) return ret; + uow.Commit(); + transaction.Complete(); + return ret; + } + } + } + + public void WithWriteLocked(Action> action, bool autoCommit = true) + { + var uow = _uowProvider.GetUnitOfWork(); + using (var transaction = uow.Database.GetTransaction(IsolationLevel.RepeatableRead)) + { + foreach (var lockId in _writeLockIds) + uow.Database.AcquireLockNodeWriteLock(lockId); + + using (var repository = _repositoryFactory(uow)) + { + action(new LockedRepository(transaction, uow, repository)); + if (autoCommit == false) return; + uow.Commit(); + transaction.Complete(); + } + } + } + + public TResult WithWriteLocked(Func, TResult> func, bool autoCommit = true) + { + var uow = _uowProvider.GetUnitOfWork(); + using (var transaction = uow.Database.GetTransaction(IsolationLevel.RepeatableRead)) + { + foreach (var lockId in _writeLockIds) + uow.Database.AcquireLockNodeReadLock(lockId); + + using (var repository = _repositoryFactory(uow)) + { + var ret = func(new LockedRepository(transaction, uow, repository)); + if (autoCommit == false) return ret; + uow.Commit(); + transaction.Complete(); + return ret; + } + } + } + } +} diff --git a/src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs index e532db18aa..54d7e8cdc1 100644 --- a/src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/ServerRegistrationMapper.cs @@ -30,6 +30,7 @@ namespace Umbraco.Core.Persistence.Mappers { CacheMap(src => src.Id, dto => dto.Id); CacheMap(src => src.IsActive, dto => dto.IsActive); + CacheMap(src => src.IsMaster, dto => dto.IsMaster); CacheMap(src => src.ServerAddress, dto => dto.ServerAddress); CacheMap(src => src.CreateDate, dto => dto.DateRegistered); CacheMap(src => src.UpdateDate, dto => dto.DateAccessed); diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs index e37d001fea..a19aaa24ad 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs @@ -16,13 +16,7 @@ namespace Umbraco.Core.Persistence.Migrations { public ISqlSyntaxProvider SqlSyntax { get; private set; } public ILogger Logger { get; private set; } - - [Obsolete("Use the other constructor specifying all dependencies instead")] - protected MigrationBase() - : this(SqlSyntaxContext.SqlSyntaxProvider, LoggerResolver.Current.Logger) - { - } - + protected MigrationBase(ISqlSyntaxProvider sqlSyntax, ILogger logger) { SqlSyntax = sqlSyntax; @@ -48,7 +42,7 @@ namespace Umbraco.Core.Persistence.Migrations public IAlterSyntaxBuilder Alter { - get { return new AlterSyntaxBuilder(Context); } + get { return new AlterSyntaxBuilder(Context, SqlSyntax); } } public ICreateBuilder Create @@ -63,27 +57,27 @@ namespace Umbraco.Core.Persistence.Migrations public IExecuteBuilder Execute { - get { return new ExecuteBuilder(Context); } + get { return new ExecuteBuilder(Context, SqlSyntax); } } public IInsertBuilder Insert { - get { return new InsertBuilder(Context); } + get { return new InsertBuilder(Context, SqlSyntax); } } public IRenameBuilder Rename { - get { return new RenameBuilder(Context); } + get { return new RenameBuilder(Context, SqlSyntax); } } public IUpdateBuilder Update { - get { return new UpdateBuilder(Context); } + get { return new UpdateBuilder(Context, SqlSyntax); } } public IIfDatabaseBuilder IfDatabase(params DatabaseProviders[] databaseProviders) { - return new IfDatabaseBuilder(Context, databaseProviders); + return new IfDatabaseBuilder(Context, SqlSyntax, databaseProviders); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationExpressionBase.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationExpressionBase.cs index 7dde31d3e3..35d199d5f0 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationExpressionBase.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationExpressionBase.cs @@ -7,22 +7,22 @@ namespace Umbraco.Core.Persistence.Migrations { public abstract class MigrationExpressionBase : IMigrationExpression { - [Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] - protected MigrationExpressionBase() - : this(SqlSyntaxContext.SqlSyntaxProvider) - { - } + //[Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] + //protected MigrationExpressionBase() + // : this(SqlSyntaxContext.SqlSyntaxProvider) + //{ + //} - [Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] - protected MigrationExpressionBase(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : this(current, databaseProviders, SqlSyntaxContext.SqlSyntaxProvider) - { - } + //[Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] + //protected MigrationExpressionBase(DatabaseProviders current, DatabaseProviders[] databaseProviders) + // : this(current, databaseProviders, SqlSyntaxContext.SqlSyntaxProvider) + //{ + //} - protected MigrationExpressionBase(ISqlSyntaxProvider sqlSyntax) - { - SqlSyntax = sqlSyntax; - } + //protected MigrationExpressionBase(ISqlSyntaxProvider sqlSyntax) + //{ + // SqlSyntax = sqlSyntax; + //} protected MigrationExpressionBase(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) { @@ -76,8 +76,10 @@ namespace Umbraco.Core.Persistence.Migrations case TypeCode.UInt32: case TypeCode.UInt64: return val.ToString(); + case TypeCode.DateTime: + return SqlSyntax.GetQuotedValue(SqlSyntax.FormatDateTime((DateTime) val)); default: - return SqlSyntaxContext.SqlSyntaxProvider.GetQuotedValue(val.ToString()); + return SqlSyntax.GetQuotedValue(val.ToString()); } } } diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs index 539b00fe42..234cd67386 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Text; using log4net; using Semver; using Umbraco.Core.Configuration; @@ -243,13 +245,43 @@ namespace Umbraco.Core.Persistence.Migrations //TODO: We should output all of these SQL calls to files in a migration folder in App_Data/TEMP // so if people want to executed them manually on another environment, they can. - _logger.Info("Executing sql statement " + i + ": " + sql); - database.Execute(sql); + //The following ensures the multiple statement sare executed one at a time, this is a requirement + // of SQLCE, it's unfortunate but necessary. + // http://stackoverflow.com/questions/13665491/sql-ce-inconsistent-with-multiple-statements + var sb = new StringBuilder(); + using (var reader = new StringReader(sql)) + { + string line; + while ((line = reader.ReadLine()) != null) + { + line = line.Trim(); + if (line.Equals("GO", StringComparison.OrdinalIgnoreCase)) + { + //Execute the SQL up to the point of a GO statement + var exeSql = sb.ToString(); + _logger.Info("Executing sql statement " + i + ": " + exeSql); + database.Execute(exeSql); + + //restart the string builder + sb.Remove(0, sb.Length); + } + else + { + sb.AppendLine(line); + } + } + //execute anything remaining + if (sb.Length > 0) + { + var exeSql = sb.ToString(); + _logger.Info("Executing sql statement " + i + ": " + exeSql); + database.Execute(exeSql); + } + } + i++; } - - transaction.Complete(); //Now that this is all complete, we need to add an entry to the migrations table flagging that migrations diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/AlterSyntaxBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/AlterSyntaxBuilder.cs index 299550d83e..e253f8e607 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/AlterSyntaxBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/AlterSyntaxBuilder.cs @@ -1,30 +1,35 @@ using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column; using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter { public class AlterSyntaxBuilder : IAlterSyntaxBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; + private readonly DatabaseProviders[] _databaseProviders; - public AlterSyntaxBuilder(IMigrationContext context) + public AlterSyntaxBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; + _databaseProviders = databaseProviders; } public IAlterTableSyntax Table(string tableName) { - var expression = new AlterTableExpression { TableName = tableName }; + var expression = new AlterTableExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; //_context.Expressions.Add(expression); - return new AlterTableBuilder(expression, _context); + return new AlterTableBuilder(_context, _databaseProviders, expression); } public IAlterColumnSyntax Column(string columnName) { - var expression = new AlterColumnExpression { Column = { Name = columnName } }; + var expression = new AlterColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) {Column = {Name = columnName}}; //_context.Expressions.Add(expression); - return new AlterColumnBuilder(expression, _context); + return new AlterColumnBuilder(_context, _databaseProviders, expression); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs index 3b77743b0d..a7077f2d35 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs @@ -2,6 +2,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column { @@ -11,11 +12,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column IAlterColumnOptionForeignKeyCascadeSyntax { private readonly IMigrationContext _context; + private readonly DatabaseProviders[] _databaseProviders; - public AlterColumnBuilder(AlterColumnExpression expression, IMigrationContext context) + public AlterColumnBuilder(IMigrationContext context, DatabaseProviders[] databaseProviders, AlterColumnExpression expression) : base(expression) { _context = context; + _databaseProviders = databaseProviders; } public ForeignKeyDefinition CurrentForeignKey { get; set; } @@ -33,7 +36,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column public IAlterColumnOptionSyntax WithDefault(SystemMethods method) { - var dc = new AlterDefaultConstraintExpression + var dc = new AlterDefaultConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax) { TableName = Expression.TableName, SchemaName = Expression.SchemaName, @@ -51,7 +54,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column public IAlterColumnOptionSyntax WithDefaultValue(object value) { - var dc = new AlterDefaultConstraintExpression + var dc = new AlterDefaultConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax) { TableName = Expression.TableName, SchemaName = Expression.SchemaName, @@ -81,15 +84,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column { Expression.Column.IsIndexed = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -135,16 +135,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column { Expression.Column.IsUnique = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName, - IsUnique = true - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName, + IsUnique = true + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -172,17 +169,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column { Expression.Column.IsForeignKey = true; - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = primaryTableName, - PrimaryTableSchema = primaryTableSchema, - ForeignTable = Expression.TableName, - ForeignTableSchema = Expression.SchemaName - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = primaryTableName, + PrimaryTableSchema = primaryTableSchema, + ForeignTable = Expression.TableName, + ForeignTableSchema = Expression.SchemaName + }); fk.ForeignKey.PrimaryColumns.Add(primaryColumnName); fk.ForeignKey.ForeignColumns.Add(Expression.Column.Name); @@ -212,17 +206,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Column public IAlterColumnOptionForeignKeyCascadeSyntax ReferencedBy(string foreignKeyName, string foreignTableSchema, string foreignTableName, string foreignColumnName) { - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = Expression.TableName, - PrimaryTableSchema = Expression.SchemaName, - ForeignTable = foreignTableName, - ForeignTableSchema = foreignTableSchema - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = Expression.TableName, + PrimaryTableSchema = Expression.SchemaName, + ForeignTable = foreignTableName, + ForeignTableSchema = foreignTableSchema + }); fk.ForeignKey.PrimaryColumns.Add(Expression.Column.Name); fk.ForeignKey.ForeignColumns.Add(foreignColumnName); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs index 43be956440..a40e7be320 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs @@ -6,11 +6,11 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions { public class AlterColumnExpression : MigrationExpressionBase { - public AlterColumnExpression(ISqlSyntaxProvider sqlSyntax) - : base(sqlSyntax) - { - Column = new ColumnDefinition() { ModificationType = ModificationType.Alter }; - } + //public AlterColumnExpression(ISqlSyntaxProvider sqlSyntax) + // : base(sqlSyntax) + //{ + // Column = new ColumnDefinition() { ModificationType = ModificationType.Alter }; + //} public AlterColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) : base(current, databaseProviders, sqlSyntax) @@ -18,17 +18,17 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions Column = new ColumnDefinition() { ModificationType = ModificationType.Alter }; } - [Obsolete("Use the constructor specifying an ISqlSyntaxProvider instead")] - public AlterColumnExpression() - : this(SqlSyntaxContext.SqlSyntaxProvider) - { - } + //[Obsolete("Use the constructor specifying an ISqlSyntaxProvider instead")] + //public AlterColumnExpression() + // : this(SqlSyntaxContext.SqlSyntaxProvider) + //{ + //} - [Obsolete("Use the constructor specifying an ISqlSyntaxProvider instead")] - public AlterColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : this(current, databaseProviders, SqlSyntaxContext.SqlSyntaxProvider) - { - } + //[Obsolete("Use the constructor specifying an ISqlSyntaxProvider instead")] + //public AlterColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) + // : this(current, databaseProviders, SqlSyntaxContext.SqlSyntaxProvider) + //{ + //} @@ -42,9 +42,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions // SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(Column.Name), // SqlSyntaxContext.SqlSyntaxProvider.Format(Column)); - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.AlterColumn, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), - SqlSyntaxContext.SqlSyntaxProvider.Format(Column)); + return string.Format(SqlSyntax.AlterColumn, + SqlSyntax.GetQuotedTableName(TableName), + SqlSyntax.Format(Column)); //return string.Format(SqlSyntaxContext.SqlSyntaxProvider.AlterColumn, // SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterDefaultConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterDefaultConstraintExpression.cs index cd99b6754f..cd83f55a35 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterDefaultConstraintExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterDefaultConstraintExpression.cs @@ -4,11 +4,8 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions { public class AlterDefaultConstraintExpression : MigrationExpressionBase { - public AlterDefaultConstraintExpression() - { - } - - public AlterDefaultConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + public AlterDefaultConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -22,9 +19,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions { //NOTE Should probably investigate if Deleting a Default Constraint is different from deleting a 'regular' constraint - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteConstraint, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedName(ConstraintName)); + return string.Format(SqlSyntax.DeleteConstraint, + SqlSyntax.GetQuotedTableName(TableName), + SqlSyntax.GetQuotedName(ConstraintName)); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterTableExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterTableExpression.cs index 360b699cd8..b5906ed324 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterTableExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterTableExpression.cs @@ -1,12 +1,12 @@ -namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions { public class AlterTableExpression : MigrationExpressionBase { - public AlterTableExpression() - { - } - public AlterTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + public AlterTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs index a50e393e96..7a6ab8d47a 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs @@ -2,6 +2,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table { @@ -10,11 +11,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table IAlterTableColumnOptionForeignKeyCascadeSyntax { private readonly IMigrationContext _context; + private readonly DatabaseProviders[] _databaseProviders; - public AlterTableBuilder(AlterTableExpression expression, IMigrationContext context) + public AlterTableBuilder(IMigrationContext context, DatabaseProviders[] databaseProviders, AlterTableExpression expression) : base(expression) { _context = context; + _databaseProviders = databaseProviders; } public ColumnDefinition CurrentColumn { get; set; } @@ -36,7 +39,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table { if (CurrentColumn.ModificationType == ModificationType.Alter) { - var dc = new AlterDefaultConstraintExpression + var dc = new AlterDefaultConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax) { TableName = Expression.TableName, SchemaName = Expression.SchemaName, @@ -66,15 +69,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table { CurrentColumn.IsIndexed = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -120,16 +120,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table { CurrentColumn.IsUnique = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName, - IsUnique = true - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName, + IsUnique = true + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -157,17 +154,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table { CurrentColumn.IsForeignKey = true; - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = primaryTableName, - PrimaryTableSchema = primaryTableSchema, - ForeignTable = Expression.TableName, - ForeignTableSchema = Expression.SchemaName - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = primaryTableName, + PrimaryTableSchema = primaryTableSchema, + ForeignTable = Expression.TableName, + ForeignTableSchema = Expression.SchemaName + }); fk.ForeignKey.PrimaryColumns.Add(primaryColumnName); fk.ForeignKey.ForeignColumns.Add(CurrentColumn.Name); @@ -197,17 +191,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table public IAlterTableColumnOptionForeignKeyCascadeSyntax ReferencedBy(string foreignKeyName, string foreignTableSchema, string foreignTableName, string foreignColumnName) { - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = Expression.TableName, - PrimaryTableSchema = Expression.SchemaName, - ForeignTable = foreignTableName, - ForeignTableSchema = foreignTableSchema - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = Expression.TableName, + PrimaryTableSchema = Expression.SchemaName, + ForeignTable = foreignTableName, + ForeignTableSchema = foreignTableSchema + }); fk.ForeignKey.PrimaryColumns.Add(CurrentColumn.Name); fk.ForeignKey.ForeignColumns.Add(foreignColumnName); @@ -220,7 +211,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table public IAlterTableColumnTypeSyntax AddColumn(string name) { var column = new ColumnDefinition { Name = name, ModificationType = ModificationType.Create }; - var createColumn = new CreateColumnExpression + var createColumn = new CreateColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax) { Column = column, SchemaName = Expression.SchemaName, @@ -236,12 +227,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Alter.Table public IAlterTableColumnTypeSyntax AlterColumn(string name) { var column = new ColumnDefinition { Name = name, ModificationType = ModificationType.Alter }; - var alterColumn = new AlterColumnExpression - { - Column = column, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName - }; + var alterColumn = new AlterColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax) + { + Column = column, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName + }; CurrentColumn = column; diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs index 439733bc46..d004cd1176 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs @@ -1,6 +1,7 @@ using System.Data; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Syntax.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column { @@ -10,11 +11,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column ICreateColumnOptionForeignKeyCascadeSyntax { private readonly IMigrationContext _context; + private readonly DatabaseProviders[] _databaseProviders; - public CreateColumnBuilder(CreateColumnExpression expression, IMigrationContext context) + public CreateColumnBuilder(IMigrationContext context, DatabaseProviders[] databaseProviders, CreateColumnExpression expression) : base(expression) { _context = context; + _databaseProviders = databaseProviders; } public ForeignKeyDefinition CurrentForeignKey { get; set; } @@ -56,15 +59,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column { Expression.Column.IsIndexed = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -110,16 +110,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column { Expression.Column.IsUnique = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName, - IsUnique = true - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName, + IsUnique = true + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -147,17 +144,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column { Expression.Column.IsForeignKey = true; - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = primaryTableName, - PrimaryTableSchema = primaryTableSchema, - ForeignTable = Expression.TableName, - ForeignTableSchema = Expression.SchemaName - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = primaryTableName, + PrimaryTableSchema = primaryTableSchema, + ForeignTable = Expression.TableName, + ForeignTableSchema = Expression.SchemaName + }); fk.ForeignKey.PrimaryColumns.Add(primaryColumnName); fk.ForeignKey.ForeignColumns.Add(Expression.Column.Name); @@ -187,17 +181,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Column public ICreateColumnOptionForeignKeyCascadeSyntax ReferencedBy(string foreignKeyName, string foreignTableSchema, string foreignTableName, string foreignColumnName) { - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = Expression.TableName, - PrimaryTableSchema = Expression.SchemaName, - ForeignTable = foreignTableName, - ForeignTableSchema = foreignTableSchema - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = Expression.TableName, + PrimaryTableSchema = Expression.SchemaName, + ForeignTable = foreignTableName, + ForeignTableSchema = foreignTableSchema + }); fk.ForeignKey.PrimaryColumns.Add(Expression.Column.Name); fk.ForeignKey.ForeignColumns.Add(foreignColumnName); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs index 4f2666d032..e3ad6f972d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/CreateBuilder.cs @@ -19,75 +19,66 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create public CreateBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { + if (context == null) throw new ArgumentNullException("context"); + if (sqlSyntax == null) throw new ArgumentNullException("sqlSyntax"); + _context = context; _sqlSyntax = sqlSyntax; _databaseProviders = databaseProviders; } - [Obsolete("Use alternate ctor specifying ISqlSyntaxProvider instead")] - public CreateBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) - :this(context, SqlSyntaxContext.SqlSyntaxProvider, databaseProviders) - { - } - public ICreateTableWithColumnSyntax Table(string tableName) { - var expression = new CreateTableExpression { TableName = tableName }; + var expression = new CreateTableExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; _context.Expressions.Add(expression); - return new CreateTableBuilder(expression, _context); + return new CreateTableBuilder(_context, _databaseProviders, expression); } public ICreateColumnOnTableSyntax Column(string columnName) { - var expression = _databaseProviders == null - ? new CreateColumnExpression { Column = { Name = columnName } } - : new CreateColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders) { Column = { Name = columnName } }; + var expression = new CreateColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { Column = { Name = columnName } }; _context.Expressions.Add(expression); - return new CreateColumnBuilder(expression, _context); + return new CreateColumnBuilder(_context, _databaseProviders, expression); } public ICreateForeignKeyFromTableSyntax ForeignKey() { - var expression = _databaseProviders == null - ? new CreateForeignKeyExpression() - : new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders); + var expression = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); _context.Expressions.Add(expression); return new CreateForeignKeyBuilder(expression); } public ICreateForeignKeyFromTableSyntax ForeignKey(string foreignKeyName) { - var expression = _databaseProviders == null - ? new CreateForeignKeyExpression { ForeignKey = { Name = foreignKeyName } } - : new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders) { ForeignKey = { Name = foreignKeyName } }; + var expression = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { ForeignKey = { Name = foreignKeyName } }; _context.Expressions.Add(expression); return new CreateForeignKeyBuilder(expression); } public ICreateIndexForTableSyntax Index() { - var expression = new CreateIndexExpression(_sqlSyntax); + var expression = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); _context.Expressions.Add(expression); return new CreateIndexBuilder(expression); } public ICreateIndexForTableSyntax Index(string indexName) { - var expression = new CreateIndexExpression(_sqlSyntax) { Index = { Name = indexName } }; + var expression = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { Index = { Name = indexName } }; _context.Expressions.Add(expression); return new CreateIndexBuilder(expression); } public ICreateConstraintOnTableSyntax PrimaryKey() { - var expression = new CreateConstraintExpression(ConstraintType.PrimaryKey); + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.PrimaryKey); _context.Expressions.Add(expression); return new CreateConstraintBuilder(expression); } public ICreateConstraintOnTableSyntax PrimaryKey(string primaryKeyName) { - var expression = new CreateConstraintExpression(ConstraintType.PrimaryKey); + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.PrimaryKey); expression.Constraint.ConstraintName = primaryKeyName; _context.Expressions.Add(expression); return new CreateConstraintBuilder(expression); @@ -95,14 +86,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create public ICreateConstraintOnTableSyntax UniqueConstraint() { - var expression = new CreateConstraintExpression(ConstraintType.Unique); + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.Unique); _context.Expressions.Add(expression); return new CreateConstraintBuilder(expression); } public ICreateConstraintOnTableSyntax UniqueConstraint(string constraintName) { - var expression = new CreateConstraintExpression(ConstraintType.Unique); + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.Unique); expression.Constraint.ConstraintName = constraintName; _context.Expressions.Add(expression); return new CreateConstraintBuilder(expression); @@ -110,7 +101,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create public ICreateConstraintOnTableSyntax Constraint(string constraintName) { - var expression = new CreateConstraintExpression(ConstraintType.NonUnique); + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.NonUnique); expression.Constraint.ConstraintName = constraintName; _context.Expressions.Add(expression); return new CreateConstraintBuilder(expression); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs index b575a89c49..a06775929b 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateConstraintExpression.cs @@ -6,10 +6,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions { public class CreateConstraintExpression : MigrationExpressionBase { - public CreateConstraintExpression(ConstraintType type) + public CreateConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax, ConstraintType constraint) + : base(current, databaseProviders, sqlSyntax) { - Constraint = new ConstraintDefinition(type); + Constraint = new ConstraintDefinition(constraint); } + public ConstraintDefinition Constraint { get; private set; } @@ -17,7 +19,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions { var constraintType = (Constraint.IsPrimaryKeyConstraint) ? "PRIMARY KEY" : "UNIQUE"; - if (Constraint.IsPrimaryKeyConstraint && SqlSyntaxContext.SqlSyntaxProvider.SupportsClustered()) + if (Constraint.IsPrimaryKeyConstraint && SqlSyntax.SupportsClustered()) constraintType += " CLUSTERED"; if (Constraint.IsNonUniqueConstraint) @@ -27,12 +29,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions for (int i = 0; i < Constraint.Columns.Count; i++) { - columns[i] = SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(Constraint.Columns.ElementAt(i)); + columns[i] = SqlSyntax.GetQuotedColumnName(Constraint.Columns.ElementAt(i)); } - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.CreateConstraint, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Constraint.TableName), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedName(Constraint.ConstraintName), + return string.Format(SqlSyntax.CreateConstraint, + SqlSyntax.GetQuotedTableName(Constraint.TableName), + SqlSyntax.GetQuotedName(Constraint.ConstraintName), constraintType, string.Join(", ", columns)); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs index c048bda198..8cf37e74d2 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Expressions/CreateTableExpression.cs @@ -7,24 +7,24 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions { public class CreateTableExpression : MigrationExpressionBase { - [Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] - public CreateTableExpression() - { - Columns = new List(); - } + //[Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] + //public CreateTableExpression() + //{ + // Columns = new List(); + //} - [Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] - public CreateTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) - { - Columns = new List(); - } + //[Obsolete("Use the other constructors specifying an ISqlSyntaxProvider instead")] + //public CreateTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) + // : base(current, databaseProviders) + //{ + // Columns = new List(); + //} - public CreateTableExpression(ISqlSyntaxProvider sqlSyntax) - : base(sqlSyntax) - { - Columns = new List(); - } + //public CreateTableExpression(ISqlSyntaxProvider sqlSyntax) + // : base(sqlSyntax) + //{ + // Columns = new List(); + //} public CreateTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) : base(current, databaseProviders, sqlSyntax) diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs index 58eef672eb..86760b71bc 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs @@ -2,6 +2,7 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table { @@ -11,11 +12,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table ICreateTableColumnOptionForeignKeyCascadeSyntax { private readonly IMigrationContext _context; + private readonly DatabaseProviders[] _databaseProviders; - public CreateTableBuilder(CreateTableExpression expression, IMigrationContext context) + public CreateTableBuilder(IMigrationContext context, DatabaseProviders[] databaseProviders, CreateTableExpression expression) : base(expression) { _context = context; + _databaseProviders = databaseProviders; } public ColumnDefinition CurrentColumn { get; set; } @@ -62,15 +65,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table { CurrentColumn.IsIndexed = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -86,15 +86,25 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table { CurrentColumn.IsPrimaryKey = true; - var expression = new CreateConstraintExpression(ConstraintType.PrimaryKey) + //For MySQL, the PK will be created WITH the create table expression, however for + // SQL Server, the PK get's created in a different Alter table expression afterwords. + // MySQL will choke if the same constraint is again added afterword + // TODO: This is a super hack, I'd rather not add another property like 'CreatesPkInCreateTableDefinition' to check + // for this, but I don't see another way around. MySQL doesn't support checking for a constraint before creating + // it... except in a very strange way but it doesn't actually provider error feedback if it doesn't work so we cannot use + // it. For now, this is what I'm doing + if (Expression.CurrentDatabaseProvider != DatabaseProviders.MySql) { - Constraint = + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, ConstraintType.PrimaryKey) + { + Constraint = { TableName = CurrentColumn.TableName, Columns = new[] { CurrentColumn.Name } } - }; - _context.Expressions.Add(expression); + }; + _context.Expressions.Add(expression); + } return this; } @@ -104,16 +114,27 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table CurrentColumn.IsPrimaryKey = true; CurrentColumn.PrimaryKeyName = primaryKeyName; - var expression = new CreateConstraintExpression(ConstraintType.PrimaryKey) + //For MySQL, the PK will be created WITH the create table expression, however for + // SQL Server, the PK get's created in a different Alter table expression afterwords. + // MySQL will choke if the same constraint is again added afterword + // TODO: This is a super hack, I'd rather not add another property like 'CreatesPkInCreateTableDefinition' to check + // for this, but I don't see another way around. MySQL doesn't support checking for a constraint before creating + // it... except in a very strange way but it doesn't actually provider error feedback if it doesn't work so we cannot use + // it. For now, this is what I'm doing + + if (Expression.CurrentDatabaseProvider != DatabaseProviders.MySql) { - Constraint = + var expression = new CreateConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, ConstraintType.PrimaryKey) + { + Constraint = { ConstraintName = primaryKeyName, TableName = CurrentColumn.TableName, Columns = new[] { CurrentColumn.Name } } - }; - _context.Expressions.Add(expression); + }; + _context.Expressions.Add(expression); + } return this; } @@ -139,16 +160,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table { CurrentColumn.IsUnique = true; - var index = new CreateIndexExpression - { - Index = new IndexDefinition - { - Name = indexName, - SchemaName = Expression.SchemaName, - TableName = Expression.TableName, - IsUnique = true - } - }; + var index = new CreateIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new IndexDefinition + { + Name = indexName, + SchemaName = Expression.SchemaName, + TableName = Expression.TableName, + IsUnique = true + }); index.Index.Columns.Add(new IndexColumnDefinition { @@ -176,17 +194,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table { CurrentColumn.IsForeignKey = true; - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = primaryTableName, - PrimaryTableSchema = primaryTableSchema, - ForeignTable = Expression.TableName, - ForeignTableSchema = Expression.SchemaName - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = primaryTableName, + PrimaryTableSchema = primaryTableSchema, + ForeignTable = Expression.TableName, + ForeignTableSchema = Expression.SchemaName + }); fk.ForeignKey.PrimaryColumns.Add(primaryColumnName); fk.ForeignKey.ForeignColumns.Add(CurrentColumn.Name); @@ -216,17 +231,14 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Table public ICreateTableColumnOptionForeignKeyCascadeSyntax ReferencedBy(string foreignKeyName, string foreignTableSchema, string foreignTableName, string foreignColumnName) { - var fk = new CreateForeignKeyExpression - { - ForeignKey = new ForeignKeyDefinition - { - Name = foreignKeyName, - PrimaryTable = Expression.TableName, - PrimaryTableSchema = Expression.SchemaName, - ForeignTable = foreignTableName, - ForeignTableSchema = foreignTableSchema - } - }; + var fk = new CreateForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, Expression.SqlSyntax, new ForeignKeyDefinition + { + Name = foreignKeyName, + PrimaryTable = Expression.TableName, + PrimaryTableSchema = Expression.SchemaName, + ForeignTable = foreignTableName, + ForeignTableSchema = foreignTableSchema + }); fk.ForeignKey.PrimaryColumns.Add(CurrentColumn.Name); fk.ForeignKey.ForeignColumns.Add(foreignColumnName); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs index f70de5b548..18ea700ed2 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/DeleteBuilder.cs @@ -23,69 +23,57 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete _databaseProviders = databaseProviders; } - [Obsolete("Use the other constructor specifying an ISqlSyntaxProvider instead")] - public DeleteBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) - : this(context, SqlSyntaxContext.SqlSyntaxProvider, databaseProviders) - { - } - public void Table(string tableName) { - var expression = new DeleteTableExpression { TableName = tableName }; + var expression = new DeleteTableExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; _context.Expressions.Add(expression); } public IDeleteColumnFromTableSyntax Column(string columnName) { - var expression = _databaseProviders == null - ? new DeleteColumnExpression { ColumnNames = { columnName } } - : new DeleteColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders) { ColumnNames = { columnName } }; + var expression = new DeleteColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) {ColumnNames = {columnName}}; _context.Expressions.Add(expression); return new DeleteColumnBuilder(expression); } public IDeleteForeignKeyFromTableSyntax ForeignKey() { - var expression = _databaseProviders == null - ? new DeleteForeignKeyExpression(_sqlSyntax) - : new DeleteForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); + var expression = new DeleteForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); _context.Expressions.Add(expression); return new DeleteForeignKeyBuilder(expression); } public IDeleteForeignKeyOnTableSyntax ForeignKey(string foreignKeyName) { - var expression = _databaseProviders == null - ? new DeleteForeignKeyExpression(_sqlSyntax) { ForeignKey = { Name = foreignKeyName } } - : new DeleteForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { ForeignKey = { Name = foreignKeyName } }; + var expression = new DeleteForeignKeyExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) {ForeignKey = {Name = foreignKeyName}}; _context.Expressions.Add(expression); return new DeleteForeignKeyBuilder(expression); } public IDeleteDataSyntax FromTable(string tableName) { - var expression = new DeleteDataExpression { TableName = tableName }; + var expression = new DeleteDataExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; _context.Expressions.Add(expression); return new DeleteDataBuilder(expression); } public IDeleteIndexForTableSyntax Index() { - var expression = new DeleteIndexExpression(); + var expression = new DeleteIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); _context.Expressions.Add(expression); return new DeleteIndexBuilder(expression); } public IDeleteIndexForTableSyntax Index(string indexName) { - var expression = new DeleteIndexExpression { Index = { Name = indexName } }; + var expression = new DeleteIndexExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { Index = { Name = indexName } }; _context.Expressions.Add(expression); return new DeleteIndexBuilder(expression); } public IDeleteConstraintOnTableSyntax PrimaryKey(string primaryKeyName) { - var expression = new DeleteConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, ConstraintType.PrimaryKey) + var expression = new DeleteConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.PrimaryKey) { Constraint = { ConstraintName = primaryKeyName } }; @@ -95,7 +83,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete public IDeleteConstraintOnTableSyntax UniqueConstraint(string constraintName) { - var expression = new DeleteConstraintExpression(ConstraintType.Unique) + var expression = new DeleteConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax, ConstraintType.Unique) { Constraint = { ConstraintName = constraintName } }; @@ -105,9 +93,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete public IDeleteDefaultConstraintOnTableSyntax DefaultConstraint() { - var expression = _databaseProviders == null - ? new DeleteDefaultConstraintExpression() - : new DeleteDefaultConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders); + var expression = new DeleteDefaultConstraintExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax); _context.Expressions.Add(expression); return new DeleteDefaultConstraintBuilder(expression); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteColumnExpression.cs index c9f8c8d04d..b02bca6f12 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteColumnExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteColumnExpression.cs @@ -7,13 +7,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteColumnExpression : MigrationExpressionBase { - public DeleteColumnExpression() - { - ColumnNames = new List(); - } + //public DeleteColumnExpression() + //{ + // ColumnNames = new List(); + //} - public DeleteColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) + public DeleteColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { ColumnNames = new List(); } @@ -31,9 +31,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions foreach (string columnName in ColumnNames) { if (ColumnNames.First() != columnName) sb.AppendLine(";"); - sb.AppendFormat(SqlSyntaxContext.SqlSyntaxProvider.DropColumn, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(columnName)); + sb.AppendFormat(SqlSyntax.DropColumn, + SqlSyntax.GetQuotedTableName(TableName), + SqlSyntax.GetQuotedColumnName(columnName)); } return sb.ToString(); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs index 39f250532d..21ef6bb517 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteConstraintExpression.cs @@ -5,13 +5,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteConstraintExpression : MigrationExpressionBase { - public DeleteConstraintExpression(ConstraintType type) - { - Constraint = new ConstraintDefinition(type); - } - - public DeleteConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ConstraintType type) - : base(current, databaseProviders) + + public DeleteConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax, ConstraintType type) + : base(current, databaseProviders, sqlSyntax) { Constraint = new ConstraintDefinition(type); } @@ -25,24 +21,24 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { if (Constraint.IsPrimaryKeyConstraint) { - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteConstraint, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Constraint.TableName), + return string.Format(SqlSyntax.DeleteConstraint, + SqlSyntax.GetQuotedTableName(Constraint.TableName), "PRIMARY KEY", ""); } else { - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteConstraint, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Constraint.TableName), + return string.Format(SqlSyntax.DeleteConstraint, + SqlSyntax.GetQuotedTableName(Constraint.TableName), "FOREIGN KEY", ""); } } else { - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteConstraint, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Constraint.TableName), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedName(Constraint.ConstraintName)); + return string.Format(SqlSyntax.DeleteConstraint, + SqlSyntax.GetQuotedTableName(Constraint.TableName), + SqlSyntax.GetQuotedName(Constraint.ConstraintName)); } } } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs index 73966f6e93..97c601a2a1 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDataExpression.cs @@ -8,12 +8,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions public class DeleteDataExpression : MigrationExpressionBase { private readonly List _rows = new List(); - - public DeleteDataExpression() - { - } - - public DeleteDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + + public DeleteDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -32,7 +29,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions if (IsAllRows) { - deleteItems.Add(string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteData, SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), "1 = 1")); + deleteItems.Add(string.Format(SqlSyntax.DeleteData, SqlSyntax.GetQuotedTableName(TableName), "1 = 1")); } else { @@ -42,13 +39,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions foreach (KeyValuePair item in row) { whereClauses.Add(string.Format("{0} {1} {2}", - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(item.Key), + SqlSyntax.GetQuotedColumnName(item.Key), item.Value == null ? "IS" : "=", GetQuotedValue(item.Value))); } - deleteItems.Add(string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteData, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), + deleteItems.Add(string.Format(SqlSyntax.DeleteData, + SqlSyntax.GetQuotedTableName(TableName), String.Join(" AND ", whereClauses.ToArray()))); } } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDefaultConstraintExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDefaultConstraintExpression.cs index 43677d23e3..70a74da28e 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDefaultConstraintExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteDefaultConstraintExpression.cs @@ -4,12 +4,8 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteDefaultConstraintExpression : MigrationExpressionBase { - public DeleteDefaultConstraintExpression() - { - } - - public DeleteDefaultConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) + public DeleteDefaultConstraintExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -22,7 +18,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions if (IsExpressionSupported() == false) return string.Empty; - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DeleteDefaultConstraint, + return string.Format(SqlSyntax.DeleteDefaultConstraint, TableName, ColumnName); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs index 34e3bd65c5..e0fef06f3f 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteForeignKeyExpression.cs @@ -8,24 +8,11 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteForeignKeyExpression : MigrationExpressionBase { - [Obsolete("Use the other constructors specifying an ILogger instead")] - public DeleteForeignKeyExpression() - { - ForeignKey = new ForeignKeyDefinition(); - } - - [Obsolete("Use the other constructors specifying an ILogger instead")] - public DeleteForeignKeyExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) - { - ForeignKey = new ForeignKeyDefinition(); - } - - public DeleteForeignKeyExpression(ISqlSyntaxProvider sqlSyntax) - : base(sqlSyntax) - { - ForeignKey = new ForeignKeyDefinition(); - } + //public DeleteForeignKeyExpression(ISqlSyntaxProvider sqlSyntax) + // : base(sqlSyntax) + //{ + // ForeignKey = new ForeignKeyDefinition(); + //} public DeleteForeignKeyExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) : base(current, databaseProviders, sqlSyntax) @@ -33,7 +20,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions ForeignKey = new ForeignKeyDefinition(); } - public virtual ForeignKeyDefinition ForeignKey { get; set; } + public ForeignKeyDefinition ForeignKey { get; set; } public override string ToString() { @@ -45,7 +32,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions if (CurrentDatabaseProvider == DatabaseProviders.MySql) { - //MySql naming "convention" for foreignkeys, which aren't explicitly named + //MySql naming "convention" for foreignkeys, which aren't explicitly named if (string.IsNullOrEmpty(ForeignKey.Name)) ForeignKey.Name = string.Format("{0}_ibfk_1", ForeignKey.ForeignTable.ToLower()); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs index 3e1a959925..e504223669 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteIndexExpression.cs @@ -5,23 +5,26 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteIndexExpression : MigrationExpressionBase { - public DeleteIndexExpression() + + public DeleteIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { Index = new IndexDefinition(); } - public DeleteIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + public DeleteIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax, IndexDefinition index) + : base(current, databaseProviders, sqlSyntax) { - Index = new IndexDefinition(); + Index = index; } - public virtual IndexDefinition Index { get; set; } + public IndexDefinition Index { get; private set; } public override string ToString() { - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DropIndex, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedName(Index.Name), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Index.TableName)); + return string.Format(SqlSyntax.DropIndex, + SqlSyntax.GetQuotedName(Index.Name), + SqlSyntax.GetQuotedTableName(Index.TableName)); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteTableExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteTableExpression.cs index 2fff4e75e0..0456091a4b 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteTableExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/Expressions/DeleteTableExpression.cs @@ -4,11 +4,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions { public class DeleteTableExpression : MigrationExpressionBase { - public DeleteTableExpression() - { - } - - public DeleteTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + + public DeleteTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -17,8 +15,8 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete.Expressions public override string ToString() { - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.DropTable, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName)); + return string.Format(SqlSyntax.DropTable, + SqlSyntax.GetQuotedTableName(TableName)); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs index 6521d043a7..4a31c3bf37 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Delete/IDeleteBuilder.cs @@ -12,7 +12,6 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Delete void Table(string tableName); IDeleteColumnFromTableSyntax Column(string columnName); IDeleteForeignKeyFromTableSyntax ForeignKey(); - [Obsolete("Do not use this construct as it does not work with MySql, use the syntax: Delete.ForeignKey().FromTable(\"umbracoUser2app\").ForeignColumn(... instead")] IDeleteForeignKeyOnTableSyntax ForeignKey(string foreignKeyName); IDeleteDataSyntax FromTable(string tableName); IDeleteIndexForTableSyntax Index(); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/ExecuteBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/ExecuteBuilder.cs index e537253664..549a4a0c66 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/ExecuteBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/ExecuteBuilder.cs @@ -1,34 +1,31 @@ using System; using Umbraco.Core.Persistence.Migrations.Syntax.Execute.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Execute { public class ExecuteBuilder : IExecuteBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; private readonly DatabaseProviders[] _databaseProviders; - public ExecuteBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) + public ExecuteBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; _databaseProviders = databaseProviders; } public void Sql(string sqlStatement) { - var expression = _databaseProviders == null - ? new ExecuteSqlStatementExpression {SqlStatement = sqlStatement} - : new ExecuteSqlStatementExpression(_context.CurrentDatabaseProvider, - _databaseProviders) {SqlStatement = sqlStatement}; + var expression = new ExecuteSqlStatementExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) {SqlStatement = sqlStatement}; _context.Expressions.Add(expression); } public void Code(Func codeStatement) { - var expression = _databaseProviders == null - ? new ExecuteCodeStatementExpression { CodeStatement = codeStatement } - : new ExecuteCodeStatementExpression(_context.CurrentDatabaseProvider, - _databaseProviders) { CodeStatement = codeStatement }; + var expression = new ExecuteCodeStatementExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { CodeStatement = codeStatement }; _context.Expressions.Add(expression); } } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteCodeStatementExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteCodeStatementExpression.cs index 0f88fe2ee6..e5f487d15d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteCodeStatementExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteCodeStatementExpression.cs @@ -1,15 +1,12 @@ using System; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Execute.Expressions { public class ExecuteCodeStatementExpression : MigrationExpressionBase { - public ExecuteCodeStatementExpression() - { - } - - public ExecuteCodeStatementExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) + public ExecuteCodeStatementExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteSqlStatementExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteSqlStatementExpression.cs index 308a7719dd..1164ba7caa 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteSqlStatementExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Execute/Expressions/ExecuteSqlStatementExpression.cs @@ -1,12 +1,12 @@ -namespace Umbraco.Core.Persistence.Migrations.Syntax.Execute.Expressions +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Syntax.Execute.Expressions { public class ExecuteSqlStatementExpression : MigrationExpressionBase { - public ExecuteSqlStatementExpression() - { - } - public ExecuteSqlStatementExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + public ExecuteSqlStatementExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs index 5c7bf3c0b7..ad16da5286 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateColumnExpression.cs @@ -5,20 +5,16 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions { public class CreateColumnExpression : MigrationExpressionBase { - public CreateColumnExpression() + + public CreateColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { Column = new ColumnDefinition { ModificationType = ModificationType.Create }; } - public CreateColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) - { - Column = new ColumnDefinition { ModificationType = ModificationType.Create }; - } - - public virtual string SchemaName { get; set; } - public virtual string TableName { get; set; } - public virtual ColumnDefinition Column { get; set; } + public string SchemaName { get; set; } + public string TableName { get; set; } + public ColumnDefinition Column { get; set; } public override string ToString() { @@ -28,9 +24,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions if (string.IsNullOrEmpty(Column.TableName)) Column.TableName = TableName; - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.AddColumn, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(Column.TableName), - SqlSyntaxContext.SqlSyntaxProvider.Format(Column)); + return string.Format(SqlSyntax.AddColumn, + SqlSyntax.GetQuotedTableName(Column.TableName), + SqlSyntax.Format(Column)); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs index c6c0c437ef..45e40e961f 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateForeignKeyExpression.cs @@ -5,25 +5,26 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions { public class CreateForeignKeyExpression : MigrationExpressionBase { - public CreateForeignKeyExpression() + public CreateForeignKeyExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax, ForeignKeyDefinition fkDef) + : base(current, databaseProviders, sqlSyntax) + { + ForeignKey = fkDef; + } + + public CreateForeignKeyExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { ForeignKey = new ForeignKeyDefinition(); } - public CreateForeignKeyExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) - { - ForeignKey = new ForeignKeyDefinition(); - } - - public virtual ForeignKeyDefinition ForeignKey { get; set; } + public ForeignKeyDefinition ForeignKey { get; set; } public override string ToString() { if (IsExpressionSupported() == false) return string.Empty; - return SqlSyntaxContext.SqlSyntaxProvider.Format(ForeignKey); + return SqlSyntax.Format(ForeignKey); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs index eadb30cd9e..7fa38cd3ae 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Expressions/CreateIndexExpression.cs @@ -6,32 +6,20 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Expressions { public class CreateIndexExpression : MigrationExpressionBase { - public CreateIndexExpression(ISqlSyntaxProvider sqlSyntax) - : base(sqlSyntax) + + public CreateIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax, IndexDefinition index) + : base(current, databaseProviders, sqlSyntax) { - Index = new IndexDefinition(); + Index = index; } - + public CreateIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) : base(current, databaseProviders, sqlSyntax) { Index = new IndexDefinition(); } - - [Obsolete("Use alternate ctor specifying ISqlSyntaxProvider instead")] - public CreateIndexExpression() - : this(SqlSyntaxContext.SqlSyntaxProvider) - { - - } - - [Obsolete("Use alternate ctor specifying ISqlSyntaxProvider instead")] - public CreateIndexExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : this(current, databaseProviders, SqlSyntaxContext.SqlSyntaxProvider) - { - } - - public virtual IndexDefinition Index { get; set; } + + public IndexDefinition Index { get; set; } public override string ToString() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/IfDatabase/IfDatabaseBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/IfDatabase/IfDatabaseBuilder.cs index b7105170f1..e0d20c4875 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/IfDatabase/IfDatabaseBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/IfDatabase/IfDatabaseBuilder.cs @@ -3,43 +3,46 @@ using Umbraco.Core.Persistence.Migrations.Syntax.Delete; using Umbraco.Core.Persistence.Migrations.Syntax.Execute; using Umbraco.Core.Persistence.Migrations.Syntax.Rename; using Umbraco.Core.Persistence.Migrations.Syntax.Update; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.IfDatabase { public class IfDatabaseBuilder : IIfDatabaseBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; private readonly DatabaseProviders[] _databaseProviders; - public IfDatabaseBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) + public IfDatabaseBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; _databaseProviders = databaseProviders; } public ICreateBuilder Create { - get { return new CreateBuilder(_context, _databaseProviders); } + get { return new CreateBuilder(_context, _sqlSyntax, _databaseProviders); } } public IExecuteBuilder Execute { - get { return new ExecuteBuilder(_context, _databaseProviders); } + get { return new ExecuteBuilder(_context, _sqlSyntax, _databaseProviders); } } public IDeleteBuilder Delete { - get { return new DeleteBuilder(_context, _databaseProviders); } + get { return new DeleteBuilder(_context, _sqlSyntax, _databaseProviders); } } public IRenameBuilder Rename { - get { return new RenameBuilder(_context, _databaseProviders); } + get { return new RenameBuilder(_context, _sqlSyntax, _databaseProviders); } } public IUpdateBuilder Update { - get { return new UpdateBuilder(_context, _databaseProviders); } + get { return new UpdateBuilder(_context, _sqlSyntax, _databaseProviders); } } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs index 568087733b..28b8c71d39 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/Expressions/InsertDataExpression.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Text; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.SqlSyntax; @@ -8,56 +9,76 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Insert.Expressions public class InsertDataExpression : MigrationExpressionBase { private readonly List _rows = new List(); - - public InsertDataExpression() - { - } - - public InsertDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + + public InsertDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } public string SchemaName { get; set; } public string TableName { get; set; } + public bool EnabledIdentityInsert { get; set; } - public List Rows { get { return _rows; } } - - public override string ToString() { - //TODO: This works for single insertion entries, not sure if it is valid for bulk insert operations!!! - if (IsExpressionSupported() == false) return string.Empty; - - var insertItems = new List(); - foreach (var item in Rows) + var sb = new StringBuilder(); + + if (EnabledIdentityInsert && SqlSyntax.SupportsIdentityInsert()) { - var cols = ""; - var vals = ""; - foreach (var keyVal in item) + sb.AppendLine(string.Format("SET IDENTITY_INSERT {0} ON;", SqlSyntax.GetQuotedTableName(TableName))); + if (CurrentDatabaseProvider == DatabaseProviders.SqlServer || CurrentDatabaseProvider == DatabaseProviders.SqlServerCE) { - cols += keyVal.Key + ","; - vals += GetQuotedValue(keyVal.Value) + ","; + sb.AppendLine("GO"); } - cols = cols.TrimEnd(','); - vals = vals.TrimEnd(','); - - - var sql = string.Format(SqlSyntaxContext.SqlSyntaxProvider.InsertData, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), - cols, vals); - - insertItems.Add(sql); } - return string.Join(",", insertItems); + try + { + foreach (var item in Rows) + { + var cols = ""; + var vals = ""; + foreach (var keyVal in item) + { + cols += SqlSyntax.GetQuotedColumnName(keyVal.Key) + ","; + vals += GetQuotedValue(keyVal.Value) + ","; + } + cols = cols.TrimEnd(','); + vals = vals.TrimEnd(','); + + + var sql = string.Format(SqlSyntax.InsertData, + SqlSyntax.GetQuotedTableName(TableName), + cols, vals); + + sb.AppendLine(string.Format("{0};", sql)); + if (CurrentDatabaseProvider == DatabaseProviders.SqlServer || CurrentDatabaseProvider == DatabaseProviders.SqlServerCE) + { + sb.AppendLine("GO"); + } + } + } + finally + { + if (EnabledIdentityInsert && SqlSyntax.SupportsIdentityInsert()) + { + sb.AppendLine(string.Format("SET IDENTITY_INSERT {0} OFF;", SqlSyntax.GetQuotedTableName(TableName))); + if (CurrentDatabaseProvider == DatabaseProviders.SqlServer || CurrentDatabaseProvider == DatabaseProviders.SqlServerCE) + { + sb.AppendLine("GO"); + } + } + } + + return sb.ToString(); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/IInsertDataSyntax.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/IInsertDataSyntax.cs index fb0585f0e6..5791f0cb83 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/IInsertDataSyntax.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/IInsertDataSyntax.cs @@ -2,6 +2,7 @@ { public interface IInsertDataSyntax : IFluentSyntax { + IInsertDataSyntax EnableIdentityInsert(); IInsertDataSyntax Row(object dataAsAnonymousType); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertBuilder.cs index 889c3e4008..2d3ce9c64d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertBuilder.cs @@ -1,19 +1,24 @@ using Umbraco.Core.Persistence.Migrations.Syntax.Insert.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Insert { public class InsertBuilder : IInsertBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; + private readonly DatabaseProviders[] _databaseProviders; - public InsertBuilder(IMigrationContext context) + public InsertBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; + _databaseProviders = databaseProviders; } public IInsertDataSyntax IntoTable(string tableName) { - var expression = new InsertDataExpression { TableName = tableName }; + var expression = new InsertDataExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; _context.Expressions.Add(expression); return new InsertDataBuilder(expression); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs index 9b419f8daf..4f8bf2dfcc 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Insert/InsertDataBuilder.cs @@ -14,6 +14,12 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Insert _expression = expression; } + public IInsertDataSyntax EnableIdentityInsert() + { + _expression.EnabledIdentityInsert = true; + return this; + } + public IInsertDataSyntax Row(object dataAsAnonymousType) { _expression.Rows.Add(GetData(dataAsAnonymousType)); diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameColumnExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameColumnExpression.cs index 4f626e2117..1f84401923 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameColumnExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameColumnExpression.cs @@ -3,13 +3,9 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Rename.Expressions { public class RenameColumnExpression : MigrationExpressionBase - { - public RenameColumnExpression() - { - } - - public RenameColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) + { + public RenameColumnExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -52,7 +48,7 @@ SELECT CONCAT( if (IsExpressionSupported() == false) return string.Empty; - return SqlSyntaxContext.SqlSyntaxProvider.FormatColumnRename(TableName, OldName, NewName); + return SqlSyntax.FormatColumnRename(TableName, OldName, NewName); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameTableExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameTableExpression.cs index 956cc32bfc..ec60117d7e 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameTableExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/Expressions/RenameTableExpression.cs @@ -4,12 +4,8 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Rename.Expressions { public class RenameTableExpression : MigrationExpressionBase { - public RenameTableExpression() - { - } - - public RenameTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) - : base(current, databaseProviders) + public RenameTableExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -22,7 +18,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Rename.Expressions if (IsExpressionSupported() == false) return string.Empty; - return SqlSyntaxContext.SqlSyntaxProvider.FormatTableRename(OldName, NewName); + return SqlSyntax.FormatTableRename(OldName, NewName); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/RenameBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/RenameBuilder.cs index 7116935d77..ebfb08b862 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/RenameBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Rename/RenameBuilder.cs @@ -1,34 +1,33 @@ using Umbraco.Core.Persistence.Migrations.Syntax.Rename.Column; using Umbraco.Core.Persistence.Migrations.Syntax.Rename.Expressions; using Umbraco.Core.Persistence.Migrations.Syntax.Rename.Table; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Rename { public class RenameBuilder : IRenameBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; private readonly DatabaseProviders[] _databaseProviders; - public RenameBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) + public RenameBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; _databaseProviders = databaseProviders; } public IRenameTableSyntax Table(string oldName) { - var expression = _databaseProviders == null - ? new RenameTableExpression {OldName = oldName} - : new RenameTableExpression(_context.CurrentDatabaseProvider, _databaseProviders) { OldName = oldName }; + var expression = new RenameTableExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { OldName = oldName }; _context.Expressions.Add(expression); return new RenameTableBuilder(expression); } public IRenameColumnTableSyntax Column(string oldName) { - var expression = _databaseProviders == null - ? new RenameColumnExpression {OldName = oldName} - : new RenameColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders) { OldName = oldName }; + var expression = new RenameColumnExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { OldName = oldName }; _context.Expressions.Add(expression); return new RenameColumnBuilder(expression); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/Expressions/UpdateDataExpression.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/Expressions/UpdateDataExpression.cs index fd470dd7f2..18bec8b938 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/Expressions/UpdateDataExpression.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/Expressions/UpdateDataExpression.cs @@ -5,11 +5,8 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Update.Expressions { public class UpdateDataExpression : MigrationExpressionBase { - public UpdateDataExpression() - { - } - - public UpdateDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders) : base(current, databaseProviders) + public UpdateDataExpression(DatabaseProviders current, DatabaseProviders[] databaseProviders, ISqlSyntaxProvider sqlSyntax) + : base(current, databaseProviders, sqlSyntax) { } @@ -31,7 +28,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Update.Expressions foreach (var item in Set) { updateItems.Add(string.Format("{0} = {1}", - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(item.Key), + SqlSyntax.GetQuotedColumnName(item.Key), GetQuotedValue(item.Value))); } @@ -44,13 +41,13 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Update.Expressions foreach (var item in Where) { whereClauses.Add(string.Format("{0} {1} {2}", - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName(item.Key), + SqlSyntax.GetQuotedColumnName(item.Key), item.Value == null ? "IS" : "=", GetQuotedValue(item.Value))); } } - return string.Format(SqlSyntaxContext.SqlSyntaxProvider.UpdateData, - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName(TableName), + return string.Format(SqlSyntax.UpdateData, + SqlSyntax.GetQuotedTableName(TableName), string.Join(", ", updateItems.ToArray()), string.Join(" AND ", whereClauses.ToArray())); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/UpdateBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/UpdateBuilder.cs index e2e118c05f..3816e65132 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/UpdateBuilder.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Update/UpdateBuilder.cs @@ -1,23 +1,24 @@ using Umbraco.Core.Persistence.Migrations.Syntax.Update.Expressions; +using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Syntax.Update { public class UpdateBuilder : IUpdateBuilder { private readonly IMigrationContext _context; + private readonly ISqlSyntaxProvider _sqlSyntax; private readonly DatabaseProviders[] _databaseProviders; - public UpdateBuilder(IMigrationContext context, params DatabaseProviders[] databaseProviders) + public UpdateBuilder(IMigrationContext context, ISqlSyntaxProvider sqlSyntax, params DatabaseProviders[] databaseProviders) { _context = context; + _sqlSyntax = sqlSyntax; _databaseProviders = databaseProviders; } public IUpdateSetSyntax Table(string tableName) { - var expression = _databaseProviders == null - ? new UpdateDataExpression { TableName = tableName } - : new UpdateDataExpression(_context.CurrentDatabaseProvider, _databaseProviders) { TableName = tableName }; + var expression = new UpdateDataExpression(_context.CurrentDatabaseProvider, _databaseProviders, _sqlSyntax) { TableName = tableName }; _context.Expressions.Add(expression); return new UpdateDataBuilder(expression, _context); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs index 4ca0a6eeb8..d18cb430c0 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs @@ -3,6 +3,7 @@ using System.CodeDom; using System.Linq; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; +using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.SqlSyntax; @@ -14,12 +15,12 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven [Migration("7.0.0", 4, GlobalSettings.UmbracoMigrationName)] public class AddIndexToCmsMacroTable : MigrationBase { - private readonly bool _skipIndexCheck; + private readonly bool _forTesting; - internal AddIndexToCmsMacroTable(bool skipIndexCheck, ISqlSyntaxProvider sqlSyntax, ILogger logger) + internal AddIndexToCmsMacroTable(bool forTesting, ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger) { - _skipIndexCheck = skipIndexCheck; + _forTesting = forTesting; } public AddIndexToCmsMacroTable(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger) @@ -28,7 +29,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Up() { - var dbIndexes = _skipIndexCheck ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database) + var dbIndexes = _forTesting ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database) .Select(x => new DbIndexDefinition() { TableName = x.Item1, @@ -40,6 +41,30 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven //make sure it doesn't already exist if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacro_Alias")) == false) { + //in order to create this index, we need to ensure that there are no duplicates. This could have happened with very old/corrupt umbraco versions. + // So we'll remove any duplicates based on alias and only keep the one with the smallest id since I'm pretty sure we'd always choose the 'first' one + // when running a query. + + if (_forTesting == false) + { + //NOTE: Using full SQL statement here in case the DTO has changed between versions + var macros = Context.Database.Fetch("SELECT * FROM cmsMacro") + .GroupBy(x => x.Alias) + .Where(x => x.Count() > 1); + + foreach (var m in macros) + { + //get the min id (to keep) + var minId = m.Min(x => x.Id); + //delete all the others + foreach (var macroDto in m.Where(x => x.Id != minId)) + { + Delete.FromTable("cmsMacro").Row(new { id = macroDto.Id }); + } + } + } + + Create.Index("IX_cmsMacro_Alias").OnTable("cmsMacro").OnColumn("macroAlias").Unique(); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs index 6060b76fa4..d069d8222d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs @@ -27,6 +27,11 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven }).ToArray(); //add a foreign key to the parent id column too! + + //In some cases in very old corrupted db's this will fail, so it means we need to clean the data first + //set the parentID to NULL where it doesn't actually exist in the normal ids + Execute.Sql(@"UPDATE cmsTags SET parentId = NULL WHERE parentId IS NOT NULL AND parentId NOT IN (SELECT id FROM cmsTags)"); + Create.ForeignKey("FK_cmsTags_cmsTags") .FromTable("cmsTags") .ForeignColumn("ParentId") diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index a2e2056d3a..830adfd7fb 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -55,9 +55,11 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven } var propertyTypeIds = propertyData.Select(x => x.PropertyTypeId).Distinct(); - var propertyTypes = database.Fetch( - "WHERE id in (@propertyTypeIds)", new { propertyTypeIds = propertyTypeIds }); + //NOTE: We are writing the full query because we've added a column to the PropertyTypeDto in later versions so one of the columns + // won't exist yet + var propertyTypes = database.Fetch("SELECT * FROM cmsPropertyType WHERE id in (@propertyTypeIds)", new { propertyTypeIds = propertyTypeIds }); + foreach (var data in propertyData) { if (string.IsNullOrEmpty(data.Text) == false) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs index 81b93a8883..eea56031d4 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs @@ -3,6 +3,8 @@ using System.Data; using System.Linq; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; +using Umbraco.Core.Models.Rdbms; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero @@ -30,6 +32,53 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe Delete.FromTable("cmsLanguageText").Row(new { pk = pk }); } + var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray(); + + if (columns.Any(x => x.ColumnName.InvariantEquals("id") + && x.TableName.InvariantEquals("umbracoLanguage") + && x.DataType.InvariantEquals("smallint"))) + { + //Ensure that the umbracoLanguage PK is INT and not SmallInt (which it might be in older db versions) + // In order to 'change' this to an INT, we have to run a full migration script which is super annoying + Create.Table("umbracoLanguage_TEMP") + .WithColumn("id").AsInt32().NotNullable().Identity() + .WithColumn("languageISOCode").AsString(10).Nullable() + .WithColumn("languageCultureName").AsString(50).Nullable(); + + var currentData = this.Context.Database.Fetch(new Sql().Select("*").From(SqlSyntax)); + foreach (var languageDto in currentData) + { + Insert.IntoTable("umbracoLanguage_TEMP") + .EnableIdentityInsert() + .Row(new {id = languageDto.Id, languageISOCode = languageDto.IsoCode, languageCultureName = languageDto.CultureName}); + } + + //ok, all data has been copied over, drop the old table, rename the temp table and re-add constraints. + Delete.Table("umbracoLanguage"); + Rename.Table("umbracoLanguage_TEMP").To("umbracoLanguage"); + + //add the pk + Create.PrimaryKey("PK_language").OnTable("umbracoLanguage").Column("id"); + } + + var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database) + .Select(x => new DbIndexDefinition + { + TableName = x.Item1, + IndexName = x.Item2, + ColumnName = x.Item3, + IsUnique = x.Item4 + }).ToArray(); + + //make sure it doesn't already exist + if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsDictionary_id")) == false) + { + Create.Index("IX_cmsDictionary_id").OnTable("cmsDictionary") + .OnColumn("id").Ascending() + .WithOptions().NonClustered() + .WithOptions().Unique(); + } + //now we need to create a foreign key Create.ForeignKey("FK_cmsLanguageText_umbracoLanguage_id").FromTable("cmsLanguageText").ForeignColumn("languageId") .ToTable("umbracoLanguage").PrimaryColumn("id").OnDeleteOrUpdate(Rule.None); @@ -52,7 +101,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe public override void Down() { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs new file mode 100644 index 0000000000..118dc1fc06 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddServerRegistrationColumnsAndLock.cs @@ -0,0 +1,58 @@ +using System; +using System.Linq; +using Umbraco.Core.Configuration; +using Umbraco.Core.Logging; +using Umbraco.Core.Models.Rdbms; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero +{ + [Migration("7.3.0", 17, GlobalSettings.UmbracoMigrationName)] + public class AddServerRegistrationColumnsAndLock : MigrationBase + { + public AddServerRegistrationColumnsAndLock(ISqlSyntaxProvider sqlSyntax, ILogger logger) + : base(sqlSyntax, logger) + { } + + public override void Up() + { + // don't execute if the column is already there + var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray(); + if (columns.Any(x => x.TableName.InvariantEquals("umbracoServer") && x.ColumnName.InvariantEquals("isMaster")) == false) + { + Create.Column("isMaster").OnTable("umbracoServer").AsBoolean().NotNullable().WithDefaultValue(0); + } + + EnsureLockObject(Constants.System.ServersLock, "0AF5E610-A310-4B6F-925F-E928D5416AF7", "LOCK: Servers"); + } + + public override void Down() + { + // not implemented + } + + private void EnsureLockObject(int id, string uniqueId, string text) + { + var exists = Context.Database.Exists(id); + if (exists) return; + + Insert + .IntoTable("umbracoNode") + .EnableIdentityInsert() + .Row(new + { + id = id, // NodeId + trashed = false, + parentId = -1, + nodeUser = 0, + level = 1, + path = "-1," + id, + sortOrder = 0, + uniqueId = new Guid(uniqueId), + text = text, + nodeObjectType = new Guid(Constants.ObjectTypes.LockObject), + createDate = DateTime.Now + }); + } + } +} diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CleanUpCorruptedPublishedFlags.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CleanUpCorruptedPublishedFlags.cs new file mode 100644 index 0000000000..d62ad7645d --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CleanUpCorruptedPublishedFlags.cs @@ -0,0 +1,49 @@ +using System.Linq; +using Umbraco.Core.Configuration; +using Umbraco.Core.Logging; +using Umbraco.Core.Models.Rdbms; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Persistence.SqlSyntax; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero +{ + /// + /// Older corrupted dbs might have multiple published flags for a content item, this shouldn't be possible + /// so we need to clear the content flag on the older version + /// + [Migration("7.3.0", 18, GlobalSettings.UmbracoMigrationName)] + public class CleanUpCorruptedPublishedFlags : MigrationBase + { + public CleanUpCorruptedPublishedFlags(ISqlSyntaxProvider sqlSyntax, ILogger logger) + : base(sqlSyntax, logger) + { + } + + public override void Up() + { + //Get all cmsDocument items that have more than one published date set + var sql = @"SELECT * FROM cmsDocument WHERE nodeId IN +(SELECT nodeId +FROM cmsDocument +GROUP BY nodeId +HAVING SUM(CASE WHEN published = 0 THEN 0 ELSE 1 END) > 1) +AND published = 1 +ORDER BY nodeId, updateDate"; + + var docs = Context.Database.Fetch(sql).GroupBy(x => x.NodeId); + + foreach (var doc in docs) + { + var latest = doc.OrderByDescending(x => x.UpdateDate).First(); + foreach (var old in doc.Where(x => x.VersionId != latest.VersionId)) + { + Update.Table("cmsDocument").Set(new {published = 0}).Where(new {nodeId = old.NodeId}); + } + } + } + + public override void Down() + { + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CreateCacheInstructionTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CreateCacheInstructionTable.cs index 00f968941d..afa5a1e675 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CreateCacheInstructionTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/CreateCacheInstructionTable.cs @@ -28,14 +28,11 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe var textType = SqlSyntax.GetSpecialDbType(SpecialDbTypes.NTEXT); Create.Table("umbracoCacheInstruction") - .WithColumn("id").AsInt32().Identity().NotNullable() + .WithColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoCacheInstruction").Identity() .WithColumn("utcStamp").AsDateTime().NotNullable() .WithColumn("jsonInstruction").AsCustom(textType).NotNullable() .WithColumn("originated").AsString(500).NotNullable(); - - Create.PrimaryKey("PK_umbracoCacheInstruction") - .OnTable("umbracoCacheInstruction") - .Column("id"); + } public override void Down() diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs index 3cea873f73..cb0ad58a49 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs @@ -23,34 +23,92 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe { //Don't execute anything if there is no 'master' column - this might occur if the db is already upgraded - var cols = SqlSyntax.GetColumnsInSchema(Context.Database); + var cols = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray(); if (cols.Any(x => x.ColumnName.InvariantEquals("master") && x.TableName.InvariantEquals("cmsTemplate")) == false) { return; } + + var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray(); //update the parentId column for all templates to be correct so it matches the current 'master' template - //NOTE: we are using dynamic because we need to get the data in a column that no longer exists in the schema - var templates = Context.Database.Fetch(new Sql().Select("*").From()); - foreach (var template in templates) - { - Update.Table("umbracoNode").Set(new {parentID = template.master ?? -1}).Where(new {id = template.nodeId}); - //now build the correct path for the template - Update.Table("umbracoNode").Set(new { path = BuildPath (template, templates)}).Where(new { id = template.nodeId }); - - } + //In some old corrupted databases, the information will not be correct in the master column so we need to fix that + //first by nulling out the master column where the id doesn't actually exist + Execute.Sql(@"UPDATE cmsTemplate SET master = NULL WHERE " + + SqlSyntax.GetQuotedColumnName("master") + @" IS NOT NULL AND " + + SqlSyntax.GetQuotedColumnName("master") + @" NOT IN (" + + //Stupid MySQL... needs this stupid syntax because it can do an update with a sub query of itself, + // yet it can do one with a sub sub query + // ... this will work in all dbs too + @"SELECT nodeId FROM (SELECT * FROM cmsTemplate a) b)"); + + //Now we can bulk update the parentId column + + //NOTE: This single statement should be used but stupid SQLCE doesn't support Update with a FROM !! + // so now we have to do this by individual rows :( + //Execute.Sql(@"UPDATE umbracoNode + //SET parentID = COALESCE(t2." + SqlSyntax.GetQuotedColumnName("master") + @", -1) + //FROM umbracoNode t1 + //INNER JOIN cmsTemplate t2 + //ON t1.id = t2.nodeId"); + Execute.Code(database => + { + var templateData = database.Fetch("SELECT * FROM cmsTemplate"); + + foreach (var template in templateData) + { + var sql = "SET parentID=@parentId WHERE id=@nodeId"; + + LogHelper.Info("Executing sql statement: UPDATE umbracoNode " + sql); + + database.Update(sql, + new {parentId = template.master ?? -1, nodeId = template.nodeId}); + } + + return string.Empty; + }); + + //Now we can update the path, but this needs to be done in a delegate callback so that the query runs after the updates just completed + Execute.Code(database => + { + //NOTE: we are using dynamic because we need to get the data in a column that no longer exists in the schema + var templates = database.Fetch(new Sql().Select("*").From()); + foreach (var template in templates) + { + var sql = string.Format(SqlSyntax.UpdateData, + SqlSyntax.GetQuotedTableName("umbracoNode"), + "path=@buildPath", + "id=@nodeId"); + + LogHelper.Info("Executing sql statement: " + sql); + + //now build the correct path for the template + database.Execute(sql, new + { + buildPath = BuildPath(template, templates), + nodeId = template.nodeId + }); + } + + return string.Empty; + }); + + //now remove the master column and key if (this.Context.CurrentDatabaseProvider == DatabaseProviders.MySql) { - Delete.ForeignKey().FromTable("cmsTemplate").ForeignColumn("master").ToTable("umbracoUser").PrimaryColumn("id"); + //Because MySQL doesn't name keys with what you want, we need to query for the one that is associated + // this is required for this specific case because there are 2 foreign keys on the cmsTemplate table + var fkName = constraints.FirstOrDefault(x => x.Item1.InvariantEquals("cmsTemplate") && x.Item2.InvariantEquals("master")); + if (fkName != null) + { + Delete.ForeignKey(fkName.Item3).OnTable("cmsTemplate"); + } } else { - //These are the old aliases, before removing them, check they exist - var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray(); - if (constraints.Any(x => x.Item1.InvariantEquals("cmsTemplate") && x.Item3.InvariantEquals("FK_cmsTemplate_cmsTemplate"))) { Delete.ForeignKey("FK_cmsTemplate_cmsTemplate").OnTable("cmsTemplate"); @@ -59,8 +117,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe //TODO: Hopefully it's not named something else silly in some crazy old versions } - var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray(); - if (columns.Any(x => x.ColumnName.InvariantEquals("master") && x.TableName.InvariantEquals("cmsTemplate"))) + + if (cols.Any(x => x.ColumnName.InvariantEquals("master") && x.TableName.InvariantEquals("cmsTemplate"))) { Delete.Column("master").FromTable("cmsTemplate"); } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs index 5f27bfa4f5..6598719454 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs @@ -28,8 +28,11 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixZeroOne { if (database != null) { - //Fetch all PropertyTypes that belongs to a PropertyTypeGroup - var propertyTypes = database.Fetch("WHERE propertyTypeGroupId > 0"); + //Fetch all PropertyTypes that belongs to a PropertyTypeGroup + //NOTE: We are writing the full query because we've added a column to the PropertyTypeDto in later versions so one of the columns + // won't exist yet + var propertyTypes = database.Fetch("SELECT * FROM cmsPropertyType WHERE propertyTypeGroupId > 0"); + var propertyGroups = database.Fetch("WHERE id > 0"); foreach (var propertyType in propertyTypes) diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs index 42ab8ab610..d55ad8fc14 100644 --- a/src/Umbraco.Core/Persistence/PetaPoco.cs +++ b/src/Umbraco.Core/Persistence/PetaPoco.cs @@ -215,6 +215,10 @@ namespace Umbraco.Core.Persistence _paramPrefix = "?"; if (_dbType == DBType.Oracle) _paramPrefix = ":"; + + // by default use MSSQL default ReadCommitted level + //TODO change to RepeatableRead - but that is breaking + _isolationLevel = IsolationLevel.ReadCommitted; } // Automatically close one open shared connection @@ -237,7 +241,27 @@ namespace Umbraco.Core.Persistence _sharedConnection.ConnectionString = _connectionString; _sharedConnection.OpenWithRetry();//Changed .Open() => .OpenWithRetry() extension method - _sharedConnection = OnConnectionOpened(_sharedConnection); + // ensure we have the proper isolation level, as levels can leak in pools + // read http://stackoverflow.com/questions/9851415/sql-server-isolation-level-leaks-across-pooled-connections + // and http://stackoverflow.com/questions/641120/what-exec-sp-reset-connection-shown-in-sql-profiler-means + // + // NPoco has that code in OpenSharedConnectionImp (commented out?) + //using (var cmd = _sharedConnection.CreateCommand()) + //{ + // cmd.CommandText = GetSqlForTransactionLevel(_isolationLevel); + // cmd.CommandTimeout = CommandTimeout; + // cmd.ExecuteNonQuery(); + //} + // + // although MSDN documentation for SQL CE clearly states that the above method + // should work, it fails & reports an error parsing the query on 'TRANSACTION', + // and Google is no help (others have faced the same issue... no solution). So, + // switching to another method that does work on all databases. + var tr = _sharedConnection.BeginTransaction(_isolationLevel); + tr.Commit(); + tr.Dispose(); + + _sharedConnection = OnConnectionOpened(_sharedConnection); if (KeepConnectionAlive) _sharedConnectionDepth++; // Make sure you call Dispose @@ -269,10 +293,20 @@ namespace Umbraco.Core.Persistence // Helper to create a transaction scope public Transaction GetTransaction() { - return new Transaction(this); - } + return GetTransaction(_isolationLevel); + } - // Use by derived repo generated by T4 templates + public Transaction GetTransaction(IsolationLevel isolationLevel) + { + return new Transaction(this, isolationLevel); + } + + public IsolationLevel CurrentTransactionIsolationLevel + { + get { return _transaction == null ? IsolationLevel.Unspecified : _transaction.IsolationLevel; } + } + + // Use by derived repo generated by T4 templates public virtual void OnBeginTransaction() { } public virtual void OnEndTransaction() { } @@ -281,17 +315,23 @@ namespace Umbraco.Core.Persistence // Use `using (var scope=db.Transaction) { scope.Complete(); }` to ensure correct semantics public void BeginTransaction() { - _transactionDepth++; + BeginTransaction(_isolationLevel); + } + + public void BeginTransaction(IsolationLevel isolationLevel) + { + _transactionDepth++; if (_transactionDepth == 1) { OpenSharedConnection(); - _transaction = _sharedConnection.BeginTransaction(); + _transaction = _sharedConnection.BeginTransaction(isolationLevel); _transactionCancelled = false; OnBeginTransaction(); } - - } + else if (isolationLevel > _transaction.IsolationLevel) + throw new Exception("Already in a transaction with a lower isolation level."); + } // Internal helper to cleanup transaction stuff void CleanupTransaction() @@ -313,6 +353,7 @@ namespace Umbraco.Core.Persistence public void AbortTransaction() { _transactionCancelled = true; + //TODO what shall we do if transactionDepth is already zero? if ((--_transactionDepth) == 0) CleanupTransaction(); } @@ -320,11 +361,32 @@ namespace Umbraco.Core.Persistence // Complete the transaction public void CompleteTransaction() { - if ((--_transactionDepth) == 0) + //TODO what shall we do if transactionDepth is already zero? + if ((--_transactionDepth) == 0) CleanupTransaction(); } - // Helper to handle named parameters from object properties + // in NPoco this is in DatabaseType + private static string GetSqlForTransactionLevel(IsolationLevel isolationLevel) + { + switch (isolationLevel) + { + case IsolationLevel.ReadCommitted: + return "SET TRANSACTION ISOLATION LEVEL READ COMMITTED"; + case IsolationLevel.ReadUncommitted: + return "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED"; + case IsolationLevel.RepeatableRead: + return "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ"; + case IsolationLevel.Serializable: + return "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE"; + case IsolationLevel.Snapshot: + return "SET TRANSACTION ISOLATION LEVEL SNAPSHOT"; + default: + return "SET TRANSACTION ISOLATION LEVEL READ COMMITTED"; + } + } + + // Helper to handle named parameters from object properties static Regex rxParams = new Regex(@"(? args_dest) { @@ -2264,16 +2326,17 @@ namespace Umbraco.Core.Persistence string _lastSql; object[] _lastArgs; string _paramPrefix = "@"; + IsolationLevel _isolationLevel; } // Transaction object helps maintain transaction depth counts public class Transaction : IDisposable { - public Transaction(Database db) - { - _db = db; - _db.BeginTransaction(); - } + public Transaction(Database db, IsolationLevel isolationLevel) + { + _db = db; + _db.BeginTransaction(isolationLevel); + } public virtual void Complete() { @@ -2283,6 +2346,7 @@ namespace Umbraco.Core.Persistence public void Dispose() { + //TODO prevent multiple calls to Dispose if (_db != null) _db.AbortTransaction(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index 61e94568e3..60d7d8e7ef 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -654,8 +654,8 @@ namespace Umbraco.Core.Persistence.Repositories var translator = new SqlTranslator(sqlClause, query); var sql = translator.Translate() .Where(x => x.Published) - .OrderBy(x => x.Level) - .OrderBy(x => x.SortOrder); + .OrderBy(x => x.Level, SqlSyntax) + .OrderBy(x => x.SortOrder, SqlSyntax); //NOTE: This doesn't allow properties to be part of the query var dtos = Database.Fetch(sql); @@ -896,7 +896,7 @@ namespace Umbraco.Core.Persistence.Repositories /// /// Private method to create a content object from a DocumentDto, which is used by Get and GetByVersion. /// - /// + /// /// /// /// diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs index 9ac905cf03..c75c061452 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs @@ -1130,6 +1130,11 @@ AND umbracoNode.id <> @id", out IDictionary allPropertyTypeCollection, out IDictionary allPropertyGroupCollection) { + allPropertyGroupCollection = new Dictionary(); + allPropertyTypeCollection = new Dictionary(); + + // query below is not safe + pointless if array is empty + if (contentTypeIds.Length == 0) return; // first part Gets all property groups including property type data even when no property type exists on the group // second part Gets all property types including ones that are not on a group @@ -1165,10 +1170,8 @@ AND umbracoNode.id <> @id", INNER JOIN cmsDataType as DT ON PT.dataTypeId = DT.nodeId LEFT JOIN cmsPropertyTypeGroup as PG - ON PG.id = PT.propertyTypeGroupId"); - - if (contentTypeIds.Any()) - sqlBuilder.AppendLine(" WHERE (PT.contentTypeId in (@contentTypeIds))"); + ON PG.id = PT.propertyTypeGroupId + WHERE (PT.contentTypeId in (@contentTypeIds))"); sqlBuilder.AppendLine(" ORDER BY (pgId)"); @@ -1179,9 +1182,6 @@ AND umbracoNode.id <> @id", var result = db.Fetch(sqlBuilder.ToString(), new { contentTypeIds = contentTypeIds }); - allPropertyGroupCollection = new Dictionary(); - allPropertyTypeCollection = new Dictionary(); - foreach (var contentTypeId in contentTypeIds) { //from this we need to make : diff --git a/src/Umbraco.Core/Persistence/Repositories/DeepCloneRuntimeCacheProvider.cs b/src/Umbraco.Core/Persistence/Repositories/DeepCloneRuntimeCacheProvider.cs index a87ec1e764..0b5b42660d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DeepCloneRuntimeCacheProvider.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DeepCloneRuntimeCacheProvider.cs @@ -79,7 +79,7 @@ namespace Umbraco.Core.Persistence.Repositories public object GetCacheItem(string cacheKey, Func getCacheItem) { - return InnerProvider.GetCacheItem(cacheKey, () => + var cached = InnerProvider.GetCacheItem(cacheKey, () => { var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem); var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache @@ -87,18 +87,21 @@ namespace Umbraco.Core.Persistence.Repositories return CheckCloneableAndTracksChanges(value); }); + return CheckCloneableAndTracksChanges(cached); } public object GetCacheItem(string cacheKey, Func getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null) { - return InnerProvider.GetCacheItem(cacheKey, () => + var cached = InnerProvider.GetCacheItem(cacheKey, () => { var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem); var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache if (value == null) return null; // do not store null values (backward compat) return CheckCloneableAndTracksChanges(value); - }, timeout, isSliding, priority, removedCallback, dependentFiles); + }, timeout, isSliding, priority, removedCallback, dependentFiles); + + return CheckCloneableAndTracksChanges(cached); } public void InsertCacheItem(string cacheKey, Func getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null) diff --git a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs index 391a777e5e..e1e4c3105a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs @@ -147,10 +147,6 @@ namespace Umbraco.Core.Persistence.Repositories protected virtual void PersistUpdatedItem(TEntity entity) { - //TODO: A big problem here is if the entities 'Path' changes, if that is the case then - // we'd need to rename the underlying file, BUT how would we do this since we aren't storing an - // original path property. - using (var stream = GetContentStream(entity.Content)) { FileSystem.AddFile(entity.Path, stream, true); @@ -219,6 +215,15 @@ namespace Umbraco.Core.Persistence.Repositories return list; } + protected string GetFileContent(string filename) + { + using (var stream = FileSystem.OpenFile(filename)) + using (var reader = new StreamReader(stream, Encoding.UTF8, true)) + { + return reader.ReadToEnd(); + } + } + /// /// Dispose any disposable properties /// diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs index 8ba28eeaee..3fbcdd3283 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs @@ -6,5 +6,6 @@ namespace Umbraco.Core.Persistence.Repositories { void AddFolder(string folderPath); void DeleteFolder(string folderPath); + bool ValidatePartialView(IPartialView partialView); } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs index f4d6906cd1..e055c3dd93 100644 --- a/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs @@ -7,7 +7,6 @@ namespace Umbraco.Core.Persistence.Repositories { internal class PartialViewMacroRepository : PartialViewRepository { - public PartialViewMacroRepository(IUnitOfWork work) : this(work, new PhysicalFileSystem(SystemDirectories.MvcViews + "/MacroPartials/")) { @@ -18,5 +17,6 @@ namespace Umbraco.Core.Persistence.Repositories { } + protected override PartialViewType ViewType { get { return PartialViewType.PartialViewMacro; } } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs index 2fd0240701..e9352a945f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs @@ -20,43 +20,52 @@ namespace Umbraco.Core.Persistence.Repositories { } + protected virtual PartialViewType ViewType { get { return PartialViewType.PartialView; } } + public override IPartialView Get(string id) { - if (FileSystem.FileExists(id) == false) - { - return null; - } - - string content; - using (var stream = FileSystem.OpenFile(id)) - { - var bytes = new byte[stream.Length]; - stream.Position = 0; - stream.Read(bytes, 0, (int)stream.Length); - content = Encoding.UTF8.GetString(bytes); - } - + // get the relative path within the filesystem + // (though... id should be relative already) var path = FileSystem.GetRelativePath(id); + + if (FileSystem.FileExists(path) == false) + return null; + + // content will be lazy-loaded when required var created = FileSystem.GetCreated(path).UtcDateTime; var updated = FileSystem.GetLastModified(path).UtcDateTime; + //var content = GetFileContent(path); - - var script = new PartialView(path) + var view = new PartialView(path, file => GetFileContent(file.OriginalPath)) { //id can be the hash Id = path.GetHashCode(), - Content = content, Key = path.EncodeAsGuid(), + //Content = content, CreateDate = created, UpdateDate = updated, - VirtualPath = FileSystem.GetUrl(id) + VirtualPath = FileSystem.GetUrl(id), + ViewType = ViewType }; //on initial construction we don't want to have dirty properties tracked // http://issues.umbraco.org/issue/U4-1946 - script.ResetDirtyProperties(false); + view.ResetDirtyProperties(false); - return script; + return view; + } + + public override void AddOrUpdate(IPartialView entity) + { + var partialView = entity as PartialView; + if (partialView != null) + partialView.ViewType = ViewType; + + base.AddOrUpdate(entity); + + // ensure that from now on, content is lazy-loaded + if (partialView != null && partialView.GetFileContent == null) + partialView.GetFileContent = file => GetFileContent(file.OriginalPath); } public override IEnumerable GetAll(params string[] ids) @@ -81,6 +90,29 @@ namespace Umbraco.Core.Persistence.Repositories } } + private static readonly List ValidExtensions = new List { "cshtml" }; + + public virtual bool ValidatePartialView(IPartialView partialView) + { + // get full path + string fullPath; + try + { + // may throw for security reasons + fullPath = FileSystem.GetFullPath(partialView.Path); + } + catch + { + return false; + } + + // validate path & extension + var validDir = SystemDirectories.MvcViews; + var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir); + var isValidExtension = IOHelper.VerifyFileExtension(fullPath, ValidExtensions); + return isValidPath && isValidExtension; + } + /// /// Gets a stream that is used to write to the file /// diff --git a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs index 977c2a54cd..be1f03a73f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs @@ -44,6 +44,11 @@ namespace Umbraco.Core.Persistence.Repositories { FormatDeleteStatement("umbracoUser2NodeNotify", "nodeId"), FormatDeleteStatement("umbracoUser2NodePermission", "nodeId"), + @"DELETE FROM umbracoAccessRule WHERE umbracoAccessRule.accessId IN ( + SELECT TB1.id FROM umbracoAccess as TB1 + INNER JOIN umbracoNode as TB2 ON TB1.nodeId = TB2.id + WHERE TB2.trashed = '1' AND TB2.nodeObjectType = @NodeObjectType)", + FormatDeleteStatement("umbracoAccess", "nodeId"), FormatDeleteStatement("umbracoRelation", "parentId"), FormatDeleteStatement("umbracoRelation", "childId"), FormatDeleteStatement("cmsTagRelationship", "nodeId"), @@ -75,9 +80,9 @@ namespace Umbraco.Core.Persistence.Repositories } catch (Exception ex) { - trans.Dispose(); + // transaction will rollback Logger.Error>("An error occurred while emptying the Recycle Bin: " + ex.Message, ex); - return false; + throw; } } } diff --git a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs index b48e096e3f..13b2877c50 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Text; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; using Umbraco.Core.Models; @@ -28,33 +26,27 @@ namespace Umbraco.Core.Persistence.Repositories public override Script Get(string id) { - if(FileSystem.FileExists(id) == false) - { - return null; - } - - string content; - using (var stream = FileSystem.OpenFile(id)) - { - var bytes = new byte[stream.Length]; - stream.Position = 0; - stream.Read(bytes, 0, (int)stream.Length); - content = Encoding.UTF8.GetString(bytes); - } - + // get the relative path within the filesystem + // (though... id should be relative already) var path = FileSystem.GetRelativePath(id); + + if (FileSystem.FileExists(path) == false) + return null; + + // content will be lazy-loaded when required var created = FileSystem.GetCreated(path).UtcDateTime; var updated = FileSystem.GetLastModified(path).UtcDateTime; + //var content = GetFileContent(path); - var script = new Script(path) + var script = new Script(path, file => GetFileContent(file.OriginalPath)) { //id can be the hash Id = path.GetHashCode(), - Content = content, Key = path.EncodeAsGuid(), + //Content = content, CreateDate = created, UpdateDate = updated, - VirtualPath = FileSystem.GetUrl(id) + VirtualPath = FileSystem.GetUrl(path) }; //on initial construction we don't want to have dirty properties tracked @@ -64,6 +56,15 @@ namespace Umbraco.Core.Persistence.Repositories return script; } + public override void AddOrUpdate(Script entity) + { + base.AddOrUpdate(entity); + + // ensure that from now on, content is lazy-loaded + if (entity.GetFileContent == null) + entity.GetFileContent = file => GetFileContent(file.OriginalPath); + } + public override IEnumerable - + diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/loader.js rename to src/Umbraco.Web.UI.Client/src/loader.dev.js diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js index 7fabd5c7df..d898ec48f8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.controller.js @@ -1,14 +1,21 @@ angular.module("umbraco") - .controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService) { + .controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) { $scope.section = $routeParams.section; $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; if(!$scope.section){ - $scope.section ="content"; + $scope.section = "content"; } + $scope.sectionName = $scope.section; + var rq = {}; rq.section = $scope.section; + + //translate section name + localizationService.localize("sections_" + rq.section).then(function (value) { + $scope.sectionName = value; + }); userService.getCurrentUser().then(function(user){ diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index 80ce8f80c0..f066da8e7c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -1,13 +1,13 @@
-

Help

+

Help

Umbraco version {{version}}
-
Help topics for: {{section}}
+
Help topics for: {{sectionName}}
-
Video chapters for: {{section}}
+
Video chapters for: {{sectionName}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html index 92d0ab6c30..94826b07b4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html @@ -36,7 +36,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js index 8e58535c74..fcc8e8c2ed 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js @@ -9,7 +9,7 @@ */ function LegacyController($scope, $routeParams, $element) { - var url = decodeURIComponent($routeParams.url.toLowerCase().replace(/javascript\:/g, "")); + var url = decodeURIComponent($routeParams.url.replace(/javascript\:/gi, "")); //split into path and query var urlParts = url.split("?"); var extIndex = urlParts[0].lastIndexOf("."); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html index e02ea36b5a..d3bc28bc55 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html @@ -39,7 +39,7 @@
- +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html index d3e44fce25..f3bdb0d121 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html @@ -2,7 +2,7 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png index 3795b27228..68f0cffe30 100644 Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/ourumbraco.png differ diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js index e439d0e37f..4a19ea9926 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js @@ -43,7 +43,7 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo umbRequestHelper.resourcePromise( $http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearchResults", { searcherName: searcher.name, - query: searcher.searchText, + query: encodeURIComponent(searcher.searchText), queryType: searcher.searchType })), 'Failed to search') diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html b/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html index cddc1b34ad..b7bcae8e3d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html @@ -2,7 +2,7 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html index dcbedf8ed7..3c9716eb3f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html @@ -2,7 +2,7 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index 4c1cd7678a..fcbb9dd0c7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -128,6 +128,13 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data) }); + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + editorState.set($scope.content); $scope.busy = false; $scope.page.saveButtonState = "error"; diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html index 9dcd7ff836..03f0237e38 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html @@ -1,7 +1,7 @@
-
Create a new member
+
Create a new member
  • @@ -20,6 +20,8 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/member/delete.html index e701d8cddc..d5d9fa77a6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/delete.html @@ -2,7 +2,7 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js index a0da8541af..7555addc14 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js @@ -6,7 +6,7 @@ * @description * The controller for the member list view */ -function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState) { +function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, localizationService) { //setup scope vars $scope.currentSection = appState.getSectionState("currentSection"); @@ -22,6 +22,13 @@ function MemberListController($scope, $routeParams, $location, $q, $window, appS $scope.content = data; + //translate "All Members" + if ($scope.content != null && $scope.content.name != null && $scope.content.name.replace(" ", "").toLowerCase() == "allmembers") { + localizationService.localize("member_allMembers").then(function (value) { + $scope.content.name = value; + }); + } + editorState.set($scope.content); navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js index ddf20adb19..d31ac911a9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js @@ -9,7 +9,7 @@ assetsService.load([ //"lib/spectrum/tinycolor.js", "lib/spectrum/spectrum.js" - ]).then(function () { + ], $scope).then(function () { var elem = $element.find("input"); elem.spectrum({ color: null, diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 6d3afd442d..fe413e0159 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -17,6 +17,10 @@ function dateTimePickerController($scope, notificationsService, assetsService, a //map the user config $scope.model.config = angular.extend(config, $scope.model.config); + //ensure the format doesn't get overwritten with an empty string + if ($scope.model.config.format === "" || $scope.model.config.format === undefined || $scope.model.config.format === null) { + $scope.model.config.format = $scope.model.config.pickTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD"; + } $scope.hasDatetimePickerValue = $scope.model.value ? true : false; $scope.datetimePickerValue = null; @@ -39,12 +43,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a if (e.date && e.date.isValid()) { $scope.datePickerForm.datepicker.$setValidity("pickerError", true); $scope.hasDatetimePickerValue = true; - if (!$scope.model.config.format) { - $scope.datetimePickerValue = e.date; - } - else { - $scope.datetimePickerValue = e.date.format($scope.model.config.format); - } + $scope.datetimePickerValue = e.date.format($scope.model.config.format); } else { $scope.hasDatetimePickerValue = false; @@ -78,8 +77,8 @@ function dateTimePickerController($scope, notificationsService, assetsService, a $scope.model.config.language = user.locale; - assetsService.load(filesToLoad).then( - function () { + assetsService.load(filesToLoad, $scope).then( + function () { //The Datepicker js and css files are available and all components are ready to use. // Get the id of the datepicker button that was clicked @@ -98,15 +97,10 @@ function dateTimePickerController($scope, notificationsService, assetsService, a if ($scope.hasDatetimePickerValue) { - //assign value to plugin/picker - element.datetimepicker("setValue", $scope.model.value ? new Date($scope.model.value) : moment()); - - if (!$scope.model.config.format) { - $scope.datetimePickerValue = moment($scope.model.value); - } - else { - $scope.datetimePickerValue = moment($scope.model.value).format($scope.model.config.format); - } + //assign value to plugin/picker + var dateVal = $scope.model.value ? moment($scope.model.value, $scope.model.config.format) : moment(); + element.datetimepicker("setValue", dateVal); + $scope.datetimePickerValue = moment($scope.model.value).format($scope.model.config.format); } element.find("input").bind("blur", function() { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js index 731912c951..d60535acd1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js @@ -22,7 +22,10 @@ angular.module("umbraco") } else { return val.slice(paddArray[0].length, 0); } - }else{ + } else { + if (paddArray[1].length === 0) { + return val.slice(paddArray[0].length); + } return val.slice(paddArray[0].length, -paddArray[1].length); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js index edb7f768d1..628112903d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js @@ -21,7 +21,7 @@ angular.module("umbraco") }; $scope.percentage = function(spans){ - return ((spans / $scope.columns) * 100).toFixed(1); + return ((spans / $scope.columns) * 100).toFixed(8); }; $scope.toggleCollection = function(collection, toggle){ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js index 70f9951de5..7f7b817b8a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js @@ -19,7 +19,7 @@ function RowConfigController($scope) { }; $scope.percentage = function(spans) { - return ((spans / $scope.columns) * 100).toFixed(1); + return ((spans / $scope.columns) * 100).toFixed(8); }; $scope.toggleCollection = function(collection, toggle) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js index 0e794c29d8..69a85957d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js @@ -14,7 +14,8 @@ angular.module("umbraco") $scope.control.value = { focalPoint: data.focalPoint, id: data.id, - image: data.image + image: data.image, + altText: data.altText }; $scope.setUrl(); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index 9428c64704..24aa722cc3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -424,7 +424,7 @@ angular.module("umbraco") }; $scope.percentage = function (spans) { - return ((spans / $scope.model.config.items.columns) * 100).toFixed(1); + return ((spans / $scope.model.config.items.columns) * 100).toFixed(8); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js index 229a7992f5..bfe5d1ba2e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js @@ -161,7 +161,7 @@ angular.module("umbraco") }; $scope.percentage = function(spans){ - return ((spans / $scope.model.value.columns) * 100).toFixed(1); + return ((spans / $scope.model.value.columns) * 100).toFixed(8); }; $scope.zeroWidthFilter = function (cell) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index 9341942aa9..0569c9faca 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -1,4 +1,4 @@ -function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState) { +function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState, $timeout, $q) { //this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content // that isn't created yet, if we continue this will use the parent id in the route params which isn't what @@ -91,15 +91,17 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific } }); - function showNotificationsAndReset(err, reload) { + function showNotificationsAndReset(err, reload, successMsg) { //check if response is ysod if(err.status && err.status >= 500) { dialogService.ysodDialog(err); } - $scope.bulkStatus = ""; - $scope.actionInProgress = false; + $timeout(function() { + $scope.bulkStatus = ""; + $scope.actionInProgress = false; + }, 500); if (reload === true) { $scope.reloadView($scope.contentId); @@ -110,6 +112,9 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific notificationsService.showNotification(err.data.notifications[i]); } } + else if (successMsg) { + notificationsService.success("Done", successMsg); + } } $scope.isSortDirection = function (col, direction) { @@ -277,101 +282,58 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific return iconHelper.convertFromLegacyIcon(entry.icon); }; - $scope.delete = function() { - var selected = _.filter($scope.listViewResultSet.items, function(item) { + function serial(selected, fn, getStatusMsg, index) { + return fn(selected, index).then(function (content) { + index++; + $scope.bulkStatus = getStatusMsg(index, selected.length); + return index < selected.length ? serial(selected, fn, getStatusMsg, index) : content; + }, function (err) { + var reload = index > 0; + showNotificationsAndReset(err, reload); + return err; + }); + } + + function applySelected(fn, getStatusMsg, getSuccessMsg, confirmMsg) { + var selected = _.filter($scope.listViewResultSet.items, function (item) { return item.selected; }); - var total = selected.length; - if (total === 0) { + if (selected.length === 0) return; - } - - if (confirm("Sure you want to delete?") == true) { - $scope.actionInProgress = true; - $scope.bulkStatus = "Starting with delete"; - var current = 1; - - var pluralSuffix = total == 1 ? "" : "s"; - - for (var i = 0; i < selected.length; i++) { - $scope.bulkStatus = "Deleted item " + current + " out of " + total + " item" + pluralSuffix; - deleteItemCallback(getIdCallback(selected[i])).then(function (data) { - if (current === total) { - //TODO: Should probably add notifications on the server side - notificationsService.success("Bulk action", "Deleted " + total + " item" + pluralSuffix); - showNotificationsAndReset(data, true); - } - current++; - }, function (err) { - showNotificationsAndReset(err, false); - }); - } - } - - }; - - $scope.publish = function() { - var selected = _.filter($scope.listViewResultSet.items, function(item) { - return item.selected; - }); - var total = selected.length; - if (total === 0) { + if (confirmMsg && !confirm(confirmMsg)) return; - } $scope.actionInProgress = true; - $scope.bulkStatus = "Starting with publish"; - var current = 1; + $scope.bulkStatus = getStatusMsg(0, selected.length); - var pluralSuffix = total == 1 ? "" : "s"; + serial(selected, fn, getStatusMsg, 0).then(function (result) { + // executes once the whole selection has been processed + // in case of an error (caught by serial), result will be the error + if (!(result.data && angular.isArray(result.data.notifications))) + showNotificationsAndReset(result, true, getSuccessMsg(selected.length)); + }); + }; - for (var i = 0; i < selected.length; i++) { - $scope.bulkStatus = "Publishing " + current + " out of " + total + " document" + pluralSuffix; + $scope.delete = function () { + applySelected( + function (selected, index) { return deleteItemCallback(getIdCallback(selected[index])) }, + function (count, total) { return "Deleted " + count + " out of " + total + " document" + (total > 1 ? "s" : "") }, + function (total) { return "Deleted " + total + " document" + (total > 1 ? "s" : "") }, + "Sure you want to delete?"); + }; - contentResource.publishById(getIdCallback(selected[i])) - .then(function(content) { - if (current == total) { - notificationsService.success("Bulk action", "Published " + total + " document" + pluralSuffix); - showNotificationsAndReset(content, true); - } - current++; - }, function(err) { - showNotificationsAndReset(err, false); - }); - } + $scope.publish = function () { + applySelected( + function (selected, index) { return contentResource.publishById(getIdCallback(selected[index])); }, + function (count, total) { return "Published " + count + " out of " + total + " document" + (total > 1 ? "s" : "") }, + function (total) { return "Published " + total + " document" + (total > 1 ? "s" : "") }); }; $scope.unpublish = function() { - var selected = _.filter($scope.listViewResultSet.items, function(item) { - return item.selected; - }); - var total = selected.length; - if (total === 0) { - return; - } - - $scope.actionInProgress = true; - $scope.bulkStatus = "Starting with publish"; - var current = 1; - - var pluralSuffix = total == 1 ? "" : "s"; - - for (var i = 0; i < selected.length; i++) { - $scope.bulkStatus = "Unpublishing " + current + " out of " + total + " document" + pluralSuffix; - - contentResource.unPublish(getIdCallback(selected[i])) - .then(function(content) { - - if (current == total) { - notificationsService.success("Bulk action", "Unpublished " + total + " document" + pluralSuffix); - showNotificationsAndReset(content, true); - } - - current++; - }, function(err) { - showNotificationsAndReset(err, false); - }); - } + applySelected( + function (selected, index) { return contentResource.unPublish(getIdCallback(selected[index])); }, + function (count, total) { return "Unpublished " + count + " out of " + total + " document" + (total > 1 ? "s" : "") }, + function (total) { return "Unpublished " + total + " document" + (total > 1 ? "s" : "") }); }; function getCustomPropertyValue(alias, properties) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index 2c92fd59c9..211524caf0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -1,7 +1,7 @@
- +
- +
@@ -14,15 +14,14 @@
- +
Publish @@ -38,13 +37,14 @@ Delete
- - +
- + + +
@@ -66,7 +66,7 @@ - + @@ -118,8 +118,8 @@
  • -
    • diff --git a/src/Umbraco.Web.UI/App_Start/Test.cs b/src/Umbraco.Web.UI/App_Start/Test.cs deleted file mode 100644 index d70f18eb9b..0000000000 --- a/src/Umbraco.Web.UI/App_Start/Test.cs +++ /dev/null @@ -1,272 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Threading.Tasks; -using System.Web; -using Microsoft.Owin; -using Microsoft.Owin.Security.Google; -using Microsoft.Owin.Security.OpenIdConnect; -using Owin; -using Umbraco.Core; -using Umbraco.Core.Security; -using Umbraco.Web.Security.Identity; -using Umbraco.Web.UI.App_Start; - -[assembly: OwinStartup("UmbracoStandardOwinStartup2", typeof(UmbracoStandardOwinStartup2))] - -namespace Umbraco.Web.UI.App_Start -{ - /// - /// A custom way to configure OWIN for Umbraco - /// - /// - /// The startup type is specified in appSettings under owin:appStartup - change it to "CustomUmbracoStartup" to use this class - /// - /// This startup class would allow you to customize the Identity IUserStore and/or IUserManager for the Umbraco Backoffice - /// - public class UmbracoCustomOwinStartup - { - public void Configuration(IAppBuilder app) - { - //Configure the Identity user manager and user store for use with Umbraco Back office - - // *** EXPERT: overloads of this method allow you to specify a custom UserStore or even a custom UserManager! - // *** If you plan to implement your own custom 2 factor auth, you will need a custom implementation of: - // *** BackOfficeUserManager & BackOfficeUserStore. Your custom BackOfficeUserManager will need to override/implement: - // *** - SupportsUserTwoFactor to return true - // *** - Umbraco.Web.Security.Identity.IUmbracoBackOfficeTwoFactorOptions - // *** The result view returned from IUmbracoBackOfficeTwoFactorOptions.GetTwoFactorView will be the angular - // *** view displayed to the user to enter the 2 factor authentication code. You will need to create/implement - // *** the custom angular view and all logic to handle the REST call to verify the code and log the user in - // *** based on the username provided on the $scope of your view. - // *** Your custom BackOfficeUserStore will need to override/implement: - // *** - Microsoft.AspNet.Identity.IUserTwoFactorStore - - app.ConfigureUserManagerForUmbracoBackOffice( - ApplicationContext.Current, - global::Umbraco.Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider().AsUmbracoMembershipProvider()); - - //Ensure owin is configured for Umbraco back office authentication - app - .UseUmbracoBackOfficeCookieAuthentication(ApplicationContext.Current) - .UseUmbracoBackOfficeExternalCookieAuthentication(ApplicationContext.Current); - /* - * Configure external logins for the back office: - * - * Depending on the authentication sources you would like to enable, you will need to install - * certain Nuget packages. - * - * For Google auth: Install-Package UmbracoCms.IdentityExtensions.Google - * For Facebook auth: Install-Package UmbracoCms.IdentityExtensions.Facebook - * For Microsoft auth: Install-Package UmbracoCms.IdentityExtensions.Microsoft - * For Azure ActiveDirectory auth: Install-Package UmbracoCms.IdentityExtensions.AzureActiveDirectory - * - * There are many more providers such as Twitter, Yahoo, ActiveDirectory, etc... most information can - * be found here: http://www.asp.net/web-api/overview/security/external-authentication-services - * - * For sample code on using external providers with the Umbraco back office, install one of the - * packages listed above to review it's code samples - * - */ - /* - * To configure a simple auth token server for the back office: - * - * By default the CORS policy is to allow all requests - * - * app.UseUmbracoBackOfficeTokenAuth(new BackOfficeAuthServerProviderOptions()); - * - * If you want to have a custom CORS policy for the token server you can provide - * a custom CORS policy, example: - * - * app.UseUmbracoBackOfficeTokenAuth( - * new BackOfficeAuthServerProviderOptions() - * { - * //Modify the CorsPolicy as required - * CorsPolicy = new CorsPolicy() - * { - * AllowAnyHeader = true, - * AllowAnyMethod = true, - * Origins = { "http://mywebsite.com" } - * } - * }); - */ - } - } - - /// - /// The standard way to configure OWIN for Umbraco - /// - /// - /// The startup type is specified in appSettings under owin:appStartup - change it to "StandardUmbracoStartup" to use this class - /// - public class UmbracoStandardOwinStartup2 : UmbracoDefaultOwinStartup - { - public override void Configuration(IAppBuilder app) - { - //ensure the default options are configured - base.Configuration(app); - - // - app.ConfigureBackOfficeGoogleAuth( - "1072120697051-p41pro11srud3o3n90j7m00geq426jqt.apps.googleusercontent.com", - "cs_LJTXh2rtI01C5OIt9WFkt"); - - /* - * Configure external logins for the back office: - * - * Depending on the authentication sources you would like to enable, you will need to install - * certain Nuget packages. - * - * For Google auth: Install-Package UmbracoCms.IdentityExtensions.Google - * For Facebook auth: Install-Package UmbracoCms.IdentityExtensions.Facebook - * For Microsoft auth: Install-Package UmbracoCms.IdentityExtensions.Microsoft - * For Azure ActiveDirectory auth: Install-Package UmbracoCms.IdentityExtensions.AzureActiveDirectory - * - * There are many more providers such as Twitter, Yahoo, ActiveDirectory, etc... most information can - * be found here: http://www.asp.net/web-api/overview/security/external-authentication-services - * - * For sample code on using external providers with the Umbraco back office, install one of the - * packages listed above to review it's code samples - * - */ - - /* - * To configure a simple auth token server for the back office: - * - * By default the CORS policy is to allow all requests - * - * app.UseUmbracoBackOfficeTokenAuth(new BackOfficeAuthServerProviderOptions()); - * - * If you want to have a custom CORS policy for the token server you can provide - * a custom CORS policy, example: - * - * app.UseUmbracoBackOfficeTokenAuth( - * new BackOfficeAuthServerProviderOptions() - * { - * //Modify the CorsPolicy as required - * CorsPolicy = new CorsPolicy() - * { - * AllowAnyHeader = true, - * AllowAnyMethod = true, - * Origins = { "http://mywebsite.com" } - * } - * }); - */ - - } - } - - public static class UmbracoGoogleAuthExtensions - { - /// - /// Configure google sign-in - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// Nuget installation: - /// Microsoft.Owin.Security.Google - /// - /// Google account documentation for ASP.Net Identity can be found: - /// - /// http://www.asp.net/web-api/overview/security/external-authentication-services#GOOGLE - /// - /// Google apps can be created here: - /// - /// https://developers.google.com/accounts/docs/OpenIDConnect#getcredentials - /// - /// - public static void ConfigureBackOfficeGoogleAuth(this IAppBuilder app, string clientId, string clientSecret, - string caption = "Google", string style = "btn-google-plus", string icon = "fa-google-plus") - { - var googleOptions = new GoogleOAuth2AuthenticationOptions() - { - ClientId = clientId, - ClientSecret = clientSecret, - //In order to allow using different google providers on the front-end vs the back office, - // these settings are very important to make them distinguished from one another. - SignInAsAuthenticationType = global::Umbraco.Core.Constants.Security.BackOfficeExternalAuthenticationType, - // By default this is '/signin-google', you will need to change that default value in your - // Google developer settings for your web-app in the "REDIRECT URIS" setting - CallbackPath = new PathString("/umbraco-google-signin") - }; - - googleOptions.SetExternalSignInAutoLinkOptions( - new ExternalSignInAutoLinkOptions( - autoLinkExternalAccount: true)); - - googleOptions.ForUmbracoBackOffice(style, icon); - googleOptions.Caption = caption; - app.UseGoogleAuthentication(googleOptions); - } - - /// - /// Configure ActiveDirectory sign-in - /// - /// - /// - /// - /// - /// The URL that will be redirected to after login is successful, example: http://mydomain.com/umbraco/; - /// - /// - /// - /// This is the "Issuer Id" for you Azure AD application. This a GUID value and can be found - /// in the Azure portal when viewing your configured application and clicking on 'View endpoints' - /// which will list all of the API endpoints. Each endpoint will contain a GUID value, this is - /// the Issuer Id which must be used for this value. - /// - /// If this value is not set correctly then accounts won't be able to be detected - /// for un-linking in the back office. - /// - /// - /// - /// - /// - /// - /// ActiveDirectory account documentation for ASP.Net Identity can be found: - /// https://github.com/AzureADSamples/WebApp-WebAPI-OpenIDConnect-DotNet - /// - public static void ConfigureBackOfficeAzureActiveDirectoryAuth(this IAppBuilder app, - string tenant, string clientId, string postLoginRedirectUri, Guid issuerId, - string caption = "Active Directory", string style = "btn-microsoft", string icon = "fa-windows") - { - var authority = string.Format( - CultureInfo.InvariantCulture, - "https://login.windows.net/{0}", - tenant); - - var adOptions = new OpenIdConnectAuthenticationOptions - { - SignInAsAuthenticationType = global::Umbraco.Core.Constants.Security.BackOfficeExternalAuthenticationType, - ClientId = clientId, - Authority = authority, - Notifications = new OpenIdConnectAuthenticationNotifications - { - RedirectToIdentityProvider = notification => - { - return Task.FromResult(0); - } - } - }; - - adOptions.SetExternalSignInAutoLinkOptions(new ExternalSignInAutoLinkOptions()); - - adOptions.ForUmbracoBackOffice(style, icon); - adOptions.Caption = caption; - //Need to set the auth tyep as the issuer path - adOptions.AuthenticationType = string.Format( - CultureInfo.InvariantCulture, - "https://sts.windows.net/{0}/", - issuerId); - app.UseOpenIdConnectAuthentication(adOptions); - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7065998b78..39258f6b1a 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -127,21 +127,21 @@ False ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll - - ..\packages\Examine.0.1.67.0\lib\Examine.dll + + ..\packages\Examine.0.1.68.0\lib\Examine.dll True False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - False - ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll + + ..\packages\ImageProcessor.2.2.8.0\lib\net45\ImageProcessor.dll + True - - False - ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll + + ..\packages\ImageProcessor.Web.4.3.6.0\lib\net45\ImageProcessor.Web.dll + True False diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml index 09d04219f2..f5dfc6459c 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml @@ -14,7 +14,7 @@ } } - @Model.value.caption + @Model.value.altText if (Model.value.caption != null) { diff --git a/src/Umbraco.Web.UI/config/log4net.config b/src/Umbraco.Web.UI/config/log4net.config index aa96f5a26a..497fd4471f 100644 --- a/src/Umbraco.Web.UI/config/log4net.config +++ b/src/Umbraco.Web.UI/config/log4net.config @@ -2,7 +2,7 @@ - + diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config index ec2217b470..3b0681b009 100644 --- a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config +++ b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config @@ -10,6 +10,12 @@ 1 + codemirror + images/editor/code.gif + codemirror + 1 + + removeformat images/editor/removeformat.gif removeformat @@ -199,6 +205,7 @@ + code codemirror paste umbracolink diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index e078f0ec34..efab0db7da 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -4,9 +4,9 @@ - - - + + + diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Web.config b/src/Umbraco.Web.UI/umbraco/Install/Views/Web.config index cc896163c6..d7f2ec9848 100644 --- a/src/Umbraco.Web.UI/umbraco/Install/Views/Web.config +++ b/src/Umbraco.Web.UI/umbraco/Install/Views/Web.config @@ -1,4 +1,4 @@ - + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 41e8760eea..cfcfca042a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -8,7 +8,7 @@ Tilføj domæne Revisions spor Gennemse elementer - Skift dokumenttype + Skift dokumenttype Kopier Opret Opret pakke @@ -26,8 +26,10 @@ Notificeringer Offentlig adgang Udgiv + Fortryd udgivelse Genindlæs elementer Genudgiv hele siten + Gendan Rettigheder Fortryd ændringer Send til udgivelse @@ -36,22 +38,29 @@ Send til udgivelse Oversæt Opdatér + Standard værdi + Tilladelse nægtet. Tilføj nyt domæne + fjern + Ugyldig node. + Ugyldigt domæne-format. + Domæne er allerede blevet tildelt. + Sprog Domæne Domænet '%0%' er nu oprettet og tilknyttet siden Domænet '%0%' er nu slettet Domænet '%0%' er oprettet - f.eks. ditdomaene.com, www.ditdomaene.com Domænet '%0%' er nu opdateret eller rediger nuværende domæner + f.eks. ditdomaene.com, www.ditdomaene.com For - Vælg + Vælg Vælg nuværende mappe Gør noget andet Fed @@ -71,12 +80,12 @@ Indsæt makro Indsæt billede Redigér relationer + Tilbage til listen Gem Gem og udgiv Gem og send til udgivelse - Vælg - Flere muligheder... Se siden + Preview er deaktiveret fordi der ikke er nogen skabelon tildelt Vælg formattering Vis koder Indsæt tabel @@ -102,7 +111,7 @@ Kun andre dokumenttyper, der er gyldige på denne placering, vises. - Udgivet + Udgivet Om siden Alias (hvordan ville du f.eks. beskrive billedet via telefonen?) @@ -119,9 +128,9 @@ Dette punkt er ændret siden udgivelsen Dette punkt er endnu ikke udgivet Sidst udgivet - Der er ingen elementer at vise på listen. + Der er ingen elementer at vise på listen. Medietype - Link til medie(r) + Link til medie(r) Medlemsgruppe Rolle Medlemstype @@ -129,24 +138,24 @@ Sidetitel Egenskaber Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet! - Upd: dette dokument er udgiver, men er ikke i cachen (intern fejl) + Upd: dette dokument er udgiver, men er ikke i cachen (intern fejl) Udgivet Udgivelsesstatus Udgivelsesdato - Dato for Fortryd udgivelse + Dato for Fortryd udgivelse Fjern dato Sorteringrækkefølgen er opdateret For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger. Statistik Titel (valgfri) - Alternativ tekst (valgfri) + Alternativ tekst (valgfri) Type Fortryd udgivelse Sidst redigeret Tidspunkt for seneste redigering Fjern fil Link til dokument - Medlem af grupper(ne) + Medlem af grupper(ne) Ikke medlem af grupper(ne) Undersider Åben i vindue @@ -155,6 +164,10 @@ Klik for at uploade Slip filerne her... + + Opret et nyt medlem + Alle medlemmer + Hvor ønsker du at oprette den nye %0% Opret under @@ -346,7 +359,7 @@ Log ud Makro Flyt - Mere + Mere Navn Ny Næste @@ -366,7 +379,7 @@ Mangler Omdøb Forny - Påkrævet + Påkrævet Prøv igen Rettigheder Søg @@ -407,6 +420,9 @@ Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen. Din database er blevet fundet og identificeret som Database konfiguration + installér knappen for at installere Umbraco %0% databasen + ]]> installér knappen for at installere Umbraco %0% databasen]]> Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

    @@ -669,6 +685,14 @@ Mange hilsner fra Umbraco robotten Oversættelse Brugere Hjælp + Formularer + Analytics + + + gå til + Hjælpeemner for + Videokapitler for + De bedste Umbraco video tutorials Standardskabelon @@ -678,6 +702,7 @@ Mange hilsner fra Umbraco robotten Nodetype Type Stylesheet + Script Stylesheetegenskab Faneblad Titel på faneblad @@ -691,6 +716,8 @@ Mange hilsner fra Umbraco robotten
    Luk ikke dette vindue imens]]>     + Annulleret + Handlingen blev annulleret af et 3. part tilføjelsesprogram Udgivelsen blev standset af et 3. parts modul Property type eksisterer allerede Egenskabstype oprettet @@ -712,7 +739,7 @@ Mange hilsner fra Umbraco robotten Husk at publicere for at gøre det synligt for besøgende Send til Godkendelse Rettelser er blevet sendt til godkendelse - Medie gemt + Medie gemt Medie gemt uden problemer Medlem gemt Stylesheetegenskab gemt @@ -720,6 +747,7 @@ Mange hilsner fra Umbraco robotten Template gemt Der er opstået en fejl under redigering Bruger gemt + Brugertype gemt Fil ikke gemt Filen kunne ikke gemmes. Tjek filrettighederne Fil gemt @@ -738,6 +766,11 @@ Mange hilsner fra Umbraco robotten XSLT kunne ikke gemmes, check filrettigheder XSLT gemt Der var ingen fejl i din XSLT! + Indhold fjernet fra udgivelse + Partial view gemt + Partial view gemt uden fejl! + Partial view ikke gemt + Der opstod en fejl ved at gemme filen. Bruger CSS-syntax f.eks. h1, .redheader, .blueTex @@ -778,6 +811,7 @@ Mange hilsner fra Umbraco robotten Rekursivt Fjern paragraf-tags Fjerner eventuelle &lt;P&gt; omkring teksten + Standard felter Uppercase URL encode Hvis indholdet af felterne skal sendes til en url, skal denne slåes til så specialtegn formateres @@ -832,7 +866,7 @@ Mange hilsner fra Umbraco robotten Medlemstype Dokumenttyper Pakker - Pakker + Pakker Python Installer fra "repository" Installer Runway @@ -842,6 +876,7 @@ Mange hilsner fra Umbraco robotten Stylesheets Skabeloner XSLT-filer + Analytics Ny opdatering er klar @@ -868,11 +903,12 @@ Mange hilsner fra Umbraco robotten Moduler Deaktivér adgang til Umbraco Adgangskode + Nulstil kodeord Dit kodeord er blevet ændret! Bekræft venligst dit nye kodeord Indtast dit nye kodeord - Nuværende kodeord - ugyldig nuværende kodeord + Nuværende kodeord + ugyldig nuværende kodeord Dit nye kodeord må ikke være tomt! Dit nye kodeord og dit bekræftede kodeord var ikke ens, forsøg venligst igen! Det bekræftede kodeord matcher ikke det nye kodeord @@ -882,10 +918,11 @@ Mange hilsner fra Umbraco robotten Søg alle 'børn' Start node Navn - Bruger tilladelser + Brugertilladelser Brugertype - Bruger typer + Brugertyper Forfatter + Oversætter Din profil Din historik Session udløber diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index ca44fe7afa..79fad32639 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -169,6 +169,10 @@ Click to upload Drop your files here... + + Create a new member + All Members + Where do you want to create the new %0% Create an item under @@ -748,6 +752,12 @@ To manage your website, simply open the Umbraco back office and start adding con Forms Analytics + + go to + Help topics for + Video chapters for + The best Umbraco video tutorials + Default template Dictionary Key @@ -774,11 +784,11 @@ To manage your website, simply open the Umbraco back office and start adding con
    Do not close this window during sorting]]>     - Failed - Insufficient user permissions, could not complete the operation - Cancelled - Operation was cancelled by a 3rd party add-in - Publishing was cancelled by a 3rd party add-in + Failed + Insufficient user permissions, could not complete the operation + Cancelled + Operation was cancelled by a 3rd party add-in + Publishing was cancelled by a 3rd party add-in Property type already exists Property type created DataType: %1%]]> @@ -831,6 +841,11 @@ To manage your website, simply open the Umbraco back office and start adding con Partial view saved without any errors! Partial view not saved An error occurred saving the file. + Script view saved + Script view saved without any errors! + Script view not saved + An error occurred saving the file. + An error occurred saving the file. Uses CSS syntax ex: h1, .redHeader, .blueTex diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index c779e2b789..4da1607c4b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -169,6 +169,10 @@ Click to upload Drop your files here... + + Create a new member + All Members + Where do you want to create the new %0% Create an item under @@ -749,6 +753,12 @@ To manage your website, simply open the Umbraco back office and start adding con Forms Analytics + + go to + Help topics for + Video chapters for + The best Umbraco video tutorials + Default template Dictionary Key @@ -832,6 +842,11 @@ To manage your website, simply open the Umbraco back office and start adding con Partial view saved without any errors! Partial view not saved An error occurred saving the file. + Script view saved + Script view saved without any errors! + Script view not saved + An error occurred saving the file. + An error occurred saving the file. Uses CSS syntax ex: h1, .redHeader, .blueTex diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index 237f0cc4b3..db3fb72574 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -52,11 +52,11 @@ ドメイン '%0%' は既に割り当てられています ドメイン '%0%' は更新されました ドメインの編集 - + Inherit カルチャの割り当て - ドメインの割り当て + ドメイン割り当て これらを表示 @@ -165,6 +165,10 @@ クリックしてアップロードする ファイルをここへドロップ.. + + + メンバーの新規作成 + 全てのメンバー どこに新しい %0% を作りますか @@ -674,13 +678,19 @@ Runwayをインストールして作られた新しいウェブサイトがど 単一のログインとパスワードで単純に保護したい場合に適します - + - + + - + 非公開の子ページも含めます @@ -693,12 +703,20 @@ Runwayをインストールして作られた新しいウェブサイトがど このページとその全ての子ページも公開したければ 全ての子ページを公開 をチェック。 ]]>     + + 設定済みの色はありません。 + 外部リンクを追加 内部リンクを追加 追加 タイトル + キャプション表示を入力 + 内部リンクを選択 + 外部リンクを入力 + リンクを入力 内部ページ + リンク URL 下に移動 上に移動 @@ -737,6 +755,12 @@ Runwayをインストールして作られた新しいウェブサイトがど フォーム アナリティクス + + 該当のヘルプへ + ヘルプトピック： + ヘルプの動画： + 動画によるチュートリアル + 既定のテンプレート ディクショナリのキー @@ -763,6 +787,10 @@ Runwayをインストールして作られた新しいウェブサイトがど
    並び替え中はウィンドウを閉じないでください。]]>     + 失敗しました + 不十分なユーザー権限により操作を完了できませんでした + キャンセルされました + サードパーティのアドインにより操作はキャンセルされました サードパーティのアドインにより公開はキャンセルされました プロパティの方は既に存在しています プロパティの型を作成しました diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index df1273ae99..d5bfbaffb1 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -437,6 +437,12 @@ Страница + + перейти к + Разделы справки для + Обучающие видео для + Лучшие обучающие видеокурсы по Umbraco + Сбросить @@ -588,6 +594,10 @@ Нажмите, чтобы загрузить Перетащите файлы сюда... + + Создать нового участника + Все участники + Выберите страницу... Узел %0% был скопирован в %1% diff --git a/src/Umbraco.Web.UI/umbraco/endPreview.aspx b/src/Umbraco.Web.UI/umbraco/endPreview.aspx index a56af97ff5..05fc2ddd25 100644 --- a/src/Umbraco.Web.UI/umbraco/endPreview.aspx +++ b/src/Umbraco.Web.UI/umbraco/endPreview.aspx @@ -5,9 +5,7 @@ protected override void OnLoad(EventArgs e) { base.OnLoad(e); - global::umbraco.presentation.preview.PreviewContent.ClearPreviewCookie(); - if (!Uri.IsWellFormedUriString(Request.QueryString["redir"], UriKind.Relative)) { Response.Redirect("/", true); @@ -17,7 +15,10 @@ { Response.Redirect("/", true); } - + if (Request.QueryString["redir"].StartsWith("//")) + { + Response.Redirect("/", true); + } Response.Redirect(url.ToString(), true); } diff --git a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx b/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx index e68922bd98..be0d68d3ba 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx @@ -1,6 +1,7 @@ <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="editScript.aspx.cs" Inherits="umbraco.cms.presentation.settings.scripts.editScript" ValidateRequest="False" %> +<%@ Import Namespace="Umbraco.Core" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> @@ -21,13 +22,10 @@ nameTxtBox: $('#<%= NameTxt.ClientID %>'), originalFileName: '<%= NameTxt.Text %>', saveButton: $("#<%= ((Control)SaveButton).ClientID %>"), + restServiceLocation: "<%= Url.GetSaveFileServicePath() %>", editorSourceElement: $('#<%= editorSource.ClientID %>'), - text: { - fileErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorHeader")) %>', - fileSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileSavedHeader")) %>', - fileSavedText: '', - fileErrorText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorText")) %>', - } + treeSyncPath: "<%= ScriptTreeSyncPath %>", + lttPathElement: $('#<%= lttPath.ClientID %>') }); editor.init(); diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx index 55b243c94c..2f40b04ae0 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx @@ -1,5 +1,6 @@ <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="editstylesheet.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Settings.Stylesheet.EditStyleSheet" ValidateRequest="False" %> +<%@ Import Namespace="Umbraco.Core" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> @@ -13,16 +14,12 @@ $(document).ready(function () { var editor = new Umbraco.Editors.EditStyleSheet({ nameTxtBox: $('#<%= NameTxt.ClientID %>'), - originalFileName: '<%= NameTxt.Text.Replace("\\", "\\\\") %>', - cssId: '<%= Request.QueryString["id"] %>', + originalFileName: '<%= NameTxt.Text %>', saveButton: $("#<%= ((Control)SaveButton).ClientID %>"), editorSourceElement: $('#<%= editorSource.ClientID %>'), - text: { - cssErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssErrorHeader")) %>', - cssSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedHeader")) %>', - cssSavedText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedText")) %>', - cssErrorText: 'Please make sure that you have permissions set correctly', - } + restServiceLocation: "<%= Url.GetSaveFileServicePath() %>", + treeSyncPath: "<%= TreeSyncPath %>", + lttPathElement: $('#<%= lttPath.ClientID %>') }); editor.init(); diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx index ba464262d0..ca68fc4b2c 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx @@ -66,6 +66,7 @@ + diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs index e4d0692385..a72e03b57e 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs @@ -114,28 +114,23 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views NameTxt.Text = _template.GetRawText(); AliasTxt.Text = _template.Alias; editorSource.Text = _template.Design; - + PathPrefix.Visible = false; } else { //configure editor for editing a file.... NameTxt.Text = OriginalFileName; - var file = IOHelper.MapPath(SystemDirectories.MvcViews.EnsureEndsWith('/') + OriginalFileName); + var svce = ApplicationContext.Current.Services.FileService; + var file = EditorType == ViewEditorType.PartialView + ? svce.GetPartialView(OriginalFileName) + : svce.GetPartialViewMacro(OriginalFileName); + editorSource.Text = file.Content; - // validate file path - if (file.StartsWith(IOHelper.MapPath(SystemDirectories.MvcViews.EnsureEndsWith('/')))) { - - using (var sr = File.OpenText(file)) - { - var s = sr.ReadToEnd(); - editorSource.Text = s; - } - } else - { - throw new ArgumentException("Couldn't open file - illegal path"); - } - + const string prefixFormat = "{0}"; + PathPrefix.Text = string.Format(prefixFormat, EditorType == ViewEditorType.PartialView + ? "Partials/" + : "MacroPartials/"); } } diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs index 4f523639a3..dd81da023a 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs @@ -75,6 +75,15 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views { /// protected global::umbraco.uicontrols.PropertyPanel pp_name; + /// + /// PathPrefix control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal PathPrefix; + /// /// NameTxt control. /// diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js index 7c66dc9a1d..c1506b9ffd 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js @@ -30,63 +30,87 @@ doSubmit: function () { var self = this; - var fileName = this._opts.nameTxtBox.val(); - var codeVal = this._opts.editorSourceElement.val(); + var filename = this._opts.nameTxtBox.val(); + var codeval = this._opts.editorSourceElement.val(); //if CodeMirror is not defined, then the code editor is disabled. if (typeof (CodeMirror) != "undefined") { - codeVal = UmbEditor.GetCode(); + codeval = UmbEditor.GetCode(); } - umbraco.presentation.webservices.codeEditorSave.SaveScript( - fileName, self._opts.originalFileName, codeVal, - function (t) { self.submitSucces(t); }, - function (t) { self.submitFailure(t); }); + this.save( + filename, + self._opts.originalFileName, + codeval); }, - submitSucces: function(t) { + save: function (filename, oldName, contents) { + var self = this; - if (t != 'true') { - top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText)); + $.post(self._opts.restServiceLocation + "SaveScript", + JSON.stringify({ + filename: filename, + oldName: oldName, + contents: contents + }), + function (e) { + if (e.success) { + self.submitSuccess(e); + } else { + self.submitFailure(e.message, e.header); + } + }); + }, + + submitSuccess: function (args) { + var msg = args.message; + var header = args.header; + var path = this._opts.treeSyncPath; + var pathChanged = false; + if (args.path) { + if (path != args.path) { + pathChanged = true; + } + path = args.path; + } + if (args.contents) { + UmbEditor.SetCode(args.contents); } - var newFilePath = this._opts.nameTxtBox.val(); - - //if the filename changes, we need to redirect since the file name is used in the url - if (this._opts.originalFileName != newFilePath) { - var newLocation = window.location.pathname + "?" + "&file=" + newFilePath; + UmbClientMgr.mainTree().setActiveTreeType("scripts"); + if (pathChanged) { + // no! file is used in url so we need to redirect + //UmbClientMgr.mainTree().moveNode(this._opts.originalFileName, path); + //this._opts.treeSyncPath = args.path; + //this._opts.lttPathElement.prop("href", args.url).html(args.url); - UmbClientMgr.contentFrame(newLocation); + var qs = window.location.search; + if (qs.startsWith("?")) qs = qs.substring("?".length); + var qp1 = qs.split("&"); + var qp2 = []; + for (var i = 0; i < qp1.length; i++) + if (!qp1[i].startsWith("file=")) + qp2.push(qp1[i]); - //we need to do this after we navigate otherwise the navigation will wait unti lthe message timeout is done! - top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText)); + var location = window.location.pathname + "?" + qp2.join("&") + "&file=" + args.name; + UmbClientMgr.contentFrame(location); + + // need to do it after we navigate otherwise the navigation waits until the message timeout is done + top.UmbSpeechBubble.ShowMessage("save", header, msg); } else { - - top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText)); - UmbClientMgr.mainTree().setActiveTreeType('scripts'); - - //we need to create a list of ids for each folder/file. Each folder/file's id is it's full path so we need to build each one. - var paths = []; - var parts = this._opts.originalFileName.split('/'); - for (var i = 0;i < parts.length;i++) { - if (paths.length > 0) { - paths.push(paths[i - 1] + "/" + parts[i]); - } - else { - paths.push(parts[i]); - } - } - - //we need to pass in the newId parameter so it knows which node to resync after retreival from the server - UmbClientMgr.mainTree().syncTree("-1,init," + paths.join(','), true, null, newFilePath); - //set the original file path to the new one - this._opts.originalFileName = newFilePath; + top.UmbSpeechBubble.ShowMessage("save", header, msg); + this._opts.lttPathElement.prop("href", args.url).html(args.url); + this._opts.originalFileName = args.name; + this._opts.treeSyncPath = args.path; + UmbClientMgr.mainTree().syncTree(path, true); } - + + //this._opts.lttPathElement.prop("href", args.url).html(args.url); + //this._opts.originalFileName = args.name; }, - submitFailure: function(t) { - top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText)); + submitFailure: function(err, header) { + top.UmbSpeechBubble.ShowMessage('error', header, err); } }); })(jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js index 7d0ab93bd8..990ed3edee 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js @@ -30,37 +30,80 @@ doSubmit: function() { var self = this; - var fileName = this._opts.nameTxtBox.val(); - var codeVal = this._opts.editorSourceElement.val(); + var filename = this._opts.nameTxtBox.val(); + var codeval = this._opts.editorSourceElement.val(); //if CodeMirror is not defined, then the code editor is disabled. if (typeof(CodeMirror) != "undefined") { - codeVal = UmbEditor.GetCode(); + codeval = UmbEditor.GetCode(); } - umbraco.presentation.webservices.codeEditorSave.SaveCss( - fileName, self._opts.originalFileName, codeVal, 0, - function (t) { self.submitSucces(t, fileName); }, - function(t) { self.submitFailure(t); }); - + this.save( + filename, + self._opts.originalFileName, + codeval); }, - submitSucces: function (t, fileName) { - if (t != 'true') { - top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText)); + save: function (filename, oldName, contents) { + var self = this; + + $.post(self._opts.restServiceLocation + "SaveStylesheet", + JSON.stringify({ + filename: filename, + oldName: oldName, + contents: contents + }), + function (e) { + if (e.success) { + self.submitSuccess(e); + } else { + self.submitFailure(e.message, e.header); + } + }); + }, + + submitSuccess: function (args) { + var msg = args.message; + var header = args.header; + var path = this._opts.treeSyncPath; + var pathChanged = false; + if (args.path) { + if (path != args.path) { + pathChanged = true; + } + path = args.path; + } + if (args.contents) { + UmbEditor.SetCode(args.contents); + } + + UmbClientMgr.mainTree().setActiveTreeType("stylesheets"); + if (pathChanged) { + // file is used in url so we need to redirect + var qs = window.location.search; + if (qs.startsWith("?")) qs = qs.substring("?".length); + var qp1 = qs.split("&"); + var qp2 = []; + for (var i = 0; i < qp1.length; i++) + if (!qp1[i].startsWith("id=")) + qp2.push(qp1[i]); + + var location = window.location.pathname + "?" + qp2.join("&") + "&id=" + args.name; + UmbClientMgr.contentFrame(location); + + // need to do it after we navigate otherwise the navigation waits until the message timeout is done + top.UmbSpeechBubble.ShowMessage("save", header, msg); } else { - top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.cssSavedHeader), unescape(this._opts.text.cssSavedText)); + top.UmbSpeechBubble.ShowMessage("save", header, msg); + this._opts.lttPathElement.prop("href", args.url).html(args.url); + this._opts.originalFileName = args.name; + this._opts.treeSyncPath = args.path; + UmbClientMgr.mainTree().syncTree(path, true); } - - UmbClientMgr.mainTree().setActiveTreeType('stylesheets'); - UmbClientMgr.mainTree().syncTree("-1,init," + fileName, true); - - //update the originalFileName prop - this._opts.originalFileName = this._opts.nameTxtBox.val(); }, - submitFailure: function(t) { - top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText)); + submitFailure: function(err, header) { + top.UmbSpeechBubble.ShowMessage('error', header, err); } }); })(jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js index 554d0bafc8..28398d081a 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js @@ -8,24 +8,6 @@ //private methods/variables _opts: null, - _updateNewFileProperties: function(filePath) { - /// Updates the current treeSyncPath and original file name to have the new file name - - //update the originalFileName prop - this._opts.originalFileName = filePath; - - //re-create the new path - var subPath = this._opts.treeSyncPath.split(","); - //remove the last element - subPath.pop(); - //add the new element - var parts = filePath.split("/"); - //remove the first bit which will either be "Partials" or "MacroPartials" - parts.shift(); - subPath.push(parts.join("/")); - this._opts.treeSyncPath = subPath.join(); - }, - // Constructor constructor: function (opts) { // Merge options with default @@ -207,8 +189,8 @@ top.UmbSpeechBubble.ShowMessage('save', header, msg); - //then we need to update our current tree sync path to represent the new one - this._updateNewFileProperties(newFilePath); + this._opts.originalFileName = args.name; + this._opts.treeSyncPath = args.path; UmbClientMgr.mainTree().syncTree(path, true, null, newFilePath.split("/")[1]); } diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs index c20f330e13..714b79514d 100644 --- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs +++ b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs @@ -45,22 +45,16 @@ namespace Umbraco.Web private void UmbracoModule_RouteAttempt(object sender, RoutableAttemptEventArgs e) { + // as long as umbraco is ready & configured, sync switch (e.Outcome) { case EnsureRoutableOutcome.IsRoutable: - Sync(); - break; case EnsureRoutableOutcome.NotDocumentRequest: - //so it's not a document request, we'll check if it's a back office request - if (e.HttpContext.Request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath)) - { - //it's a back office request, we should sync! - Sync(); - } + case EnsureRoutableOutcome.NoContent: + Sync(); break; //case EnsureRoutableOutcome.NotReady: //case EnsureRoutableOutcome.NotConfigured: - //case EnsureRoutableOutcome.NoContent: //default: // break; } diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs index 89826d668e..dce512b1dc 100644 --- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs +++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs @@ -30,7 +30,7 @@ namespace Umbraco.Web.Cache /// /// /// - internal static JsonPayload[] DeserializeFromJsonPayload(string json) + public static JsonPayload[] DeserializeFromJsonPayload(string json) { var serializer = new JavaScriptSerializer(); var jsonObject = serializer.Deserialize(json); @@ -99,14 +99,14 @@ namespace Umbraco.Web.Cache #region Sub classes - internal enum OperationType + public enum OperationType { Saved, Trashed, Deleted } - internal class JsonPayload + public class JsonPayload { public string Path { get; set; } public int Id { get; set; } diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs index 3ae00f6970..e86e48a18b 100644 --- a/src/Umbraco.Web/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs @@ -25,6 +25,8 @@ namespace Umbraco.Web.Controllers return CurrentUmbracoPage(); } + TempData["LoginSuccess"] = true; + //if there is a specified path to redirect to then use it if (model.RedirectUrl.IsNullOrWhiteSpace() == false) { @@ -32,7 +34,7 @@ namespace Umbraco.Web.Controllers } //redirect to current page by default - TempData["LoginSuccess"] = true; + return RedirectToCurrentUmbracoPage(); //return RedirectToCurrentUmbracoUrl(); } diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs index 457ed77767..9bb8ae7c9a 100644 --- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs +++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs @@ -8,6 +8,7 @@ using Umbraco.Core; namespace Umbraco.Web.Controllers { + [MemberAuthorize] public class UmbLoginStatusController : SurfaceController { [HttpPost] @@ -23,6 +24,8 @@ namespace Umbraco.Web.Controllers FormsAuthentication.SignOut(); } + TempData["LogoutSuccess"] = true; + //if there is a specified path to redirect to then use it if (model.RedirectUrl.IsNullOrWhiteSpace() == false) { @@ -30,7 +33,7 @@ namespace Umbraco.Web.Controllers } //redirect to current page by default - TempData["LogoutSuccess"] = true; + return RedirectToCurrentUmbracoPage(); } } diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs index a9d2a29513..b45723ed30 100644 --- a/src/Umbraco.Web/Controllers/UmbProfileController.cs +++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs @@ -11,6 +11,7 @@ using Umbraco.Core; namespace Umbraco.Web.Controllers { + [MemberAuthorize] public class UmbProfileController : SurfaceController { [HttpPost] @@ -35,14 +36,15 @@ namespace Umbraco.Web.Controllers return CurrentUmbracoPage(); } + TempData["ProfileUpdateSuccess"] = true; + //if there is a specified path to redirect to then use it if (model.RedirectUrl.IsNullOrWhiteSpace() == false) { return Redirect(model.RedirectUrl); } - //redirect to current page by default - TempData["ProfileUpdateSuccess"] = true; + //redirect to current page by default return RedirectToCurrentUmbracoPage(); } } diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs index 5f0e864cae..f9665f713e 100644 --- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs +++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs @@ -27,13 +27,16 @@ namespace Umbraco.Web.Controllers switch (status) { case MembershipCreateStatus.Success: + + TempData["FormSuccess"] = true; + //if there is a specified path to redirect to then use it if (model.RedirectUrl.IsNullOrWhiteSpace() == false) { return Redirect(model.RedirectUrl); } //redirect to current page by default - TempData["FormSuccess"] = true; + return RedirectToCurrentUmbracoPage(); case MembershipCreateStatus.InvalidUserName: ModelState.AddModelError((model.UsernameIsEmail || model.Username == null) diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 96ccf10e71..689f859462 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -59,7 +59,7 @@ namespace Umbraco.Web.Editors protected IAuthenticationManager AuthenticationManager { get { return OwinContext.Authentication; } - } + } /// /// Render the default view @@ -98,7 +98,7 @@ namespace Umbraco.Web.Editors var cultureInfo = string.IsNullOrWhiteSpace(culture) //if the user is logged in, get their culture, otherwise default to 'en' ? Security.IsAuthenticated() - ? Security.CurrentUser.GetUserCulture(Services.TextService) + ? Security.CurrentUser.GetUserCulture(Services.TextService) : CultureInfo.GetCultureInfo("en") : CultureInfo.GetCultureInfo(culture); @@ -125,10 +125,10 @@ namespace Umbraco.Web.Editors //get the legacy ActionJs file references to append as well var legacyActionJsRef = new JArray(GetLegacyActionJs(LegacyJsActionType.JsUrl)); - + var result = initJs.GetJavascriptInitialization(HttpContext, JsInitialization.GetDefaultInitialization(), legacyActionJsRef); result += initCss.GetStylesheetInitialization(HttpContext); - + return JavaScript(result); } @@ -156,13 +156,13 @@ namespace Umbraco.Web.Editors var result = HttpContext.IsDebuggingEnabled ? getResult() : ApplicationContext.ApplicationCache.RuntimeCache.GetCacheItem( - typeof (BackOfficeController) + "GetManifestAssetList", + typeof(BackOfficeController) + "GetManifestAssetList", () => getResult(), new TimeSpan(0, 10, 0)); return new JsonNetResult { Data = result, Formatting = Formatting.Indented }; } - + [UmbracoAuthorize(Order = 0)] [HttpGet] public JsonNetResult GetGridConfig() @@ -182,18 +182,23 @@ namespace Umbraco.Web.Editors /// /// [UmbracoAuthorize(Order = 0)] - [MinifyJavaScriptResult(Order = 1)] + [MinifyJavaScriptResult(Order = 1)] public JavaScriptResult ServerVariables() { Func getResult = () => - { + { var defaultVals = new Dictionary { { "umbracoUrls", new Dictionary { - {"externalLoginsUrl", Url.Action("ExternalLogin", "BackOffice")}, - {"externalLinkLoginsUrl", Url.Action("LinkLogin", "BackOffice")}, + //TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS + // to prepend their URL. We could then also use this in our own resources instead of + // having each url defined here explicitly - we can do that in v8! for now + // for umbraco services we'll stick to explicitly defining the endpoints. + + {"externalLoginsUrl", Url.Action("ExternalLogin", "BackOffice")}, + {"externalLinkLoginsUrl", Url.Action("LinkLogin", "BackOffice")}, {"legacyTreeJs", Url.Action("LegacyTreeJs", "BackOffice")}, {"manifestAssetList", Url.Action("GetManifestAssetList", "BackOffice")}, {"gridConfig", Url.Action("GetGridConfig", "BackOffice")}, @@ -276,10 +281,10 @@ namespace Umbraco.Web.Editors controller => controller.Fetch(string.Empty)) }, { - "relationApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( - controller => controller.GetById(0)) - }, - { + "relationApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( + controller => controller.GetById(0)) + }, + { "rteApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( controller => controller.GetConfiguration()) }, @@ -345,25 +350,25 @@ namespace Umbraco.Web.Editors } }, {"isDebuggingEnabled", HttpContext.IsDebuggingEnabled}, - { - "application", GetApplicationState() - }, - { - "externalLogins", new Dictionary { + "application", GetApplicationState() + }, + { + "externalLogins", new Dictionary { - "providers", HttpContext.GetOwinContext().Authentication.GetExternalAuthenticationTypes() - .Where(p => p.Properties.ContainsKey("UmbracoBackOffice")) - .Select(p => new - { - authType = p.AuthenticationType, caption = p.Caption, - //TODO: Need to see if this exposes any sensitive data! - properties = p.Properties - }) - .ToArray() + { + "providers", HttpContext.GetOwinContext().Authentication.GetExternalAuthenticationTypes() + .Where(p => p.Properties.ContainsKey("UmbracoBackOffice")) + .Select(p => new + { + authType = p.AuthenticationType, caption = p.Caption, + //TODO: Need to see if this exposes any sensitive data! + properties = p.Properties + }) + .ToArray() + } } } - } }; //Parse the variables to a string @@ -380,7 +385,7 @@ namespace Umbraco.Web.Editors return JavaScript(result); } - + [HttpPost] public ActionResult ExternalLogin(string provider, string redirectUrl = null) { @@ -403,7 +408,7 @@ namespace Umbraco.Web.Editors User.Identity.GetUserId()); } - + [HttpGet] public async Task ExternalLinkLoginCallback() @@ -411,7 +416,7 @@ namespace Umbraco.Web.Editors var loginInfo = await AuthenticationManager.GetExternalLoginInfoAsync( Constants.Security.BackOfficeExternalAuthenticationType, XsrfKey, User.Identity.GetUserId()); - + if (loginInfo == null) { //Add error and redirect for it to be displayed @@ -484,13 +489,13 @@ namespace Umbraco.Web.Editors { if (await AutoLinkAndSignInExternalAccount(loginInfo) == false) { - ViewBag.ExternalSignInError = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to to an account" }; + ViewBag.ExternalSignInError = new[] { "The requested provider (" + loginInfo.Login.LoginProvider + ") has not been linked to to an account" }; } //Remove the cookie otherwise this message will keep appearing if (Response.Cookies[Constants.Security.BackOfficeExternalCookieName] != null) { - Response.Cookies[Constants.Security.BackOfficeExternalCookieName].Expires = DateTime.MinValue; + Response.Cookies[Constants.Security.BackOfficeExternalCookieName].Expires = DateTime.MinValue; } } @@ -540,7 +545,7 @@ namespace Umbraco.Web.Editors } else { - + var autoLinkUser = new BackOfficeIdentityUser() { Email = loginInfo.Email, @@ -594,7 +599,7 @@ namespace Umbraco.Web.Editors return false; } - + /// /// Returns the server variables regarding the application state /// @@ -617,17 +622,18 @@ namespace Umbraco.Web.Editors app.Add("applicationPath", HttpContext.Request.ApplicationPath.EnsureEndsWith('/')); return app; } - + private IEnumerable> GetTreePluginsMetaData() { var treeTypes = PluginManager.Current.ResolveAttributedTreeControllers(); //get all plugin trees with their attributes var treesWithAttributes = treeTypes.Select(x => new - { - tree = x, attributes = + { + tree = x, + attributes = x.GetCustomAttributes(false) - }).ToArray(); - + }).ToArray(); + var pluginTreesWithAttributes = treesWithAttributes //don't resolve any tree decorated with CoreTreeAttribute .Where(x => x.attributes.All(a => (a is CoreTreeAttribute) == false)) diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 573439f4e4..f8a75a23d1 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -270,6 +270,7 @@ namespace Umbraco.Web.Editors { //publish the item and check if it worked, if not we will show a diff msg below publishStatus = Services.ContentService.SaveAndPublishWithStatus(contentItem.PersistedContent, Security.CurrentUser.Id); + wasCancelled = publishStatus.Result.StatusType == PublishStatusType.FailedCancelledByEvent; } //return the updated model @@ -315,6 +316,14 @@ namespace Umbraco.Web.Editors UpdatePreviewContext(contentItem.PersistedContent.Id); + //If the item is new and the operation was cancelled, we need to return a different + // status code so the UI can handle it since it won't be able to redirect since there + // is no Id to redirect to! + if (wasCancelled && IsCreatingAction(contentItem.Action)) + { + throw new HttpResponseException(Request.CreateValidationErrorResponse(display)); + } + return display; } diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 12a35e3b20..e03f55a785 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -285,6 +285,14 @@ namespace Umbraco.Web.Editors else { AddCancelMessage(display); + + //If the item is new and the operation was cancelled, we need to return a different + // status code so the UI can handle it since it won't be able to redirect since there + // is no Id to redirect to! + if (saveStatus.Result.StatusType == OperationStatusType.FailedCancelledByEvent && IsCreatingAction(contentItem.Action)) + { + throw new HttpResponseException(Request.CreateValidationErrorResponse(display)); + } } break; diff --git a/src/Umbraco.Web/ImageCropperBaseExtensions.cs b/src/Umbraco.Web/ImageCropperBaseExtensions.cs index cceac8ab31..b870335c91 100644 --- a/src/Umbraco.Web/ImageCropperBaseExtensions.cs +++ b/src/Umbraco.Web/ImageCropperBaseExtensions.cs @@ -81,6 +81,7 @@ { return null; } + if ((preferFocalPoint && cropDataSet.HasFocalPoint()) || (crop != null && crop.Coordinates == null && cropDataSet.HasFocalPoint()) || (string.IsNullOrEmpty(cropAlias) && cropDataSet.HasFocalPoint())) { cropUrl.Append("?center=" + cropDataSet.FocalPoint.Top.ToString(CultureInfo.InvariantCulture) + "," + cropDataSet.FocalPoint.Left.ToString(CultureInfo.InvariantCulture)); @@ -100,6 +101,7 @@ cropUrl.Append("?anchor=center"); cropUrl.Append("&mode=crop"); } + return cropUrl.ToString(); } } diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs index de0f8a225e..a76b39f187 100644 --- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs +++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs @@ -110,9 +110,8 @@ bool useCropDimensions = false, bool cacheBuster = true, string furtherOptions = null, - ImageCropRatioMode? ratioMode = null, - bool upScale = true - ) + ImageCropRatioMode? ratioMode = null, + bool upScale = true) { string imageCropperValue = null; @@ -153,6 +152,12 @@ /// /// The height of the output image. /// + /// + /// The Json data from the Umbraco Core Image Cropper property editor + /// + /// + /// The crop alias. + /// /// /// Quality percentage of the output image. /// @@ -162,17 +167,11 @@ /// /// The image crop anchor. /// - /// - /// The Json data from the Umbraco Core Image Cropper property editor - /// - /// - /// The crop alias. - /// /// /// Use focal point to generate an output image using the focal point instead of the predefined crop if there is one /// /// - /// Use crop dimensions to have the output image sized according to the predefined crop sizes, this will override the width and height parameters>. + /// 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 @@ -182,10 +181,10 @@ /// /// /// Use a dimension as a ratio - /// + /// /// /// If the image should be upscaled to requested dimensions - /// + /// /// /// The . /// @@ -203,12 +202,11 @@ string cacheBusterValue = null, string furtherOptions = null, ImageCropRatioMode? ratioMode = null, - bool upScale = true - ) + bool upScale = true) { if (string.IsNullOrEmpty(imageUrl) == false) { - var imageResizerUrl = new StringBuilder(); + var imageProcessorUrl = new StringBuilder(); if (string.IsNullOrEmpty(imageCropperValue) == false && imageCropperValue.DetectIsJson() && (imageCropMode == ImageCropMode.Crop || imageCropMode == null)) { @@ -217,95 +215,111 @@ { var crop = cropDataSet.GetCrop(cropAlias); - imageResizerUrl.Append(cropDataSet.Src); + imageProcessorUrl.Append(cropDataSet.Src); var cropBaseUrl = cropDataSet.GetCropBaseUrl(cropAlias, preferFocalPoint); if (cropBaseUrl != null) { - imageResizerUrl.Append(cropBaseUrl); + imageProcessorUrl.Append(cropBaseUrl); } else { return null; } - if (crop!= null & useCropDimensions) + if (crop != null & useCropDimensions) { width = crop.Width; height = crop.Height; } + + // If a predefined crop has been specified & there are no coordinates & no ratio mode, but a width parameter has been passed we can get the crop ratio for the height + if (crop != null && string.IsNullOrEmpty(cropAlias) == false && crop.Coordinates == null && ratioMode == null && width != null && height == null) + { + var heightRatio = (decimal)crop.Height / (decimal)crop.Width; + imageProcessorUrl.Append("&heightratio=" + heightRatio.ToString(CultureInfo.InvariantCulture)); + } + + // If a predefined crop has been specified & there are no coordinates & no ratio mode, but a height parameter has been passed we can get the crop ratio for the width + if (crop != null && string.IsNullOrEmpty(cropAlias) == false && crop.Coordinates == null && ratioMode == null && width == null && height != null) + { + var widthRatio = (decimal)crop.Width / (decimal)crop.Height; + imageProcessorUrl.Append("&widthratio=" + widthRatio.ToString(CultureInfo.InvariantCulture)); + } } } else { - imageResizerUrl.Append(imageUrl); + imageProcessorUrl.Append(imageUrl); if (imageCropMode == null) { imageCropMode = ImageCropMode.Pad; } - imageResizerUrl.Append("?mode=" + imageCropMode.ToString().ToLower()); + imageProcessorUrl.Append("?mode=" + imageCropMode.ToString().ToLower()); if (imageCropAnchor != null) { - imageResizerUrl.Append("&anchor=" + imageCropAnchor.ToString().ToLower()); + imageProcessorUrl.Append("&anchor=" + imageCropAnchor.ToString().ToLower()); } } if (quality != null) { - imageResizerUrl.Append("&quality=" + quality); + imageProcessorUrl.Append("&quality=" + quality); } if (width != null && ratioMode != ImageCropRatioMode.Width) { - imageResizerUrl.Append("&width=" + width); + imageProcessorUrl.Append("&width=" + width); } if (height != null && ratioMode != ImageCropRatioMode.Height) { - imageResizerUrl.Append("&height=" + height); + imageProcessorUrl.Append("&height=" + height); } if (ratioMode == ImageCropRatioMode.Width && height != null) { - //if only height specified then assume a sqaure + // if only height specified then assume a sqaure if (width == null) { width = height; } - var widthRatio = (decimal)width/(decimal)height; - imageResizerUrl.Append("&widthratio=" + widthRatio.ToString(CultureInfo.InvariantCulture)); + + var widthRatio = (decimal)width / (decimal)height; + imageProcessorUrl.Append("&widthratio=" + widthRatio.ToString(CultureInfo.InvariantCulture)); } if (ratioMode == ImageCropRatioMode.Height && width != null) { - //if only width specified then assume a sqaure + // if only width specified then assume a sqaure if (height == null) { height = width; } - var heightRatio = (decimal)height/(decimal)width; - imageResizerUrl.Append("&heightratio=" + heightRatio.ToString(CultureInfo.InvariantCulture)); + + var heightRatio = (decimal)height / (decimal)width; + imageProcessorUrl.Append("&heightratio=" + heightRatio.ToString(CultureInfo.InvariantCulture)); } if (upScale == false) { - imageResizerUrl.Append("&upscale=false"); + imageProcessorUrl.Append("&upscale=false"); } if (furtherOptions != null) { - imageResizerUrl.Append(furtherOptions); + imageProcessorUrl.Append(furtherOptions); } if (cacheBusterValue != null) { - imageResizerUrl.Append("&rnd=").Append(cacheBusterValue); + imageProcessorUrl.Append("&rnd=").Append(cacheBusterValue); } - return imageResizerUrl.ToString(); + return imageProcessorUrl.ToString(); } return string.Empty; diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index c882a83cd8..59e073dc8c 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -46,6 +46,7 @@ namespace Umbraco.Web.Install new UpgradeStep(), new FilePermissionsStep(), new MajorVersion7UpgradeReport(_umbContext.Application), + new Version73FileCleanup(_umbContext.HttpContext, _umbContext.Application.ProfilingLogger.Logger), new DatabaseConfigureStep(_umbContext.Application), new DatabaseInstallStep(_umbContext.Application), new DatabaseUpgradeStep(_umbContext.Application), diff --git a/src/Umbraco.Web/Install/InstallSteps/Version73FileCleanup.cs b/src/Umbraco.Web/Install/InstallSteps/Version73FileCleanup.cs new file mode 100644 index 0000000000..f15463dc5f --- /dev/null +++ b/src/Umbraco.Web/Install/InstallSteps/Version73FileCleanup.cs @@ -0,0 +1,90 @@ +using System; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading; +using System.Web; +using Umbraco.Core.Configuration; +using Umbraco.Core.Logging; +using Umbraco.Web.Install.Models; + +namespace Umbraco.Web.Install.InstallSteps +{ + [InstallSetupStep(InstallationType.Upgrade, + "Version73FileCleanup", 2, + "Performing some housecleaning...", + PerformsAppRestart = true)] + internal class Version73FileCleanup : InstallSetupStep + { + private readonly HttpContextBase _httpContext; + private readonly ILogger _logger; + + public Version73FileCleanup(HttpContextBase httpContext, ILogger logger) + { + _httpContext = httpContext; + _logger = logger; + } + + /// + /// The step execution method + /// + /// + /// + public override InstallSetupResult Execute(object model) + { + //first cleanup all web.configs + + var root = new DirectoryInfo(_httpContext.Server.MapPath("~/")); + ProcessWebConfigs(root); + + //now remove the dll + + var bin = root.GetDirectories("bin", SearchOption.TopDirectoryOnly); + if (bin.Length == 1) + { + var dll = bin[0].GetFiles("Microsoft.Web.Mvc.FixedDisplayModes.dll", SearchOption.TopDirectoryOnly); + if (dll.Length == 1) + { + _logger.Info("Deleting non-compatible and no longer used DLL: {0}", () => dll[0].FullName); + File.Delete(dll[0].FullName); + } + } + + return null; + } + + /// + /// Determines if this step needs to execute based on the current state of the application and/or install process + /// + /// + public override bool RequiresExecution(object model) + { + return UmbracoVersion.Current == Version.Parse("7.3.0"); + } + + private void ProcessWebConfigs(DirectoryInfo dir) + { + //Do the processing of files + var found = dir.GetFiles("web.config", SearchOption.AllDirectories); + + foreach (var configFile in found) + { + var fileName = configFile.FullName; + _logger.Info("Cleaning up web.config file: {0}", () => fileName); + + var contents = File.ReadAllText(fileName); + contents = _microsoftWebHelpers.Replace(contents, string.Empty); + contents = _webPagesRazorVersion.Replace(contents, "$1=3.0.0.0"); + contents = _mvcVersion.Replace(contents, "$1=5.2.3.0"); + using (var writer = new StreamWriter(configFile.FullName, false)) + { + writer.Write(contents); + } + } + } + + private readonly Regex _microsoftWebHelpers = new Regex(@"", RegexOptions.Compiled); + private readonly Regex _webPagesRazorVersion = new Regex(@"(System\.Web\.WebPages\.Razor,\s*?Version)(=2\.0\.0\.0)", RegexOptions.Compiled); + private readonly Regex _mvcVersion = new Regex(@"(System\.Web\.Mvc,\s*?Version)(=4\.0\.0\.0)", RegexOptions.Compiled); + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplayBase.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplayBase.cs index c01470f7e4..3a13a85f78 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplayBase.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplayBase.cs @@ -11,6 +11,7 @@ namespace Umbraco.Web.Models.ContentEditing protected ContentItemDisplayBase() { Notifications = new List(); + Errors = new Dictionary(); } /// diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs index 7684636605..0c7dbffd49 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs @@ -221,8 +221,16 @@ namespace Umbraco.Web.Models.Mapping } var svc = _userService.Value; - var permissions = svc.GetPermissions(UmbracoContext.Current.Security.CurrentUser, source.Id) - .FirstOrDefault(); + var permissions = svc.GetPermissions( + //TODO: This is certainly not ideal usage here - perhaps the best way to deal with this in the future is + // with the IUmbracoContextAccessor. In the meantime, if used outside of a web app this will throw a null + // refrence exception :( + UmbracoContext.Current.Security.CurrentUser, + // Here we need to do a special check since this could be new content, in which case we need to get the permissions + // from the parent, not the existing one otherwise permissions would be coming from the root since Id is 0. + source.HasIdentity ? source.Id : source.ParentId) + .FirstOrDefault(); + if (permissions == null) { return Enumerable.Empty(); diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 2bc1eb16c2..d2558d0451 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -273,10 +273,10 @@ namespace Umbraco.Web.Models.Mapping var result = new Dictionary(); foreach (var role in Roles.GetAllRoles().Distinct()) { - result.Add(role, false); // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access if (role.StartsWith(Constants.Conventions.Member.InternalRolePrefix) == false) { + result.Add(role, false); if (username.IsNullOrWhiteSpace()) continue; if (Roles.IsUserInRole(username, role)) { diff --git a/src/Umbraco.Web/Models/PublishedContentWithKeyBase.cs b/src/Umbraco.Web/Models/PublishedContentWithKeyBase.cs new file mode 100644 index 0000000000..52bd8b2f59 --- /dev/null +++ b/src/Umbraco.Web/Models/PublishedContentWithKeyBase.cs @@ -0,0 +1,15 @@ +using System; +using System.Diagnostics; +using Umbraco.Core.Models; + +namespace Umbraco.Web.Models +{ + /// + /// Provide an abstract base class for IPublishedContent implementations. + /// + [DebuggerDisplay("Content Id: {Id}, Name: {Name}")] + public abstract class PublishedContentWithKeyBase : PublishedContentBase, IPublishedContentWithKey + { + public abstract Guid Key { get; } + } +} diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs index 51217d1b1f..237f6d7845 100644 --- a/src/Umbraco.Web/Models/RegisterModel.cs +++ b/src/Umbraco.Web/Models/RegisterModel.cs @@ -28,7 +28,6 @@ namespace Umbraco.Web.Models { MemberTypeAlias = Constants.Conventions.MemberTypes.DefaultAlias; RedirectOnSucces = false; - RedirectUrl = "/"; UsernameIsEmail = true; MemberProperties = new List(); LoginOnSuccess = true; diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs index dd9720cdcf..71ebfb8288 100644 --- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs @@ -46,6 +46,7 @@ namespace Umbraco.Web.Mvc /// /// This is the same as applying the [AllowAnonymous] attribute /// + [Obsolete("Use [AllowAnonymous] instead")] public bool AllowAll { get; set; } /// diff --git a/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs b/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs index e0b73e05f3..747776c3b0 100644 --- a/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs +++ b/src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs @@ -42,6 +42,11 @@ namespace Umbraco.Web.Mvc } } + public int PageId + { + get { return _pageId; } + } + public IPublishedContent PublishedContent { get diff --git a/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs b/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs index 5c0050c2a1..35b3d6ee62 100644 --- a/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.PublishedCache /// /// Exposes a member object as IPublishedContent /// - public sealed class MemberPublishedContent : PublishedContentBase + public sealed class MemberPublishedContent : PublishedContentWithKeyBase { private readonly IMember _member; @@ -150,6 +150,11 @@ namespace Umbraco.Web.PublishedCache get { return _member.Id; } } + public override Guid Key + { + get { return _member.Key; } + } + public override int TemplateId { get { throw new NotSupportedException(); } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index 2e437ccc97..61dd50e610 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -273,6 +273,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache values.Add("level", values["__Path"].Split(',').Length.ToString()); } + // because, migration + if (values.ContainsKey("key") == false) + values["key"] = Guid.Empty.ToString(); + return new CacheValues { Values = values, @@ -321,6 +325,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache result.Current.MoveToParent(); } } + // because, migration + if (values.ContainsKey("key") == false) + values["key"] = Guid.Empty.ToString(); //add the user props while (result.MoveNext()) { @@ -526,7 +533,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache /// This is a helper class and definitely not intended for public use, it expects that all of the values required /// to create an IPublishedContent exist in the dictionary by specific aliases. /// - internal class DictionaryPublishedContent : PublishedContentBase + internal class DictionaryPublishedContent : PublishedContentWithKeyBase { // note: I'm not sure this class fully complies with IPublishedContent rules especially // I'm not sure that _properties contains all properties including those without a value, @@ -534,7 +541,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache // List of properties that will appear in the XML and do not match // anything in the ContentType, so they must be ignored. - private static readonly string[] IgnoredKeys = { "version", "isDoc", "key" }; + private static readonly string[] IgnoredKeys = { "version", "isDoc" }; public DictionaryPublishedContent( IDictionary valueDictionary, @@ -555,6 +562,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache LoadedFromExamine = fromExamine; ValidateAndSetProperty(valueDictionary, val => _id = int.Parse(val), "id", "nodeId", "__NodeId"); //should validate the int! + ValidateAndSetProperty(valueDictionary, val => _key = Guid.Parse(val), "key"); // wtf are we dealing with templates for medias?! ValidateAndSetProperty(valueDictionary, val => _templateId = int.Parse(val), "template", "templateId"); ValidateAndSetProperty(valueDictionary, val => _sortOrder = int.Parse(val), "sortOrder"); @@ -664,6 +672,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache get { return _id; } } + public override Guid Key { get { return _key; } } + public override int TemplateId { get @@ -803,6 +813,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache private readonly List _keysAdded = new List(); private int _id; + private Guid _key; private int _templateId; private int _sortOrder; private string _name; diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs index 5450d4063f..4bc2f2388a 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache /// [Serializable] [XmlType(Namespace = "http://umbraco.org/webservices/")] - internal class XmlPublishedContent : PublishedContentBase + internal class XmlPublishedContent : PublishedContentWithKeyBase { /// /// Initializes a new instance of the XmlPublishedContent class with an Xml node. @@ -64,6 +64,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache private IPublishedContent _parent; private int _id; + private Guid _key; private int _template; private string _name; private string _docTypeAlias; @@ -150,6 +151,16 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } } + public override Guid Key + { + get + { + if (_initialized == false) + Initialize(); + return _key; + } + } + public override int TemplateId { get @@ -348,6 +359,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache if (_xmlNode.Attributes != null) { _id = int.Parse(_xmlNode.Attributes.GetNamedItem("id").Value); + if (_xmlNode.Attributes.GetNamedItem("key") != null) // because, migration + _key = Guid.Parse(_xmlNode.Attributes.GetNamedItem("key").Value); if (_xmlNode.Attributes.GetNamedItem("template") != null) _template = int.Parse(_xmlNode.Attributes.GetNamedItem("template").Value); if (_xmlNode.Attributes.GetNamedItem("sortOrder") != null) diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index a735df88f9..d6cf3b3141 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -19,7 +19,17 @@ namespace Umbraco.Web /// Provides extension methods for IPublishedContent. /// public static class PublishedContentExtensions - { + { + #region Key + + public static Guid GetKey(this IPublishedContent content) + { + var contentWithKey = content as IPublishedContentWithKey; + return contentWithKey == null ? Guid.Empty : contentWithKey.Key; + } + + #endregion + #region Urls /// @@ -1734,7 +1744,7 @@ namespace Umbraco.Web public static IPublishedContent FirstChild(this IPublishedContent content) { - return content.Children().First(); + return content.Children().FirstOrDefault(); } public static IPublishedContent FirstChild(this IPublishedContent content, Func predicate) diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs index afeddd1bf1..16f42b8197 100644 --- a/src/Umbraco.Web/PublishedContentQuery.cs +++ b/src/Umbraco.Web/PublishedContentQuery.cs @@ -211,7 +211,7 @@ namespace Umbraco.Web private IEnumerable TypedDocumentsByIds(ContextualPublishedCache cache, IEnumerable ids) { - return ids.Select(eachId => TypedDocumentById(eachId, cache)); + return ids.Select(eachId => TypedDocumentById(eachId, cache)).WhereNotNull(); } private IEnumerable TypedDocumentsByXPath(string xpath, XPathVariable[] vars, ContextualPublishedContentCache cache) diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs index d11bf2af35..0557e56e57 100644 --- a/src/Umbraco.Web/Scheduling/KeepAlive.cs +++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs @@ -52,12 +52,7 @@ namespace Umbraco.Web.Scheduling var url = umbracoAppUrl + "/ping.aspx"; using (var wc = new HttpClient()) { - var request = new HttpRequestMessage() - { - RequestUri = new Uri(url), - Method = HttpMethod.Get - }; - + var request = new HttpRequestMessage(HttpMethod.Get, url); var result = await wc.SendAsync(request, token); } } diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs index 66ba966823..b3a5f303e3 100644 --- a/src/Umbraco.Web/Scheduling/LogScrubber.cs +++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs @@ -60,10 +60,14 @@ namespace Umbraco.Web.Scheduling { if (_appContext == null) return true; // repeat... - if (ServerEnvironmentHelper.GetStatus(_settings) == CurrentServerEnvironmentStatus.Slave) + switch (_appContext.GetCurrentServerRole()) { - LogHelper.Debug("Does not run on slave servers."); - return false; // do NOT repeat, server status comes from config and will NOT change + case ServerRole.Slave: + LogHelper.Debug("Does not run on slave servers."); + return true; // DO repeat, server role can change + case ServerRole.Unknown: + LogHelper.Debug("Does not run on servers with unknown role."); + return true; // DO repeat, server role can change } // ensure we do not run if not main domain, but do NOT lock it diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs index 11cffb3648..0f7e3f0183 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs @@ -32,10 +32,14 @@ namespace Umbraco.Web.Scheduling { if (_appContext == null) return true; // repeat... - if (ServerEnvironmentHelper.GetStatus(_settings) == CurrentServerEnvironmentStatus.Slave) + switch (_appContext.GetCurrentServerRole()) { - LogHelper.Debug("Does not run on slave servers."); - return false; // do NOT repeat, server status comes from config and will NOT change + case ServerRole.Slave: + LogHelper.Debug("Does not run on slave servers."); + return true; // DO repeat, server role can change + case ServerRole.Unknown: + LogHelper.Debug("Does not run on servers with unknown role."); + return true; // DO repeat, server role can change } // ensure we do not run if not main domain, but do NOT lock it @@ -61,10 +65,8 @@ namespace Umbraco.Web.Scheduling var url = umbracoAppUrl + "/RestServices/ScheduledPublish/Index"; using (var wc = new HttpClient()) { - var request = new HttpRequestMessage() + var request = new HttpRequestMessage(HttpMethod.Post, url) { - RequestUri = new Uri(url), - Method = HttpMethod.Post, Content = new StringContent(string.Empty) }; //pass custom the authorization header diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs index def7b606b5..37d7a190f7 100644 --- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs +++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs @@ -63,12 +63,7 @@ namespace Umbraco.Web.Scheduling { using (var wc = new HttpClient()) { - var request = new HttpRequestMessage() - { - RequestUri = new Uri(url), - Method = HttpMethod.Get, - Content = new StringContent(string.Empty) - }; + var request = new HttpRequestMessage(HttpMethod.Get, url); //TODO: pass custom the authorization header, currently these aren't really secured! //request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext); @@ -95,10 +90,14 @@ namespace Umbraco.Web.Scheduling { if (_appContext == null) return true; // repeat... - if (ServerEnvironmentHelper.GetStatus(_settings) == CurrentServerEnvironmentStatus.Slave) + switch (_appContext.GetCurrentServerRole()) { - LogHelper.Debug("Does not run on slave servers."); - return false; // do NOT repeat, server status comes from config and will NOT change + case ServerRole.Slave: + LogHelper.Debug("Does not run on slave servers."); + return true; // DO repeat, server role can change + case ServerRole.Unknown: + LogHelper.Debug("Does not run on servers with unknown role."); + return true; // DO repeat, server role can change } // ensure we do not run if not main domain, but do NOT lock it diff --git a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs index 6d8faa782f..2a61d4177d 100644 --- a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs +++ b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs @@ -3,6 +3,7 @@ using System.Web; using Newtonsoft.Json; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Core.Services; using Umbraco.Core.Sync; using Umbraco.Web.Routing; @@ -21,18 +22,23 @@ namespace Umbraco.Web.Strategies /// public sealed class ServerRegistrationEventHandler : ApplicationEventHandler { - private static DateTime _lastUpdated = DateTime.MinValue; + private readonly object _locko = new object(); + private DatabaseServerRegistrar _registrar; + private DateTime _lastUpdated = DateTime.MinValue; // bind to events protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) { + _registrar = ServerRegistrarResolver.Current.Registrar as DatabaseServerRegistrar; + // only for the DatabaseServerRegistrar - if (ServerRegistrarResolver.Current.Registrar is DatabaseServerRegistrar) - UmbracoModule.RouteAttempt += UmbracoModuleRouteAttempt; + if (_registrar == null) return; + + UmbracoModule.RouteAttempt += UmbracoModuleRouteAttempt; } // handles route attempts. - private static void UmbracoModuleRouteAttempt(object sender, RoutableAttemptEventArgs e) + private void UmbracoModuleRouteAttempt(object sender, RoutableAttemptEventArgs e) { if (e.HttpContext.Request == null || e.HttpContext.Request.Url == null) return; @@ -60,31 +66,26 @@ namespace Umbraco.Web.Strategies } // register current server (throttled). - private static void RegisterServer(UmbracoRequestEventArgs e) + private void RegisterServer(UmbracoRequestEventArgs e) { - var reg = (DatabaseServerRegistrar) ServerRegistrarResolver.Current.Registrar; - var options = reg.Options; - var secondsSinceLastUpdate = DateTime.Now.Subtract(_lastUpdated).TotalSeconds; - if (secondsSinceLastUpdate < options.ThrottleSeconds) return; + lock (_locko) // ensure we trigger only once + { + var secondsSinceLastUpdate = DateTime.Now.Subtract(_lastUpdated).TotalSeconds; + if (secondsSinceLastUpdate < _registrar.Options.ThrottleSeconds) return; + _lastUpdated = DateTime.Now; + } - _lastUpdated = DateTime.Now; - - var url = e.HttpContext.Request.Url; var svc = e.UmbracoContext.Application.Services.ServerRegistrationService; + // because + // - ApplicationContext.UmbracoApplicationUrl is initialized by UmbracoModule in BeginRequest + // - RegisterServer is called on UmbracoModule.RouteAttempt which is triggered in ProcessRequest + // we are safe, UmbracoApplicationUrl has been initialized + var serverAddress = e.UmbracoContext.Application.UmbracoApplicationUrl; + try { - if (url == null) - throw new Exception("Request.Url is null."); - - var serverAddress = url.GetLeftPart(UriPartial.Authority); - var serverIdentity = JsonConvert.SerializeObject(new - { - machineName = NetworkHelper.MachineName, - appDomainAppId = HttpRuntime.AppDomainAppId - }); - - svc.TouchServer(serverAddress, serverIdentity, options.StaleServerTimeout); + svc.TouchServer(serverAddress, svc.CurrentServerIdentity, _registrar.Options.StaleServerTimeout); } catch (Exception ex) { diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index d45d0608be..e80cabecfa 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -122,7 +122,7 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { nodes.Add( - CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, "All Members", "icon-users", false, + CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, ui.Text("member", "allMembers"), "icon-users", false, queryStrings.GetValue("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId)); if (_isUmbracoProvider) diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs index f5a9df97c2..dfc0636804 100644 --- a/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs +++ b/src/Umbraco.Web/Trees/PartialViewMacrosTree.cs @@ -23,12 +23,10 @@ namespace Umbraco.Web.Trees public override void RenderJS(ref StringBuilder javascript) { - //NOTE: Notice the MacroPartials%2f string below, this is a URLEncoded string of "MacroPartials/" so that the editor knows - // to load the file from the correct location javascript.Append( @" function openMacroPartialView(id) { - UmbClientMgr.contentFrame('Settings/Views/EditView.aspx?treeType=partialViewMacros&file=MacroPartials%2f' + id); + UmbClientMgr.contentFrame('Settings/Views/EditView.aspx?treeType=partialViewMacros&file=' + id); } "); diff --git a/src/Umbraco.Web/Trees/PartialViewsTree.cs b/src/Umbraco.Web/Trees/PartialViewsTree.cs index 08bbd5aadd..ac937864ab 100644 --- a/src/Umbraco.Web/Trees/PartialViewsTree.cs +++ b/src/Umbraco.Web/Trees/PartialViewsTree.cs @@ -25,12 +25,10 @@ namespace Umbraco.Web.Trees public override void RenderJS(ref StringBuilder javascript) { - //NOTE: Notice the Partials%2f string below, this is a URLEncoded string of "Partials/" so that the editor knows - // to load the file from the correct location javascript.Append( @" function openPartialView(id) { - UmbClientMgr.contentFrame('Settings/Views/EditView.aspx?treeType=partialViews&file=Partials%2f' + id); + UmbClientMgr.contentFrame('Settings/Views/EditView.aspx?treeType=partialViews&file=' + id); } "); } diff --git a/src/Umbraco.Web/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/UI/LegacyDialogHandler.cs index 5ae7d0c627..dfa7fbc153 100644 --- a/src/Umbraco.Web/UI/LegacyDialogHandler.cs +++ b/src/Umbraco.Web/UI/LegacyDialogHandler.cs @@ -193,10 +193,18 @@ namespace Umbraco.Web.UI typeInstance.Alias = text; // check for returning url - var returnUrlTask = typeInstance as LegacyDialogTask; - - returnUrlTask.AdditionalValues = additionalValues; - + ITaskReturnUrl returnUrlTask = typeInstance as LegacyDialogTask; + if (returnUrlTask != null) + { + // if castable to LegacyDialogTask: add in additionalValues + ((LegacyDialogTask) returnUrlTask).AdditionalValues = additionalValues; + } + else + { + // otherwise cast to returnUrl interface + returnUrlTask = typeInstance as ITaskReturnUrl; + } + typeInstance.Save(); return returnUrlTask != null diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index c1a5c3b59b..c4e1d45334 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -116,8 +116,8 @@ ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll - - ..\packages\Examine.0.1.67.0\lib\Examine.dll + + ..\packages\Examine.0.1.68.0\lib\Examine.dll True @@ -300,10 +300,12 @@ + + diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index e407edda4f..35797a4432 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -584,27 +584,57 @@ namespace Umbraco.Web return ContentQuery.TypedContent(ConvertIdsObjectToInts(ids)); } + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. public IEnumerable TypedContent(params int[] ids) { return ContentQuery.TypedContent(ids); } - public IEnumerable TypedContent(params string[] ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable TypedContent(params string[] ids) { return ContentQuery.TypedContent(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedContent(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable TypedContent(IEnumerable ids) { return ContentQuery.TypedContent(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedContent(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable TypedContent(IEnumerable ids) { return ContentQuery.TypedContent(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedContent(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable TypedContent(IEnumerable ids) { return ContentQuery.TypedContent(ids); } @@ -651,32 +681,68 @@ namespace Umbraco.Web return ContentQuery.ContentSingleAtXPath(xpath, vars); } + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. public dynamic Content(params object[] ids) { return ContentQuery.Content(ConvertIdsObjectToInts(ids)); } - public dynamic Content(params int[] ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public dynamic Content(params int[] ids) { return ContentQuery.Content(ids); } - public dynamic Content(params string[] ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public dynamic Content(params string[] ids) { return ContentQuery.Content(ConvertIdsObjectToInts(ids)); } - public dynamic Content(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public dynamic Content(IEnumerable ids) { return ContentQuery.Content(ConvertIdsObjectToInts(ids)); } - public dynamic Content(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public dynamic Content(IEnumerable ids) { return ContentQuery.Content(ids); } - public dynamic Content(IEnumerable ids) + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public dynamic Content(IEnumerable ids) { return ContentQuery.Content(ConvertIdsObjectToInts(ids)); } @@ -758,32 +824,68 @@ namespace Umbraco.Web return ConvertIdObjectToInt(id, out intId) ? ContentQuery.TypedMedia(intId) : null; } - public IEnumerable TypedMedia(params object[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(params object[] ids) { return ContentQuery.TypedMedia(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedMedia(params int[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(params int[] ids) { return ContentQuery.TypedMedia(ids); } - public IEnumerable TypedMedia(params string[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(params string[] ids) { return ContentQuery.TypedMedia(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedMedia(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(IEnumerable ids) { return ContentQuery.TypedMedia(ConvertIdsObjectToInts(ids)); } - public IEnumerable TypedMedia(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(IEnumerable ids) { return ContentQuery.TypedMedia(ids); } - public IEnumerable TypedMedia(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable TypedMedia(IEnumerable ids) { return ContentQuery.TypedMedia(ConvertIdsObjectToInts(ids)); } @@ -810,32 +912,68 @@ namespace Umbraco.Web return ConvertIdObjectToInt(id, out intId) ? ContentQuery.Media(intId) : DynamicNull.Null; } - public dynamic Media(params object[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(params object[] ids) { return ContentQuery.Media(ConvertIdsObjectToInts(ids)); } - public dynamic Media(params int[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(params int[] ids) { return ContentQuery.Media(ids); } - public dynamic Media(params string[] ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(params string[] ids) { return ContentQuery.Media(ConvertIdsObjectToInts(ids)); } - public dynamic Media(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(IEnumerable ids) { return ContentQuery.Media(ConvertIdsObjectToInts(ids)); } - public dynamic Media(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(IEnumerable ids) { return ContentQuery.Media(ids); } - public dynamic Media(IEnumerable ids) + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public dynamic Media(IEnumerable ids) { return ContentQuery.Media(ConvertIdsObjectToInts(ids)); } diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs index 54d106574a..02bb83bd32 100644 --- a/src/Umbraco.Web/UmbracoModule.cs +++ b/src/Umbraco.Web/UmbracoModule.cs @@ -20,6 +20,7 @@ using Umbraco.Web.Editors; using Umbraco.Web.Routing; using Umbraco.Web.Security; using umbraco; +using Umbraco.Core.Sync; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; using ObjectExtensions = Umbraco.Core.ObjectExtensions; using RenderingEngine = Umbraco.Core.RenderingEngine; @@ -36,36 +37,6 @@ namespace Umbraco.Web { #region HttpModule event handlers - private static void EnsureApplicationUrl(HttpRequestBase request) - { - var appctx = ApplicationContext.Current; - - // already initialized = ok - // note that getting ApplicationUrl will ALSO try the various settings - if (appctx.UmbracoApplicationUrl.IsNullOrWhiteSpace() == false) return; - - // so if we reach that point, nothing was configured - // use the current request as application url - - // if (HTTP and SSL not required) or (HTTPS and SSL required), - // use ports from request - // otherwise, - // if non-standard ports used, - // user may need to set umbracoApplicationUrl manually per - // http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks - var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false) - || (request.IsSecureConnection && GlobalSettings.UseSSL) - ? ":" + request.ServerVariables["SERVER_PORT"] - : ""; - - var ssl = GlobalSettings.UseSSL ? "s" : ""; // force, whatever the first request - var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco); - - appctx.UmbracoApplicationUrl = UriUtility.TrimPathEndSlash(url); - LogHelper.Info("ApplicationUrl: " + appctx.UmbracoApplicationUrl + " (UmbracoModule request)"); - } - - /// /// Begins to process a request. /// @@ -73,7 +44,7 @@ namespace Umbraco.Web static void BeginRequest(HttpContextBase httpContext) { // ensure application url is initialized - EnsureApplicationUrl(httpContext.Request); + ApplicationUrlHelper.EnsureApplicationUrl(ApplicationContext.Current, httpContext.Request); // do not process if client-side request if (httpContext.Request.Url.IsClientSideRequest()) diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs index 86a97e2857..8a1c55e758 100644 --- a/src/Umbraco.Web/UriUtility.cs +++ b/src/Umbraco.Web/UriUtility.cs @@ -51,7 +51,8 @@ namespace Umbraco.Web // see also VirtualPathUtility.ToAppRelative public static string ToAppRelative(string virtualPath) { - if (virtualPath.InvariantStartsWith(_appPathPrefix)) + if (virtualPath.InvariantStartsWith(_appPathPrefix) + && (virtualPath.Length == _appPathPrefix.Length || virtualPath[_appPathPrefix.Length] == '/')) virtualPath = virtualPath.Substring(_appPathPrefix.Length); if (virtualPath.Length == 0) virtualPath = "/"; diff --git a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs index f2dbfd7cba..ef2b70e44c 100644 --- a/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/FileUploadCleanupFilterAttribute.cs @@ -1,4 +1,7 @@ -using System.Linq; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Net.Http; using System.Web.Http.Filters; using Umbraco.Core; @@ -37,6 +40,8 @@ namespace Umbraco.Web.WebApi.Filters { base.OnActionExecuted(actionExecutedContext); + var tempFolders = new List(); + if (_incomingModel) { if (actionExecutedContext.ActionContext.ActionArguments.Any()) @@ -47,7 +52,21 @@ namespace Umbraco.Web.WebApi.Filters //cleanup any files associated foreach (var f in contentItem.UploadedFiles) { - File.Delete(f.TempFilePath); + //track all temp folders so we can remove old files afterwords + var dir = Path.GetDirectoryName(f.TempFilePath); + if (tempFolders.Contains(dir) == false) + { + tempFolders.Add(dir); + } + + try + { + File.Delete(f.TempFilePath); + } + catch (System.Exception ex) + { + LogHelper.Error("Could not delete temp file " + f.TempFilePath, ex); + } } } } @@ -94,8 +113,24 @@ namespace Umbraco.Web.WebApi.Filters { if (f.TempFilePath.IsNullOrWhiteSpace() == false) { + //track all temp folders so we can remove old files afterwords + var dir = Path.GetDirectoryName(f.TempFilePath); + if (tempFolders.Contains(dir) == false) + { + tempFolders.Add(dir); + } + LogHelper.Debug("Removing temp file " + f.TempFilePath); - File.Delete(f.TempFilePath); + + try + { + File.Delete(f.TempFilePath); + } + catch (System.Exception ex) + { + LogHelper.Error("Could not delete temp file " + f.TempFilePath, ex); + } + //clear out the temp path so it's not returned in the response f.TempFilePath = ""; } @@ -120,6 +155,27 @@ namespace Umbraco.Web.WebApi.Filters LogHelper.Warn("The actionExecutedContext.Request.Content is not ObjectContent, it is " + actionExecutedContext.Request.Content.GetType()); } } + + //Now remove all old files so that the temp folder(s) never grow + foreach (var tempFolder in tempFolders.Distinct()) + { + var files = Directory.GetFiles(tempFolder); + foreach (var file in files) + { + if (DateTime.UtcNow - File.GetLastWriteTimeUtc(file) > TimeSpan.FromDays(1)) + { + try + { + File.Delete(file); + } + catch (System.Exception ex) + { + LogHelper.Error("Could not delete temp file " + file, ex); + } + } + } + + } } } diff --git a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs index 88bb2107de..1ea7be719c 100644 --- a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs +++ b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs @@ -43,6 +43,7 @@ namespace Umbraco.Web.WebApi /// /// This is the same as applying the [AllowAnonymous] attribute /// + [Obsolete("Use [AllowAnonymous] instead")] public bool AllowAll { get; set; } /// diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs index f3344a7fb7..6446e0152d 100644 --- a/src/Umbraco.Web/WebServices/DomainsApiController.cs +++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs @@ -63,7 +63,15 @@ namespace Umbraco.Web.WebServices LanguageId = model.Language, RootContentId = model.NodeId }; - Services.DomainService.Save(newDomain); + + var saveAttempt = Services.DomainService.Save(newDomain); + if (saveAttempt == false) + { + var response = Request.CreateResponse(HttpStatusCode.BadRequest); + response.Content = new StringContent("Saving new domain failed"); + response.ReasonPhrase = saveAttempt.Result.StatusType.ToString(); + throw new HttpResponseException(response); + } } } @@ -114,7 +122,14 @@ namespace Umbraco.Web.WebServices LanguageId = domainModel.Lang, RootContentId = model.NodeId }; - Services.DomainService.Save(newDomain); + var saveAttempt = Services.DomainService.Save(newDomain); + if (saveAttempt == false) + { + var response = Request.CreateResponse(HttpStatusCode.BadRequest); + response.Content = new StringContent("Saving new domain failed"); + response.ReasonPhrase = saveAttempt.Result.StatusType.ToString(); + throw new HttpResponseException(response); + } } } diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs index 651b372988..24f6917e76 100644 --- a/src/Umbraco.Web/WebServices/SaveFileController.cs +++ b/src/Umbraco.Web/WebServices/SaveFileController.cs @@ -12,8 +12,9 @@ using Umbraco.Web.Mvc; using umbraco; using umbraco.cms.businesslogic.macro; using System.Collections.Generic; +using umbraco.cms.helpers; using Umbraco.Core; - +using Umbraco.Core.Configuration; using Template = umbraco.cms.businesslogic.template.Template; namespace Umbraco.Web.WebServices @@ -37,56 +38,14 @@ namespace Umbraco.Web.WebServices [HttpPost] public JsonResult SavePartialViewMacro(string filename, string oldName, string contents) { - //NOTE: This is a bit of a hack because we're sharing the View editor with templates/partial views/partial view macros, so the path starts with - // 'Partials' which we need to remove because the path that we construct the partial view with is a relative path to the root path of - // Views/Partials - if (filename.InvariantStartsWith("MacroPartials/")) - { - filename = filename.TrimStart("MacroPartials/"); - } - if (oldName.IsNullOrWhiteSpace() == false) - { - if (oldName.InvariantStartsWith("MacroPartials/")) - { - oldName = oldName.TrimStart("MacroPartials/"); - } - } + var svce = (FileService) Services.FileService; - var fileService = (FileService)Services.FileService; - - //try to get the file by the old name first if they are different and delete that file - if (filename.Trim().InvariantEquals(oldName.Trim()) == false) - { - var existing = fileService.GetPartialViewMacro(oldName); - if (existing != null) - { - var success = fileService.DeletePartialViewMacro(existing.Path, Security.GetUserId()); - if (success == false) - { - return Failed( - ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), - //pass in a new exception ... this will also append the the message - new Exception("Could not delete old file: " + oldName)); - } - } - } - - var partialView = new PartialView(filename) - { - Content = contents - }; - - var attempt = fileService.SavePartialViewMacro(partialView); - - if (attempt.Success == false) - { - return Failed( - ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), - //pass in a new exception ... this will also append the the message - attempt.Exception); - } - - return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader")); + return SavePartialView(svce, + filename, oldName, contents, + "MacroPartials/", + (s, n) => s.GetPartialViewMacro(n), + (s, v) => s.ValidatePartialViewMacro((PartialView) v), + (s, v) => s.SavePartialViewMacro(v)); } /// @@ -99,53 +58,71 @@ namespace Umbraco.Web.WebServices [HttpPost] public JsonResult SavePartialView(string filename, string oldName, string contents) { - //NOTE: This is a bit of a hack because we're sharing the View editor with templates/partial views/partial view macros, so the path starts with - // 'Partials' which we need to remove because the path that we construct the partial view with is a relative path to the root path of - // Views/Partials - if (filename.InvariantStartsWith("Partials/")) + var svce = (FileService) Services.FileService; + + return SavePartialView(svce, + filename, oldName, contents, + "Partials/", + (s, n) => s.GetPartialView(n), + (s, v) => s.ValidatePartialView((PartialView) v), + (s, v) => s.SavePartialView(v)); + } + + private JsonResult SavePartialView(IFileService svce, + string filename, string oldname, string contents, + string pathPrefix, + Func get, + Func validate, + Func> save) + { + // sanitize input - partial view names have an extension + filename = filename + .Replace('\\', '/') + .TrimStart('/'); + + // sharing the editor with partial views & partial view macros, + // using path prefix to differenciate, + // but the file service manages different filesystems, + // and we need to come back to filesystem-relative paths + + // not sure why we still need this but not going to change it now + + if (filename.InvariantStartsWith(pathPrefix)) + filename = filename.TrimStart(pathPrefix); + + if (oldname != null) { - filename = filename.TrimStart("Partials/"); - } - if (oldName.IsNullOrWhiteSpace() == false) - { - if (oldName.InvariantStartsWith("Partials/")) - { - oldName = oldName.TrimStart("Partials/"); - } + oldname = oldname.TrimStart('/', '\\'); + if (oldname.InvariantStartsWith(pathPrefix)) + oldname = oldname.TrimStart(pathPrefix); } - var fileService = (FileService)Services.FileService; - - //try to get the file by the old name first if they are different and delete that file - if (filename.Trim().InvariantEquals(oldName.Trim()) == false) + var view = get(svce, oldname); + if (view == null) + view = new PartialView(filename); + else + view.Path = filename; + view.Content = contents; + + Attempt attempt; + try { - var existing = fileService.GetPartialView(oldName); - if (existing != null) - { - var success = fileService.DeletePartialView(existing.Path, Security.GetUserId()); - if (success == false) - { - return Failed( - ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), - //pass in a new exception ... this will also append the the message - new Exception("Could not delete old file: " + oldName)); - } - } + var partialView = view as PartialView; + if (partialView != null && validate != null && validate(svce, partialView) == false) + return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), + new FileSecurityException("File '" + view.Path + "' is not a valid partial view file.")); + + attempt = save(svce, view); } - - var partialView = new PartialView(filename) + catch (Exception e) { - Content = contents - }; - - var attempt = fileService.SavePartialView(partialView); + return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), e); + } if (attempt.Success == false) { - return Failed( - ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), - //pass in a new exception ... this will also append the the message - attempt.Exception); + return Failed(ui.Text("speechBubbles", "partialViewErrorText"), ui.Text("speechBubbles", "partialViewErrorHeader"), + attempt.Exception); } return Success(ui.Text("speechBubbles", "partialViewSavedText"), ui.Text("speechBubbles", "partialViewSavedHeader")); @@ -216,6 +193,85 @@ namespace Umbraco.Web.WebServices } } + [HttpPost] + public JsonResult SaveScript(string filename, string oldName, string contents) + { + // sanitize input - script names have an extension + filename = filename + .Replace('\\', '/') + .TrimStart('/'); + + var svce = (FileService) Services.FileService; + var script = svce.GetScriptByName(oldName); + if (script == null) + script = new Script(filename); + else + script.Path = filename; + script.Content = contents; + + try + { + if (svce.ValidateScript(script) == false) + return Failed(ui.Text("speechBubbles", "scriptErrorText"), ui.Text("speechBubbles", "scriptErrorHeader"), + new FileSecurityException("File '" + filename + "' is not a valid script file.")); + + svce.SaveScript(script); + } + catch (Exception e) + { + return Failed(ui.Text("speechBubbles", "scriptErrorText"), ui.Text("speechBubbles", "scriptErrorHeader"), e); + } + + return Success(ui.Text("speechBubbles", "scriptSavedText"), ui.Text("speechBubbles", "scriptSavedHeader"), + new + { + path = DeepLink.GetTreePathFromFilePath(script.Path), + name = script.Path, + url = script.VirtualPath, + contents = script.Content + }); + } + + [HttpPost] + public JsonResult SaveStylesheet(string filename, string oldName, string contents) + { + // sanitize input - stylesheet names have no extension + filename = filename + .Replace('\\', '/') + .TrimStart('/') + .EnsureEndsWith(".css"); + + var svce = (FileService) Services.FileService; + var stylesheet = svce.GetStylesheetByName(oldName); + if (stylesheet == null) + stylesheet = new Stylesheet(filename); + else + stylesheet.Path = filename; + stylesheet.Content = contents; + + try + { + if (svce.ValidateStylesheet(stylesheet) == false) + return Failed(ui.Text("speechBubbles", "cssErrorText"), ui.Text("speechBubbles", "cssErrorHeader"), + new FileSecurityException("File '" + filename + "' is not a valid stylesheet file.")); + + svce.SaveStylesheet(stylesheet); + } + catch (Exception e) + { + return Failed(ui.Text("speechBubbles", "cssErrorText"), ui.Text("speechBubbles", "cssErrorHeader"), e); + } + + return Success(ui.Text("speechBubbles", "cssSavedText"), ui.Text("speechBubbles", "cssSavedHeader"), + new + { + path = DeepLink.GetTreePathFromFilePath(stylesheet.Path), + name = stylesheet.Path, + url = stylesheet.VirtualPath, + contents = stylesheet.Content + }); + } + /// /// Returns a successful message /// diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index 760c878f9d..d255e152ba 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs index 02e695ee30..6121d2f69b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs @@ -67,29 +67,26 @@ function openMemberGroup(id) { Array.Sort(roles); foreach(string role in roles) { -// MemberGroup[] MemberGroups = MemberGroup.GetAll; - -// for (int i = 0; i < MemberGroups.Length; i++) -// { - XmlTreeNode xNode = XmlTreeNode.Create(this); - xNode.NodeID = role; - xNode.Text = role; - xNode.Action = "javascript:openMemberGroup('" + HttpContext.Current.Server.UrlEncode(role.Replace("'", "\\'")) + "');"; - xNode.Icon = "icon-users"; - if (!Member.IsUsingUmbracoRoles()) + if (role.StartsWith(Constants.Conventions.Member.InternalRolePrefix) == false) { - xNode.Menu = null; - } + XmlTreeNode xNode = XmlTreeNode.Create(this); + xNode.NodeID = role; + xNode.Text = role; + xNode.Action = "javascript:openMemberGroup('" + HttpContext.Current.Server.UrlEncode(role.Replace("'", "\\'")) + "');"; + xNode.Icon = "icon-users"; + if (!Member.IsUsingUmbracoRoles()) + { + xNode.Menu = null; + } - OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); - if (xNode != null) - { - tree.Add(xNode); + OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty); + if (xNode != null) + { + tree.Add(xNode); + } + OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty); } - OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty); } } - } - } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs index cd9a2fcc26..042bf312d1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs @@ -52,12 +52,7 @@ namespace umbraco if (IsPartialViewMacro == false) { var attempt = fileService.CreatePartialView(model, snippetName, User.Id); - - //TODO: We currently need to hack this because we are using the same editor for views, partial views, partial view macros and - // the editor is using normal UI whereas the partial view repo and these classes are using IFileSystem with relative references - // so the model.Path is a relative reference to the ~/Views/Partials folder, we need to ensure it's prefixed with "Partials/" - - _returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViews&file={0}", model.Path.TrimStart('/').EnsureStartsWith("Partials/")); + _returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViews&file={0}", model.Path.TrimStart('/')); return attempt.Success; } else @@ -73,11 +68,7 @@ namespace umbraco macroService.Save(new Macro(attempt.Result.Alias, attempt.Result.Alias) { ScriptPath = virtualPath }); } - //TODO: We currently need to hack this because we are using the same editor for views, partial views, partial view macros and - // the editor is using normal UI whereas the partial view repo and these classes are using IFileSystem with relative references - // so the model.Path is a relative reference to the ~/Views/Partials folder, we need to ensure it's prefixed with "MacroPartials/" - - _returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViewMacros&file={0}", model.Path.TrimStart('/').EnsureStartsWith("MacroPartials/")); + _returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViewMacros&file={0}", model.Path.TrimStart('/')); return attempt.Success; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs index ab88df2b4a..3cf3e7ad64 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs @@ -12,6 +12,7 @@ using umbraco.cms.businesslogic.web; using umbraco.controls; using umbraco.cms.helpers; using umbraco.BasePages; +using Umbraco.Core.Persistence; using Umbraco.Core.Security; namespace umbraco.presentation.umbraco.dialogs @@ -262,8 +263,9 @@ namespace umbraco.presentation.umbraco.dialogs p_buttons.Visible = false; pane_advanced.Visible = false; pane_simple.Visible = false; - - ClientTools.ReloadActionNode(true, false); + + var content = ApplicationContext.Current.Services.ContentService.GetById(pageId); + ClientTools.SyncTree(content.Path, true); feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; } @@ -281,7 +283,8 @@ namespace umbraco.presentation.umbraco.dialogs feedback.Text = ui.Text("publicAccess", "paIsRemoved", new cms.businesslogic.CMSNode(pageId).Text) + "

    " + ui.Text("closeThisWindow") + ""; - ClientTools.ReloadActionNode(true, false); + var content = ApplicationContext.Current.Services.ContentService.GetById(pageId); + ClientTools.SyncTree(content.Path, true); feedback.type = global::umbraco.uicontrols.Feedback.feedbacktype.success; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs index 5a92470a82..b8d37fbb65 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs @@ -191,10 +191,11 @@ namespace umbraco.presentation.preview { DeletePreviewFile(userId, file); } - // also delete any files accessed more than one hour ago + // also delete any files accessed more than 10 minutes ago + var now = DateTime.Now; foreach (FileInfo file in dir.GetFiles("*.config")) { - if ((DateTime.Now - file.LastAccessTime).TotalMinutes > 1) + if ((now - file.LastAccessTime).TotalMinutes > 10) DeletePreviewFile(userId, file); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs index ee54297f06..8cd9082b5b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs @@ -41,58 +41,42 @@ namespace umbraco.cms.presentation.settings.scripts protected MenuButton SaveButton; - private string file; + private string filename; + protected string ScriptTreeSyncPath { get; private set; } protected override void OnLoad(EventArgs e) { base.OnLoad(e); - NameTxt.Text = file; - string path = ""; - if (file.StartsWith("~/")) - path = IOHelper.ResolveUrl(file); - else - path = IOHelper.ResolveUrl(SystemDirectories.Scripts + "/" + file); + // get the script, ensure it exists (not null) and validate (because + // the file service ensures that it loads scripts from the proper location + // but does not seem to validate extensions?) - in case of an error, + // throw - that's what we did anyways. + // also scrapping the code that added .cshtml and .vbhtml extensions, and + // ~/Views directory - we're not using editScript.aspx for views anymore. - lttPath.Text = "" + path + ""; + var svce = ApplicationContext.Current.Services.FileService; + var script = svce.GetScriptByName(filename); + if (script == null) // not found + throw new FileNotFoundException("Could not find file '" + filename + "'."); - var exts = UmbracoConfig.For.UmbracoSettings().Content.ScriptFileTypes.ToList(); - if (UmbracoConfig.For.UmbracoSettings().Templates.DefaultRenderingEngine == RenderingEngine.Mvc) - { - exts.Add("cshtml"); - exts.Add("vbhtml"); - } + lttPath.Text = "" + script.VirtualPath + ""; + editorSource.Text = script.Content; + ScriptTreeSyncPath = DeepLink.GetTreePathFromFilePath(filename); - var dirs = SystemDirectories.Scripts; - if (UmbracoConfig.For.UmbracoSettings().Templates.DefaultRenderingEngine == RenderingEngine.Mvc) - dirs += "," + SystemDirectories.MvcViews; - - // validate file - IOHelper.ValidateEditPath(IOHelper.MapPath(path), dirs.Split(',')); - - // validate extension - IOHelper.ValidateFileExtension(IOHelper.MapPath(path), exts); - - - StreamReader SR; - string S; - SR = File.OpenText(IOHelper.MapPath(path)); - S = SR.ReadToEnd(); - SR.Close(); - - editorSource.Text = S; + // name derives from filename, clean for xss + NameTxt.Text = filename.CleanForXss('\\', '/'); Panel1.Text = ui.Text("editscript", base.getUser()); pp_name.Text = ui.Text("name", base.getUser()); pp_path.Text = ui.Text("path", base.getUser()); - if (!IsPostBack) + if (IsPostBack == false) { - string sPath = DeepLink.GetTreePathFromFilePath(file); ClientTools .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias) - .SyncTree(sPath, false); + .SyncTree(ScriptTreeSyncPath, false); } } @@ -100,12 +84,12 @@ namespace umbraco.cms.presentation.settings.scripts { base.OnInit(e); - file = Request.QueryString["file"].TrimStart('/'); + filename = Request.QueryString["file"].Replace('\\', '/').TrimStart('/'); //need to change the editor type if it is XML - if (file.EndsWith("xml")) + if (filename.EndsWith("xml")) editorSource.CodeBase = uicontrols.CodeArea.EditorType.XML; - else if (file.EndsWith("master")) + else if (filename.EndsWith("master")) editorSource.CodeBase = uicontrols.CodeArea.EditorType.HTML; @@ -153,7 +137,6 @@ namespace umbraco.cms.presentation.settings.scripts } } - protected override void OnPreRender(EventArgs e) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs index f93d40da21..c570e45a8c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Linq; using System.Web.UI; using Umbraco.Core.IO; @@ -6,6 +7,7 @@ using Umbraco.Web; using umbraco.BasePages; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.web; +using umbraco.cms.helpers; using umbraco.cms.presentation.Trees; using umbraco.uicontrols; using Umbraco.Core; @@ -17,10 +19,11 @@ namespace umbraco.cms.presentation.settings.stylesheet ///

    public partial class editstylesheet : UmbracoEnsuredPage { - private Umbraco.Core.Models.Stylesheet _sheet; - protected MenuButton SaveButton; + private string filename; + protected string TreeSyncPath { get; private set; } + public editstylesheet() { CurrentApp = DefaultApps.settings.ToString(); @@ -30,6 +33,7 @@ namespace umbraco.cms.presentation.settings.stylesheet { base.OnInit(e); + filename = Request.QueryString["id"].Replace('\\', '/').TrimStart('/'); var editor = Panel1.NewTabPage(ui.Text("stylesheet")); editor.Controls.Add(Pane7); @@ -37,7 +41,6 @@ namespace umbraco.cms.presentation.settings.stylesheet var props = Panel1.NewTabPage(ui.Text("properties")); props.Controls.Add(Pane8); - SaveButton = Panel1.Menu.NewButton(); SaveButton.Text = ui.Text("save"); SaveButton.ButtonType = MenuButtonType.Primary; @@ -46,28 +49,27 @@ namespace umbraco.cms.presentation.settings.stylesheet } protected void Page_Load(object sender, EventArgs e) - { - + { Panel1.Text = ui.Text("stylesheet", "editstylesheet", UmbracoUser); pp_name.Text = ui.Text("name", UmbracoUser); pp_path.Text = ui.Text("path", UmbracoUser); - _sheet = Services.FileService.GetStylesheetByName(Request.QueryString["id"]); - if (_sheet == null) throw new InvalidOperationException("No stylesheet found with name: " + Request.QueryString["id"]); + var stylesheet = Services.FileService.GetStylesheetByName(filename); + if (stylesheet == null) // not found + throw new FileNotFoundException("Could not find file '" + filename + "'."); - lttPath.Text = "" + _sheet.VirtualPath + ""; + lttPath.Text = "" + stylesheet.VirtualPath + ""; + editorSource.Text = stylesheet.Content; + TreeSyncPath = DeepLink.GetTreePathFromFilePath(filename); + // name derives from path, without the .css extension, clean for xss + NameTxt.Text = stylesheet.Path.TrimEnd(".css").CleanForXss('\\', '/'); if (IsPostBack == false) { - NameTxt.Text = _sheet.Path.TrimEnd(".css"); - editorSource.Text = _sheet.Content; - ClientTools .SetActiveTreeType(Constants.Trees.Stylesheets) - .SyncTree("-1,init," + _sheet.Path - //needs a double escape to work with JS - .Replace("\\", "\\\\").TrimEnd(".css"), false); + .SyncTree(TreeSyncPath, false); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs index b5fff5e39a..28991f1f6b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs @@ -28,6 +28,7 @@ using umbraco.providers; using umbraco.cms.presentation.Trees; using Umbraco.Core.IO; using Umbraco.Core; +using Umbraco.Core.Services; namespace umbraco.cms.presentation.user { @@ -106,37 +107,25 @@ namespace umbraco.cms.presentation.user } } + var userCulture = Services.TextService.ConvertToSupportedCultureWithRegionCode(new CultureInfo(u.Language)); + // Populate ui language lsit - foreach ( - string f in - Directory.GetFiles(IOHelper.MapPath(SystemDirectories.Umbraco + "/config/lang"), "*.xml") - ) + foreach (var lang in Services.TextService.GetSupportedCultures()) { - XmlDocument x = new XmlDocument(); - x.Load(f); + var regionCode = Services.TextService.ConvertToRegionCodeFromSupportedCulture(lang); + + var li = new ListItem(lang.DisplayName, regionCode); - var alias = x.DocumentElement.Attributes.GetNamedItem("alias").Value; + if (Equals(lang, userCulture)) + li.Selected = true; - //ensure that only unique languages are added - if (userLanguage.Items.FindByValue(alias) == null) - { - ListItem li = - new ListItem(x.DocumentElement.Attributes.GetNamedItem("intName").Value, - alias); - - - if (x.DocumentElement.Attributes.GetNamedItem("alias").Value == u.Language) - li.Selected = true; - - userLanguage.Items.Add(li); - } - + userLanguage.Items.Add(li); } // Console access and disabling NoConsole.Checked = u.NoConsole; Disabled.Checked = u.Disabled; - + PlaceHolder medias = new PlaceHolder(); mediaPicker.AppAlias = Constants.Applications.Media; mediaPicker.TreeAlias = "media"; @@ -161,19 +150,19 @@ namespace umbraco.cms.presentation.user // Add password changer - var passwordChanger = (passwordChanger) LoadControl(SystemDirectories.Umbraco + "/controls/passwordChanger.ascx"); + var passwordChanger = (passwordChanger)LoadControl(SystemDirectories.Umbraco + "/controls/passwordChanger.ascx"); passwordChanger.MembershipProviderName = UmbracoSettings.DefaultBackofficeProvider; - + //Add a custom validation message for the password changer var passwordValidation = new CustomValidator - { - ID = "PasswordChangerValidator" - }; + { + ID = "PasswordChangerValidator" + }; var validatorContainer = new HtmlGenericControl("div") - { - Visible = false, - EnableViewState = false - }; + { + Visible = false, + EnableViewState = false + }; validatorContainer.Attributes["class"] = "alert alert-error"; validatorContainer.Style.Add(HtmlTextWriterStyle.MarginTop, "10px"); validatorContainer.Style.Add(HtmlTextWriterStyle.Width, "300px"); @@ -194,7 +183,7 @@ namespace umbraco.cms.presentation.user Pane ppNodes = new Pane(); ppNodes.addProperty(ui.Text("user", "startnode", UmbracoUser), content); ppNodes.addProperty(ui.Text("user", "mediastartnode", UmbracoUser), medias); - + //Generel umrbaco access Pane ppAccess = new Pane(); ppAccess.addProperty(ui.Text("user", "noConsole", UmbracoUser), NoConsole); @@ -208,12 +197,12 @@ namespace umbraco.cms.presentation.user TabPage userInfo = UserTabs.NewTabPage(u.Name); userInfo.Controls.Add(pp); - + userInfo.Controls.Add(ppAccess); userInfo.Controls.Add(ppNodes); userInfo.Controls.Add(ppModules); - + userInfo.HasMenu = true; var save = userInfo.Menu.NewButton(); @@ -227,7 +216,7 @@ namespace umbraco.cms.presentation.user sectionValidator.ControlToValidate = lapps.ID; sectionValidator.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", ui.Text("user", "modules", UmbracoUser), UmbracoUser); sectionValidator.CssClass = "error"; - sectionValidator.Style.Add("color", "red"); + sectionValidator.Style.Add("color", "red"); SetupForm(); SetupChannel(); @@ -414,7 +403,7 @@ namespace umbraco.cms.presentation.user //now do the actual change var changePassResult = _membershipHelper.ChangePassword( - membershipUser.UserName, changePasswordModel, BackOfficeProvider); + membershipUser.UserName, changePasswordModel, BackOfficeProvider); if (changePassResult.Success) { @@ -449,8 +438,8 @@ namespace umbraco.cms.presentation.user throw new ProviderException("Could not find user in the membership provider with login name " + u.LoginName); } - var passwordChangerControl = (passwordChanger) passw.Controls[0]; - var passwordChangerValidator = (CustomValidator) passw.Controls[1].Controls[0].Controls[0]; + var passwordChangerControl = (passwordChanger)passw.Controls[0]; + var passwordChangerValidator = (CustomValidator)passw.Controls[1].Controls[0].Controls[0]; //perform the changing password logic ChangePassword(passwordChangerControl, membershipUser, passwordChangerValidator); @@ -463,7 +452,7 @@ namespace umbraco.cms.presentation.user u.Name = uname.Text.Trim(); u.Language = userLanguage.SelectedValue; u.UserType = UserType.GetUserType(int.Parse(userType.SelectedValue)); - u.Email = email.Text.Trim(); + u.Email = email.Text.Trim(); u.LoginName = lname.Text; u.Disabled = Disabled.Checked; u.NoConsole = NoConsole.Checked; @@ -477,9 +466,9 @@ namespace umbraco.cms.presentation.user else startNode = -1; } - u.StartNodeId = startNode; - - + u.StartNodeId = startNode; + + int mstartNode; if (int.TryParse(mediaPicker.Value, out mstartNode) == false) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs index 65fbf2537b..954cd3860b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs @@ -34,7 +34,8 @@ namespace umbraco.presentation.webservices [ScriptService] public class codeEditorSave : UmbracoAuthorizedWebService { - + + [Obsolete("This method has been superceded by the REST service /Umbraco/RestServices/SaveFile/SaveStylesheet which is powered by the SaveFileController.")] [WebMethod] public string SaveCss(string fileName, string oldName, string fileContents, int fileID) { @@ -355,6 +356,7 @@ namespace umbraco.presentation.webservices // return "false"; //} + [Obsolete("This method has been superceded by the REST service /Umbraco/RestServices/SaveFile/SaveScript which is powered by the SaveFileController.")] [WebMethod] public string SaveScript(string filename, string oldName, string contents) { diff --git a/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs b/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs index 3e548c52a1..dc48fdc917 100644 --- a/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs +++ b/src/UmbracoExamine/LocalStorage/LocalTempStorageIndexer.cs @@ -18,6 +18,7 @@ namespace UmbracoExamine.LocalStorage internal enum InitializeDirectoryFlags { Success = 0, + SuccessNoIndexExists = 1, FailedCorrupt = 100, FailedLocked = 101, @@ -56,24 +57,41 @@ namespace UmbracoExamine.LocalStorage baseLuceneDirectory, //flag to disable the mirrored folder if not successful (int)success >= 100); - + + //If the master index simply doesn't exist, we don't continue to try to open anything since there will + // actually be nothing there. + if (success == InitializeDirectoryFlags.SuccessNoIndexExists) + { + return; + } //Try to open the reader, this will fail if the index is corrupt and we'll need to handle that - - try + var result = DelegateExtensions.RetryUntilSuccessOrMaxAttempts(i => { - using (IndexReader.Open( - LuceneDirectory, - DeletePolicyTracker.Current.GetPolicy(LuceneDirectory), - true)) + try { + using (IndexReader.Open( + LuceneDirectory, + DeletePolicyTracker.Current.GetPolicy(LuceneDirectory), + true)) + { + } + + return Attempt.Succeed(true); } - } - catch (Exception ex) + catch (Exception ex) + { + LogHelper.WarnWithException( + string.Format("Could not open an index reader, local temp storage index is empty or corrupt... retrying... {0}", configuredPath), + ex); + } + return Attempt.Fail(false); + }, 5, TimeSpan.FromSeconds(1)); + + if (result.Success == false) { - LogHelper.WarnWithException( - string.Format("Could not open an index reader, local temp storage index is empty or corrupt... attempting to clear index files in local temp storage, will operate from main storage only {0}", configuredPath), - ex); + LogHelper.Warn( + string.Format("Could not open an index reader, local temp storage index is empty or corrupt... attempting to clear index files in local temp storage, will operate from main storage only {0}", configuredPath)); ClearFilesInPath(TempPath); @@ -83,7 +101,7 @@ namespace UmbracoExamine.LocalStorage baseLuceneDirectory, //Disable mirrored index, we're kind of screwed here only use master index true); - } + } break; case LocalStorageType.LocalOnly: @@ -181,69 +199,47 @@ namespace UmbracoExamine.LocalStorage /// private Attempt TryCreateWriterWithRetry(Lucene.Net.Store.Directory baseLuceneDirectory, Analyzer analyzer) { - var maxTries = 50; + var maxTries = 5; - //try now - var writerAttempt = TryCreateWriter(baseLuceneDirectory, analyzer); - if (writerAttempt) return writerAttempt; - - var currentTry = 0; - while (currentTry < maxTries) + var result = DelegateExtensions.RetryUntilSuccessOrMaxAttempts((currentTry) => { - LogHelper.Info("Could not create writer on {0}, retrying ....", baseLuceneDirectory.ToString); - - //first wait then retry - Thread.Sleep(1000); - //last try... - if (currentTry == (maxTries - 1)) + if (currentTry == maxTries) { LogHelper.Info("Could not acquire index lock, attempting to force unlock it..."); //unlock it! IndexWriter.Unlock(baseLuceneDirectory); } - writerAttempt = TryCreateWriter(baseLuceneDirectory, analyzer); + var writerAttempt = TryCreateWriter(baseLuceneDirectory, analyzer); + if (writerAttempt) return writerAttempt; + LogHelper.Info("Could not create writer on {0}, retrying ....", baseLuceneDirectory.ToString); + return Attempt.Fail(); + }, 5, TimeSpan.FromSeconds(1)); - //if successful, exit loop - if (writerAttempt) break; - - currentTry++; - } - - return writerAttempt; + return result; } private bool TryWaitForDirectoryUnlock(Lucene.Net.Store.Directory dir) { - var maxTries = 50; + var maxTries = 5; - //try now - if (IndexWriter.IsLocked(dir) == false) return true; - - var currentTry = 0; - while (currentTry < maxTries) + var result = DelegateExtensions.RetryUntilSuccessOrMaxAttempts((currentTry) => { - LogHelper.Info("Could not acquire directory lock for {0} writer, retrying ....", dir.ToString); - - //first wait then retry - Thread.Sleep(1000); - //last try... - if (currentTry == (maxTries-1)) + if (currentTry == maxTries) { LogHelper.Info("Could not acquire directory lock, attempting to force unlock it..."); //unlock it! IndexWriter.Unlock(dir); } - //try again - if (IndexWriter.IsLocked(dir) == false) return true; + if (IndexWriter.IsLocked(dir) == false) return Attempt.Succeed(true); + LogHelper.Info("Could not acquire directory lock for {0} writer, retrying ....", dir.ToString); + return Attempt.Fail(); + }, 5, TimeSpan.FromSeconds(1)); - currentTry++; - } - - return false; + return result; } private InitializeDirectoryFlags InitializeLocalIndexAndDirectory(Lucene.Net.Store.Directory baseLuceneDirectory, Analyzer analyzer, string configuredPath) @@ -256,7 +252,7 @@ namespace UmbracoExamine.LocalStorage } //copy index if it exists, don't do anything if it's not there - if (IndexReader.IndexExists(baseLuceneDirectory) == false) return InitializeDirectoryFlags.Success; + if (IndexReader.IndexExists(baseLuceneDirectory) == false) return InitializeDirectoryFlags.SuccessNoIndexExists; var writerAttempt = TryCreateWriterWithRetry(baseLuceneDirectory, analyzer); @@ -269,6 +265,7 @@ namespace UmbracoExamine.LocalStorage //Try to open the reader from the source, this will fail if the index is corrupt and we'll need to handle that try { + //NOTE: To date I've not seen this error occur using (writerAttempt.Result.GetReader()) { } diff --git a/src/UmbracoExamine/UmbracoContentIndexer.cs b/src/UmbracoExamine/UmbracoContentIndexer.cs index de76ab8e79..613304c4ff 100644 --- a/src/UmbracoExamine/UmbracoContentIndexer.cs +++ b/src/UmbracoExamine/UmbracoContentIndexer.cs @@ -145,6 +145,7 @@ namespace UmbracoExamine = new List { new StaticField("id", FieldIndexTypes.NOT_ANALYZED, false, string.Empty), + new StaticField("key", FieldIndexTypes.NOT_ANALYZED, false, string.Empty), new StaticField( "version", FieldIndexTypes.NOT_ANALYZED, false, string.Empty), new StaticField( "parentID", FieldIndexTypes.NOT_ANALYZED, false, string.Empty), new StaticField( "level", FieldIndexTypes.NOT_ANALYZED, true, "NUMBER"), diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 779941ef79..835ee43ff2 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -82,8 +82,8 @@ ..\Solution Items\TheFARM-Public.snk - - ..\packages\Examine.0.1.67.0\lib\Examine.dll + + ..\packages\Examine.0.1.68.0\lib\Examine.dll True diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index b659410f2c..722e13f2d5 100644 --- a/src/UmbracoExamine/packages.config +++ b/src/UmbracoExamine/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config index f7adf586d8..624da5265a 100644 --- a/src/umbraco.MacroEngines/packages.config +++ b/src/umbraco.MacroEngines/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index 165eb1226f..ec82336916 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -45,8 +45,8 @@ false - - ..\packages\Examine.0.1.67.0\lib\Examine.dll + + ..\packages\Examine.0.1.68.0\lib\Examine.dll True diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index 90091cc80e..661e620056 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -1181,6 +1181,7 @@ order by level,sortOrder"; { // attributes x.Attributes.Append(xmlHelper.addAttribute(xd, "id", this.Id.ToString())); + x.Attributes.Append(xmlHelper.addAttribute(xd, "key", this.UniqueId.ToString())); if (this.Level > 1) x.Attributes.Append(xmlHelper.addAttribute(xd, "parentID", this.Parent.Id.ToString())); else diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs index f81ecce499..36eafb91a2 100644 --- a/src/umbraco.cms/businesslogic/Content.cs +++ b/src/umbraco.cms/businesslogic/Content.cs @@ -408,6 +408,7 @@ namespace umbraco.cms.businesslogic // attributes x.Attributes.Append(XmlHelper.AddAttribute(xd, "id", this.Id.ToString())); + x.Attributes.Append(XmlHelper.AddAttribute(xd, "key", this.UniqueId.ToString())); x.Attributes.Append(XmlHelper.AddAttribute(xd, "version", this.Version.ToString())); if (this.Level > 1) x.Attributes.Append(XmlHelper.AddAttribute(xd, "parentID", this.Parent.Id.ToString())); diff --git a/src/umbraco.cms/businesslogic/web/Access.cs b/src/umbraco.cms/businesslogic/web/Access.cs index 8271fa581f..b2d4b4c103 100644 --- a/src/umbraco.cms/businesslogic/web/Access.cs +++ b/src/umbraco.cms/businesslogic/web/Access.cs @@ -76,7 +76,7 @@ namespace umbraco.cms.businesslogic.web Constants.Conventions.PublicAccess.MemberRoleRuleType, role); - if (entry == null) + if (entry.Success == false && entry.Result.Entity == null) { throw new Exception("Document is not protected!"); } @@ -95,12 +95,14 @@ namespace umbraco.cms.businesslogic.web if (content == null) throw new Exception("No content found with document id " + DocumentId); - var entry = ApplicationContext.Current.Services.PublicAccessService.AddOrUpdateRule( - content, - Constants.Conventions.PublicAccess.MemberGroupIdRuleType, - MemberGroupId.ToString(CultureInfo.InvariantCulture)); - - Save(); + if (ApplicationContext.Current.Services.PublicAccessService.AddOrUpdateRule( + content, + Constants.Conventions.PublicAccess.MemberGroupIdRuleType, + MemberGroupId.ToString(CultureInfo.InvariantCulture))) + { + Save(); + } + } [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)] @@ -111,12 +113,14 @@ namespace umbraco.cms.businesslogic.web if (content == null) throw new Exception("No content found with document id " + DocumentId); - ApplicationContext.Current.Services.PublicAccessService.AddOrUpdateRule( - content, - Constants.Conventions.PublicAccess.MemberIdRuleType, - MemberId.ToString(CultureInfo.InvariantCulture)); - - Save(); + if (ApplicationContext.Current.Services.PublicAccessService.AddOrUpdateRule( + content, + Constants.Conventions.PublicAccess.MemberIdRuleType, + MemberId.ToString(CultureInfo.InvariantCulture))) + { + Save(); + } + } public static void AddMembershipUserToDocument(int documentId, string membershipUserName) @@ -133,14 +137,17 @@ namespace umbraco.cms.businesslogic.web Constants.Conventions.PublicAccess.MemberUsernameRuleType, membershipUserName); - if (entry == null) + if (entry.Success == false && entry.Result.Entity == null) { throw new Exception("Document is not protected!"); } - Save(); - - new Access().FireAfterAddMembershipUserToDocument(doc, membershipUserName, e); + if (entry) + { + Save(); + new Access().FireAfterAddMembershipUserToDocument(doc, membershipUserName, e); + } + } [Obsolete("This method is no longer supported. Use the ASP.NET MemberShip methods instead", true)] @@ -153,11 +160,15 @@ namespace umbraco.cms.businesslogic.web Constants.Conventions.PublicAccess.MemberGroupIdRuleType, MemberGroupId.ToString(CultureInfo.InvariantCulture)); - if (entry == null) + if (entry.Success == false && entry.Result.Entity == null) { throw new Exception("Document is not protected!"); } - Save(); + + if (entry) + { + Save(); + } } public static void RemoveMembershipRoleFromDocument(int documentId, string role) @@ -168,14 +179,15 @@ namespace umbraco.cms.businesslogic.web if (e.Cancel) return; - ApplicationContext.Current.Services.PublicAccessService.RemoveRule( + if (ApplicationContext.Current.Services.PublicAccessService.RemoveRule( doc.ContentEntity, Constants.Conventions.PublicAccess.MemberRoleRuleType, - role); - - Save(); - - new Access().FireAfterRemoveMemberShipRoleFromDocument(doc, role, e); + role)) + { + Save(); + new Access().FireAfterRemoveMemberShipRoleFromDocument(doc, role, e); + }; + } public static bool RenameMemberShipRole(string oldRolename, string newRolename) @@ -222,11 +234,12 @@ namespace umbraco.cms.businesslogic.web new List()); } - ApplicationContext.Current.Services.PublicAccessService.Save(entry); - - Save(); - - new Access().FireAfterAddProtection(new Document(DocumentId), e); + if (ApplicationContext.Current.Services.PublicAccessService.Save(entry)) + { + Save(); + new Access().FireAfterAddProtection(new Document(DocumentId), e); + } + } public static void RemoveProtection(int DocumentId) diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 1df6dd7c40..0c5f2c3025 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -1288,6 +1288,7 @@ namespace umbraco.cms.businesslogic.web // attributes x.Attributes.Append(addAttribute(xd, "id", Id.ToString())); + x.Attributes.Append(addAttribute(xd, "key", UniqueId.ToString())); // x.Attributes.Append(addAttribute(xd, "version", Version.ToString())); if (Level > 1) x.Attributes.Append(addAttribute(xd, "parentID", Parent.Id.ToString())); diff --git a/src/umbraco.cms/businesslogic/web/Domain.cs b/src/umbraco.cms/businesslogic/web/Domain.cs index fe695a25d6..d47766e36e 100644 --- a/src/umbraco.cms/businesslogic/web/Domain.cs +++ b/src/umbraco.cms/businesslogic/web/Domain.cs @@ -107,9 +107,10 @@ namespace umbraco.cms.businesslogic.web if (!e.Cancel) { - ApplicationContext.Current.Services.DomainService.Save(DomainEntity); - - FireAfterSave(e); + if (ApplicationContext.Current.Services.DomainService.Save(DomainEntity)) + { + FireAfterSave(e); + } } } @@ -165,11 +166,13 @@ namespace umbraco.cms.businesslogic.web RootContentId = RootNodeId, LanguageId = LanguageId }; - ApplicationContext.Current.Services.DomainService.Save(domain); - - var e = new NewEventArgs(); - var legacyModel = new Domain(domain); - legacyModel.OnNew(e); + if (ApplicationContext.Current.Services.DomainService.Save(domain)) + { + var e = new NewEventArgs(); + var legacyModel = new Domain(domain); + legacyModel.OnNew(e); + } + } #endregion diff --git a/src/umbraco.controls/CodeArea.cs b/src/umbraco.controls/CodeArea.cs index 698aea2213..3481341ade 100644 --- a/src/umbraco.controls/CodeArea.cs +++ b/src/umbraco.controls/CodeArea.cs @@ -80,10 +80,11 @@ namespace umbraco.uicontrols ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/mode/" + CodeBase.ToString().ToLower() + "/" + CodeBase.ToString().ToLower() + ".js", "UmbracoRoot", ClientDependencyType.Javascript); if (CodeBase == EditorType.HtmlMixed) { + ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/xml/xml.js", "UmbracoRoot", ClientDependencyType.Javascript); + ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/javascript/javascript.js", "UmbracoRoot", ClientDependencyType.Javascript); + ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/css/css.js", "UmbracoRoot", ClientDependencyType.Javascript); ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/htmlmixed/htmlmixed.js", "UmbracoRoot", ClientDependencyType.Javascript); - //ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/xml/xml.js", "UmbracoRoot", ClientDependencyType.Javascript); - //ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/javascript/javascript.js", "UmbracoRoot", ClientDependencyType.Javascript); - //ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/css/css.js", "UmbracoRoot", ClientDependencyType.Javascript); + } ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/addon/search/search.js", "UmbracoRoot", ClientDependencyType.Javascript);