- Enter a postcode for country {{config.country}}
+ Enter a postcode for country {{model.config.country}}
-
diff --git a/src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Views/RegexEditor.html b/src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Views/RegexEditor.html
index 25c80e39c4..75e6633415 100644
--- a/src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Views/RegexEditor.html
+++ b/src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Views/RegexEditor.html
@@ -1,10 +1,12 @@
+
{{model.value}}
+
- Value in the format of {{config}}
+ Value in the format of {{model.config}}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ad3a825bb2..3c774aef7e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -114,9 +114,9 @@
False
..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js
new file mode 100644
index 0000000000..4cf8930596
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BACKUP.83341.js
@@ -0,0 +1,76 @@
+app.config(function ($routeProvider) {
+ $routeProvider
+ .when('/framed/:url', {
+ //This occurs when we need to launch some content in an iframe
+ templateUrl: function (rp) {
+ if (!rp.url)
+ throw "A framed resource must have a url route parameter";
+
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:tree', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ if (rp.tree === "")
+ {
+ rp.tree = "default";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:tree/:method', {
+ templateUrl: function(rp) {
+ if (!rp.method){
+ return "views/common/dashboard.html";
+ }
+
+ if(rp.tree === "default" || rp.tree === ""){
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }else{
+ return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html';
+ }
+ }
+ })
+ .when('/:section/:tree/:method/:id', {
+ templateUrl: function (rp) {
+<<<<<<< HEAD
+ return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html';
+=======
+ if (!rp.method)
+ return "views/common/dashboard.html";
+
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+>>>>>>> 4a8026c902fd1f6afa32749882611c7e4d37e882
+ }
+ })
+ .otherwise({ redirectTo: '/content/document' });
+ }).config(function ($locationProvider) {
+
+ //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
+ // $locationProvider.html5Mode(true); //turn html5 mode on
+});
+
+
+app.run(['userService', function (userService) {
+ // Get the current user when the application starts
+ // (in case they are still logged in from a previous session)
+ userService.isAuthenticated();
+}]);
diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js
new file mode 100644
index 0000000000..799f375557
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/routes.js.BASE.83341.js
@@ -0,0 +1,56 @@
+app.config(function ($routeProvider) {
+ $routeProvider
+ .when('/:section', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/framed/:url', {
+ //This occurs when we need to launch some content in an iframe
+ templateUrl: function (rp) {
+ if (!rp.url)
+ throw "A framed resource must have a url route parameter";
+
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:method', {
+ templateUrl: function(rp) {
+ if (!rp.method)
+ return "views/common/dashboard.html";
+
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }
+ })
+ .when('/:section/:method/:id', {
+ templateUrl: function (rp) {
+ if (!rp.method)
+ return "views/common/dashboard.html";
+
+ ////here we detect recycle bins, all recycle bins start with -2* (i.e. -20, -21)
+ //if (rp.id.startsWith("-2")) {
+ // return 'views/' + rp.section + '/recyclebin.html';
+ //}
+
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }
+ })
+ .otherwise({ redirectTo: '/content' });
+ }).config(function ($locationProvider) {
+
+ //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
+ // $locationProvider.html5Mode(true); //turn html5 mode on
+});
+
+
+app.run(['userService', function (userService) {
+ // Get the current user when the application starts
+ // (in case they are still logged in from a previous session)
+ userService.isAuthenticated();
+}]);
diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js
new file mode 100644
index 0000000000..34f194e94f
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/routes.js.LOCAL.83341.js
@@ -0,0 +1,69 @@
+app.config(function ($routeProvider) {
+ $routeProvider
+ .when('/framed/:url', {
+ //This occurs when we need to launch some content in an iframe
+ templateUrl: function (rp) {
+ if (!rp.url)
+ throw "A framed resource must have a url route parameter";
+
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:tree', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ if (rp.tree === "")
+ {
+ rp.tree = "default";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:tree/:method', {
+ templateUrl: function(rp) {
+ if (!rp.method){
+ return "views/common/dashboard.html";
+ }
+
+ if(rp.tree === "default" || rp.tree === ""){
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }else{
+ return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html';
+ }
+ }
+ })
+ .when('/:section/:tree/:method/:id', {
+ templateUrl: function (rp) {
+ return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html';
+ }
+ })
+ .otherwise({ redirectTo: '/content/document' });
+ }).config(function ($locationProvider) {
+
+ //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
+ // $locationProvider.html5Mode(true); //turn html5 mode on
+});
+
+
+app.run(['userService', function (userService) {
+ // Get the current user when the application starts
+ // (in case they are still logged in from a previous session)
+ userService.isAuthenticated();
+}]);
diff --git a/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js b/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js
new file mode 100644
index 0000000000..3ff78c119b
--- /dev/null
+++ b/src/Umbraco.Web.UI/Umbraco/js/routes.js.REMOTE.83341.js
@@ -0,0 +1,51 @@
+app.config(function ($routeProvider) {
+ $routeProvider
+ .when('/:section', {
+ templateUrl: function (rp) {
+ if (rp.section === "default")
+ {
+ rp.section = "content";
+ }
+
+ rp.url = "dashboard.aspx?app=" + rp.section;
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/framed/:url', {
+ //This occurs when we need to launch some content in an iframe
+ templateUrl: function (rp) {
+ if (!rp.url)
+ throw "A framed resource must have a url route parameter";
+
+ return 'views/common/legacy.html';
+ }
+ })
+ .when('/:section/:method', {
+ templateUrl: function(rp) {
+ if (!rp.method)
+ return "views/common/dashboard.html";
+
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }
+ })
+ .when('/:section/:method/:id', {
+ templateUrl: function (rp) {
+ if (!rp.method)
+ return "views/common/dashboard.html";
+
+ return 'views/' + rp.section + '/' + rp.method + '.html';
+ }
+ })
+ .otherwise({ redirectTo: '/content' });
+ }).config(function ($locationProvider) {
+
+ //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
+ // $locationProvider.html5Mode(true); //turn html5 mode on
+});
+
+
+app.run(['userService', function (userService) {
+ // Get the current user when the application starts
+ // (in case they are still logged in from a previous session)
+ userService.isAuthenticated();
+}]);
diff --git a/src/Umbraco.Web.UI/config/ExamineIndex.config b/src/Umbraco.Web.UI/config/ExamineIndex.config
index 9cea8cb7c6..a853847ecb 100644
--- a/src/Umbraco.Web.UI/config/ExamineIndex.config
+++ b/src/Umbraco.Web.UI/config/ExamineIndex.config
@@ -26,6 +26,5 @@ More information and documentation can be found on CodePlex: http://umbracoexami
Config { get; set; }
+ public IDictionary Config { get; set; }
[DataMember(Name = "hideLabel")]
public bool HideLabel { get; set; }
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
index 42782b1b14..17f4f39680 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
@@ -12,7 +12,6 @@ namespace Umbraco.Web.Models.ContentEditing
public IDataTypeDefinition DataType { get; set; }
public string Label { get; set; }
public string Description { get; set; }
- public PropertyEditor PropertyEditor { get; set; }
public bool IsRequired { get; set; }
public string ValidationRegExp { get; set; }
}
diff --git a/src/Umbraco.Web/Models/ContentEditing/TemplateBasic.cs b/src/Umbraco.Web/Models/ContentEditing/TemplateBasic.cs
new file mode 100644
index 0000000000..dbb3d6c8bd
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/TemplateBasic.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+ [DataContract(Name = "template", Namespace = "")]
+ public class TemplateBasic
+ {
+ [DataMember(Name = "id", IsRequired = true)]
+ [Required]
+ public int Id { get; set; }
+
+ [DataMember(Name = "name", IsRequired = true)]
+ [Required(AllowEmptyStrings = false)]
+ public string Name { get; set; }
+
+ [DataMember(Name = "alias", IsRequired = true)]
+ [Required(AllowEmptyStrings = false)]
+ public string Alias { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
index ac8bb18b8b..32313cf75e 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
@@ -14,6 +14,11 @@ namespace Umbraco.Web.Models.Mapping
internal class ContentPropertyBasicConverter : TypeConverter
where T : ContentPropertyBasic, new()
{
+ ///
+ /// Assigns the PropertyEditor, Id, Alias and Value to the property
+ ///
+ ///
+ {
+ {"format", "yyyy-MM-dd"},
+ {"pickTime", false}
+ };
+ }
+
+ private IDictionary _defaultPreVals;
+
+ ///
+ /// Overridden because we ONLY support Date (no time) format and we don't have pre-values in the db.
+ ///
+ public override IDictionary DefaultPreValues
+ {
+ get { return _defaultPreVals; }
+ set { _defaultPreVals = value; }
+ }
+
+ protected override ValueEditor CreateValueEditor()
+ {
+ var baseEditor = base.CreateValueEditor();
+
+ return new DateValueEditor
+ {
+ View = baseEditor.View
+ };
+ }
+
+ ///
+ /// CUstom value editor so we can serialize with the correct date format (excluding time)
+ /// and includes the date validator
+ ///
+ private class DateValueEditor : ValueEditor
+ {
+ public DateValueEditor()
+ {
+ Validators = new List { new DateTimeValidator() };
+ }
+
+ public override string SerializeValue(object dbValue)
+ {
+ var date = dbValue.TryConvertTo();
+ if (date.Success == false || date.Result == null)
+ {
+ return string.Empty;
+ }
+ //Dates will be formatted as yyyy-MM-dd
+ return date.Result.Value.ToString("yyyy-MM-dd");
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
new file mode 100644
index 0000000000..55198a36a1
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+ [PropertyEditor(Constants.PropertyEditors.DateTime, "Date/Time", "datepicker", ValueType = "DATETIME")]
+ public class DateTimePropertyEditor : PropertyEditor
+ {
+ public DateTimePropertyEditor()
+ {
+ _defaultPreVals = new Dictionary
+ {
+ {"format", "yyyy-MM-dd HH:mm:ss"}
+ };
+ }
+
+ private IDictionary _defaultPreVals;
+
+ ///
+ /// Overridden because we ONLY support Date + Time format and we don't have pre-values in the db.
+ ///
+ public override IDictionary DefaultPreValues
+ {
+ get { return _defaultPreVals; }
+ set { _defaultPreVals = value; }
+ }
+
+ protected override ValueEditor CreateValueEditor()
+ {
+ var editor = base.CreateValueEditor();
+
+ editor.Validators = new List { new DateTimeValidator() };
+
+ return editor;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs b/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs
new file mode 100644
index 0000000000..c1f7277a05
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/DateTimeValidator.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core;
+
+namespace Umbraco.Web.PropertyEditors
+{
+ ///
+ /// Used to validate if the value is a valid date/time
+ ///
+ internal class DateTimeValidator : ValidatorBase
+ {
+ public override IEnumerable Validate(string value, string preValues, PropertyEditor editor)
+ {
+ DateTime dt;
+ if (value.IsNullOrWhiteSpace() == false && DateTime.TryParse(value, out dt) == false)
+ {
+ yield return new ValidationResult(string.Format("The string value {0} cannot be parsed into a DateTime", value),
+ new[]
+ {
+ //we only store a single value for this editor so the 'member' or 'field'
+ // we'll associate this error with will simply be called 'value'
+ "value"
+ });
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8244f001e9..168657080a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -106,9 +106,9 @@
False
..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
@@ -299,7 +299,11 @@
..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
diff --git a/src/UmbracoExamine.Azure/packages.config b/src/UmbracoExamine.Azure/packages.config
index 7721836e09..54eb3830da 100644
--- a/src/UmbracoExamine.Azure/packages.config
+++ b/src/UmbracoExamine.Azure/packages.config
@@ -2,7 +2,7 @@
..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.dll
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
diff --git a/src/UmbracoExamine.PDF.Azure/packages.config b/src/UmbracoExamine.PDF.Azure/packages.config
index 7721836e09..54eb3830da 100644
--- a/src/UmbracoExamine.PDF.Azure/packages.config
+++ b/src/UmbracoExamine.PDF.Azure/packages.config
@@ -2,7 +2,7 @@
onError = (e) => OnIndexingError(new IndexingErrorEventArgs("Could not read PDF", -1, e));
- var txt = pdf.ParsePdfText(file.FullName, onError);
+ var txt = pdf.GetTextFromAllPages(file.FullName, onError);
return txt;
}
@@ -193,16 +195,21 @@ namespace UmbracoExamine.PDF
static PDFParser()
{
- lock (m_Locker)
+ lock (Locker)
{
- m_UnsupportedRange = new List();
- m_UnsupportedRange.AddRange(Enumerable.Range(0x0000, 0x001F));
- m_UnsupportedRange.Add(0x1F);
+ UnsupportedRange = new HashSet();
+ foreach (var c in Enumerable.Range(0x0000, 0x001F))
+ {
+ UnsupportedRange.Add((char) c);
+ }
+ UnsupportedRange.Add((char)0x1F);
+ //replace line breaks with space
+ ReplaceWithSpace = new HashSet {'\r', '\n'};
}
}
- private static readonly object m_Locker = new object();
+ private static readonly object Locker = new object();
///
/// Stores the unsupported range of character
@@ -214,61 +221,68 @@ namespace UmbracoExamine.PDF
/// http://en.wikipedia.org/wiki/Unicode
/// http://en.wikipedia.org/wiki/Basic_Multilingual_Plane
///
- private static List m_UnsupportedRange;
+ private static HashSet UnsupportedRange;
- ///
- /// Return only the valid string contents of the PDF
- ///
- /// onError)
+ private static HashSet ReplaceWithSpace;
+
+ [SecuritySafeCritical]
+ public string GetTextFromAllPages(string pdfPath, Action onError)
{
- var sb = new StringBuilder();
+ var output = new StringWriter();
- var reader = new PdfReader(sourcePDF);
- PRTokeniser token = null;
- var tknValue = String.Empty;
-
- for (var i = 1; (i <= reader.NumberOfPages); i++)
+ try
{
- var pageBytes = reader.GetPageContent(i);
- if (pageBytes != null)
- {
- token = new PRTokeniser(pageBytes);
- try
- {
- while (token.NextToken())
- {
- var tknType = token.TokenType;
- tknValue = token.StringValue;
- if ((tknType == PRTokeniser.TokType.STRING))
- {
- foreach (var s in tknValue)
- {
- //strip out unsupported characters, based on unicode tables.
- if (!m_UnsupportedRange.Contains(s))
- {
- sb.Append(s);
- }
- }
+ var reader = new PdfReader(pdfPath);
- }
- }
- }
- catch (InvalidPdfException ex)
- {
- onError(ex);
- }
+ for (int i = 1; i <= reader.NumberOfPages; i++)
+ {
+ var result =
+ ExceptChars(
+ PdfTextExtractor.GetTextFromPage(reader, i, new SimpleTextExtractionStrategy()),
+ UnsupportedRange,
+ ReplaceWithSpace);
+ output.Write(result);
}
}
+ catch (Exception ex)
+ {
+ onError(ex);
+ }
- return sb.ToString();
+ return output.ToString();
}
}
+
+ ///
+ /// remove all toExclude chars from string
+ ///
+ /// toExclude, HashSet replaceWithSpace)
+ {
+ var sb = new StringBuilder(str.Length);
+ for (var i = 0; i < str.Length; i++)
+ {
+ var c = str[i];
+ if (toExclude.Contains(c) == false)
+ {
+ if (replaceWithSpace.Contains(c))
+ {
+ sb.Append(" ");
+ }
+ else
+ {
+ sb.Append(c);
+ }
+ }
+
+ }
+ return sb.ToString();
+ }
#endregion
}
diff --git a/src/UmbracoExamine.PDF/Properties/AssemblyInfo.cs b/src/UmbracoExamine.PDF/Properties/AssemblyInfo.cs
index 72fe9de54a..04b415b98d 100644
--- a/src/UmbracoExamine.PDF/Properties/AssemblyInfo.cs
+++ b/src/UmbracoExamine.PDF/Properties/AssemblyInfo.cs
@@ -28,4 +28,5 @@ using System.Security;
[assembly: AssemblyVersion("0.6.0.*")]
[assembly: AssemblyFileVersion("0.6.0.*")]
-[assembly: AllowPartiallyTrustedCallers]
\ No newline at end of file
+//Unfortunately itextsharp does not natively support full trust
+//[assembly: AllowPartiallyTrustedCallers]
\ No newline at end of file
diff --git a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
index b5a4cca007..6bdc3d3666 100644
--- a/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
+++ b/src/UmbracoExamine.PDF/UmbracoExamine.PDF.csproj
@@ -46,9 +46,9 @@
false
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
diff --git a/src/UmbracoExamine.PDF/packages.config b/src/UmbracoExamine.PDF/packages.config
index abf2bfc49c..1d29bc3cc6 100644
--- a/src/UmbracoExamine.PDF/packages.config
+++ b/src/UmbracoExamine.PDF/packages.config
@@ -1,6 +1,6 @@
-
///
/// An attempt is made to call
+ [SecuritySafeCritical]
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
{
diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj
index aeb3a0ce05..5db7139a00 100644
--- a/src/UmbracoExamine/UmbracoExamine.csproj
+++ b/src/UmbracoExamine/UmbracoExamine.csproj
@@ -82,9 +82,9 @@
..\Solution Items\TheFARM-Public.snk
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
diff --git a/src/UmbracoExamine/UmbracoExamineSearcher.cs b/src/UmbracoExamine/UmbracoExamineSearcher.cs
index 68f07f45e1..7406e98f8e 100644
--- a/src/UmbracoExamine/UmbracoExamineSearcher.cs
+++ b/src/UmbracoExamine/UmbracoExamineSearcher.cs
@@ -45,6 +45,7 @@ namespace UmbracoExamine
}
}
+ [SecuritySafeCritical]
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
{
if (name == null) throw new ArgumentNullException("name");
diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config
index 0d7f689f95..31026832a5 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 023ebfc6b9..404506a7aa 100644
--- a/src/umbraco.MacroEngines/packages.config
+++ b/src/umbraco.MacroEngines/packages.config
@@ -1,6 +1,6 @@
- false
-
+
False
- ..\packages\Examine.0.1.51.2941\lib\Examine.dll
+ ..\packages\Examine.0.1.52.2941\lib\Examine.dll
False
diff --git a/src/umbraco.businesslogic/ui.cs b/src/umbraco.businesslogic/ui.cs
index cfb0a1832d..4416ed2451 100644
--- a/src/umbraco.businesslogic/ui.cs
+++ b/src/umbraco.businesslogic/ui.cs
@@ -1,4 +1,5 @@
using System;
+using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using System.Web;
@@ -308,27 +309,35 @@ namespace umbraco
{
var cacheKey = "uitext_" + language;
- return ApplicationContext.Current.ApplicationCache.GetCacheItem(
- cacheKey,
- CacheItemPriority.Default,
- new CacheDependency(IOHelper.MapPath(UmbracoPath + "/config/lang/" + language + ".xml")),
- () =>
- {
- using (var langReader = new XmlTextReader(IOHelper.MapPath(UmbracoPath + "/config/lang/" + language + ".xml")))
+ var file = IOHelper.MapPath(UmbracoPath + "/config/lang/" + language + ".xml");
+ if (File.Exists(file))
+ {
+ return ApplicationContext.Current.ApplicationCache.GetCacheItem(
+ cacheKey,
+ CacheItemPriority.Default,
+ new CacheDependency(IOHelper.MapPath(UmbracoPath + "/config/lang/" + language + ".xml")),
+ () =>
{
- try
+ using (var langReader = new XmlTextReader(IOHelper.MapPath(UmbracoPath + "/config/lang/" + language + ".xml")))
{
- var langFile = new XmlDocument();
- langFile.Load(langReader);
- return langFile;
+ try
+ {
+ var langFile = new XmlDocument();
+ langFile.Load(langReader);
+ return langFile;
+ }
+ catch (Exception e)
+ {
+ LogHelper.Error("Error reading umbraco language xml source (" + language + ")", e);
+ return null;
+ }
}
- catch (Exception e)
- {
- LogHelper.Error("Error reading umbraco language xml source (" + language + ")", e);
- return null;
- }
- }
- });
+ });
+ }
+ else
+ {
+ return null;
+ }
}
diff --git a/src/umbraco.editorControls/BaseTreePickerEditor.cs b/src/umbraco.editorControls/BaseTreePickerEditor.cs
index 0984a2375b..9908d07e46 100644
--- a/src/umbraco.editorControls/BaseTreePickerEditor.cs
+++ b/src/umbraco.editorControls/BaseTreePickerEditor.cs
@@ -106,7 +106,7 @@ namespace umbraco.editorControls
public void Save()
{
if (ItemIdValue.Value.Trim() != "")
- _data.Value = ItemIdValue.Value.Trim();
+ _data.Value = int.Parse(ItemIdValue.Value.Trim());
else
_data.Value = null;
}
diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
index b002218bd8..979eb06e80 100644
--- a/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
+++ b/src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs
@@ -10,6 +10,7 @@ using System.Xml.Linq;
using ClientDependency.Core;
using Umbraco.Core;
using Umbraco.Core.IO;
+using umbraco.BusinessLogic;
using umbraco.cms.presentation.Trees;
using umbraco.controls.Images;
using umbraco.controls.Tree;
@@ -45,7 +46,15 @@ namespace umbraco.editorControls.MultiNodeTreePicker
//need to add our tree definitions to the collection.
//find the content tree to duplicate
- var contentTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Content, StringComparison.OrdinalIgnoreCase));
+ var contentTree = TreeDefinitionCollection.Instance.SingleOrDefault(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Content, StringComparison.OrdinalIgnoreCase));
+ //have put this here because the legacy content tree no longer exists as a tree def
+ if (contentTree == null)
+ {
+ contentTree = new TreeDefinition(
+ typeof (loadContent),
+ new ApplicationTree(false, true, 0, "content", "content", "Content", ".sprTreeFolder", ".sprTreeFolder_o", "", typeof (loadContent).GetFullNameWithAssembly(), ""),
+ new Application("Content", "content", "content"));
+ }
var filteredContentTree = new TreeDefinition(typeof(FilteredContentTree),
new umbraco.BusinessLogic.ApplicationTree(true, false, 0,
contentTree.Tree.ApplicationAlias,
@@ -59,7 +68,15 @@ namespace umbraco.editorControls.MultiNodeTreePicker
contentTree.App);
//find the media tree to duplicate
- var mediaTree = TreeDefinitionCollection.Instance.Single(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Media, StringComparison.OrdinalIgnoreCase));
+ var mediaTree = TreeDefinitionCollection.Instance.SingleOrDefault(x => string.Equals(x.Tree.Alias, Umbraco.Core.Constants.Applications.Media, StringComparison.OrdinalIgnoreCase));
+ //have put this here because the legacy content tree no longer exists as a tree def
+ if (mediaTree == null)
+ {
+ mediaTree = new TreeDefinition(
+ typeof(loadMedia),
+ new ApplicationTree(false, true, 0, "media", "media", "Media", ".sprTreeFolder", ".sprTreeFolder_o", "", typeof(loadMedia).GetFullNameWithAssembly(), ""),
+ new Application("Media", "media", "media"));
+ }
var filteredMediaTree = new TreeDefinition(typeof(FilteredMediaTree),
new umbraco.BusinessLogic.ApplicationTree(true, false, 0,
mediaTree.Tree.ApplicationAlias,