From 0cb4a9ad9cd144a7e3907b37b92a58f29801f1f7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 7 Nov 2012 09:28:08 -0100 Subject: [PATCH 1/6] Fixes issue where upload will fail in medium trust due to use of FileInfo Related to earrlier fixes for U4-919 --- .../umbraco/webservices/MediaUploader.ashx.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs index e98d306552..51ac1743b2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs @@ -162,7 +162,10 @@ namespace umbraco.presentation.umbraco.webservices { // Ensure we get the filename without the path in IE in intranet mode // http://stackoverflow.com/questions/382464/httppostedfile-filename-different-from-ie - var fileName = new FileInfo(uploadFile.FileName).Name; + var fileName = uploadFile.FileName; + if(fileName.LastIndexOf(@"\") > 0) + fileName = fileName.Substring(fileName.LastIndexOf(@"\") + 1); + fileName = Umbraco.Core.IO.IOHelper.SafeFileName(fileName); var postedMediaFile = new PostedMediaFile From 869915f991fa93968f7e77151336dc4103191359 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 7 Nov 2012 12:12:57 -0100 Subject: [PATCH 2/6] Updated to the Medium Trust-safe version of SQL CE SP1 (assembly version 4.0.0.0 instead of 4.0.0.1) --- lib/SQLCE4/System.Data.SqlServerCe.Entity.dll | Bin 240352 -> 240352 bytes lib/SQLCE4/System.Data.SqlServerCe.dll | Bin 470240 -> 470240 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll b/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll index 3d7692a0b931ba2885e4f5c1f65e28ca55cedcdd..2579399e23737dc4b042cd5721e3482857ca2c72 100644 GIT binary patch delta 964 zcmV;#13UcS)ehj*4v>ff{uhyoP6OJS1hLz70e>5a#aQ-!q4W%>@pg_)SttjyrY$Bc z=^g~?Lw-T(Pt1G9`I4F-=&wVE8R$-Qb}`rvh@v!RDiQWYk9W*-iC^tBxxxG*&zEkE zaTBn@g#)IWgo*rP3kD;q77CjX;y*#O;9|vr>Mxs^fstWSx)K?^^F&p5gW5d396w$| z^8pNl&;p0h0s*(s0s3+k^`g^6hO8- z6+&kp1=lc|n4j_%q9mrMXBUgH~pNCRRT{yS_}Zz@MU(5g!D(2t1L zrn_g~;Ntp-{tbS5c!>BwEz5ohzN2nEr9}G}<0ra3$jL}}EpLvH1Yot_?QDNx?WCLj zO~_mO_aP9WRr-ZLpp+G^o)k6wAA?UTxA(0~s5RH+%V0BFXwpa)-m%%Af1>y6arMnc z6ED`B=hl9Z|26C-Yt0TV!(=XnUdj#YYmZoBD=)v)}S=&LNQU#76cSoI$=wZ z?TJwH&M>+sTxA5JPH$!~4F(A+hDe6@4FLfK1pows0RTmez&NbEc5LgoMc2q1+6~B; z9^ItnW&$K5Bh7NdGa2%9O3w0Fd7b1OPa)wH;(1>Ci&{IW51m;R2 zfbm_(a*~9VxF>Ao)btRpa57V%Qf$)v=K;sAEYy@GhduC!Cesk*A(sG8Nc;NiuQz+m zM$*7PhYe6-UI?f~(XdTh-njEK`>#M-yTnDc;%06WQ{nS|$NKw~Gc5rdT)f&BsxW(> mEqJQ%YFW`>JGFj|e@c2Iwg(Q$aWoc`GhxOMTLt8R0001^!nQd8 delta 964 zcmV;#13UcS)ehj*4v>ff1sIWvP6I^n1F_q60e=R{0Ubr+2*9#%(M;;@W+^43V^`dj z9(xVZ^4FOmwP(ZurGzzCg*wqYUkTgR&{h*pBCPw{Xc~zb5^4hyzUr zaB^vOVRU7;K#2pm1_3d*`HusP0u%z#%bkq6Z06CDi#X~fBN^`X;f1%Ek^`g^6rON> zBEy&b@LU>JZ0xN9bb4P$d6!YA18IK%D#*bA+5tJ!e5%hm0mdNrE@@Q3*=cDGNS}Ce zsET*&`cczvS9VLHel$b?vk>Qj7nQAw5Ynw+-l z%2IOhc$?*+66b==gpd8RY!eUg&35S=8w#jAtwJ6>x^}qbj-wt8bvuxZXMWoDj)Wo- zQ`QwXhFtft#fk}R&LNQU#76cSQgs8fu z@g3{qD6fImGQ&|aP(1fA4F(A+hDe6@4FLfK1pows0RSs6QJaG3#_Se}1;W2NaVs+v zxDVYm^DE4)&*_GWVb|hQqfRP^ybeIAE!LMV&@+Dqc$&O24X@0vLb& z&5_IxO9m9`ck(_%kMwMyBpyHw+Be;ak_pag^_~;?yPZbRIXX+Vm0k)A-awg9Sbh}X zN~B-t>L{~%bE1WA1;ONQtLhaQ%KK^bw~kIZM71`lWony3FjXXD@iHd!Qz)A2Xlk=# z&|sp=s4tgm$9bqc{Ng2$(=J_|k(EI1O>09Pyy+TQ1H3OcNCRi_sha+8EKhfC3VqXT mG}BezmHxi0|6<5}Vb1ktVq-Id-KYmK{QsEZ37&J30000y*|@X- diff --git a/lib/SQLCE4/System.Data.SqlServerCe.dll b/lib/SQLCE4/System.Data.SqlServerCe.dll index acf228b72645ce58c57db655ebd573a278212517..8d16c2a6dbfecaf3dd33e5ea4ec29a287ce56bf0 100644 GIT binary patch delta 16761 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 delta 16725 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 Date: Tue, 6 Nov 2012 19:21:41 -0100 Subject: [PATCH 3/6] Deleting a Tab now removes it from the list in the browser --- src/umbraco.cms/businesslogic/ContentType.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs index befaa03556..2154ec0118 100644 --- a/src/umbraco.cms/businesslogic/ContentType.cs +++ b/src/umbraco.cms/businesslogic/ContentType.cs @@ -794,6 +794,7 @@ namespace umbraco.cms.businesslogic SqlHelper.ExecuteNonQuery("delete from cmsTab where id =" + id); + InitializeVirtualTabs(); // Remove from cache FlushFromCache(Id); } From d390a4c0a917a5c4074e0f9f2d9b355b94fc2427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Reinke=40Windows-7?= Date: Tue, 6 Nov 2012 20:24:48 -0100 Subject: [PATCH 4/6] Made speech bubbles for MediaTypes act the same as for DocumentTypes --- .../umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs index 08bb6aabba..4c19da705c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs @@ -55,7 +55,7 @@ namespace umbraco.cms.presentation.settings } else if (sce.Message.Contains("Tab")) { - speechBubble(speechBubbleIcon.info, "Tab added", sce.Message); + base.speechBubble(sce.IconType, sce.Message, ""); } else { From 1bceb746fa8c4b41669f8b507c9e0114b3932718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Reinke=40Windows-7?= Date: Tue, 6 Nov 2012 20:32:26 -0100 Subject: [PATCH 5/6] Switched to non obsolete method call --- .../umbraco/settings/EditMediaType.aspx.cs | 7 ++++--- .../umbraco/settings/EditNodeTypeNew.aspx.cs | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs index 4c19da705c..da67180304 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.cs @@ -48,18 +48,19 @@ namespace umbraco.cms.presentation.settings { int mtid = 0; - speechBubble(speechBubbleIcon.save, "Mediatype saved", "Mediatype was successfully saved"); + ClientTools.ShowSpeechBubble(speechBubbleIcon.save, "Mediatype saved", "Mediatype was successfully saved"); + if (int.TryParse(Request.QueryString["id"], out mtid)) new cms.businesslogic.media.MediaType(mtid).Save(); } else if (sce.Message.Contains("Tab")) { - base.speechBubble(sce.IconType, sce.Message, ""); + ClientTools.ShowSpeechBubble(sce.IconType, sce.Message, ""); } else { - base.speechBubble(sce.IconType, sce.Message, ""); + ClientTools.ShowSpeechBubble(sce.IconType, sce.Message, ""); } return true; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs index 4d9303cd1e..0c3be42e00 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs @@ -103,7 +103,7 @@ namespace umbraco.settings if (int.TryParse(Request.QueryString["id"], out dtid)) new cms.businesslogic.web.DocumentType(dtid).Save(); - base.speechBubble(e.IconType, ui.Text("contentTypeSavedHeader"), ""); + ClientTools.ShowSpeechBubble(e.IconType, ui.Text("contentTypeSavedHeader"), ""); ArrayList tmp = new ArrayList(); @@ -132,7 +132,7 @@ namespace umbraco.settings } else { - base.speechBubble(e.IconType, e.Message, ""); + ClientTools.ShowSpeechBubble(e.IconType, e.Message, ""); } handled = true; } From 1a969d76e1fb5dd6d17f0c4f6f349a53b9e083a5 Mon Sep 17 00:00:00 2001 From: pgregorynz Date: Wed, 7 Nov 2012 15:20:19 -1000 Subject: [PATCH 6/6] Revert change to Umbraco Helper as caused issues with the itemRender not being able to process fallback or formating options. --- src/Umbraco.Web/UmbracoHelper.cs | 15 ++++++++------- .../umbraco/templateControls/ItemRenderer.cs | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 8b928454a4..fc7debaecd 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -249,13 +249,14 @@ namespace Umbraco.Web attributesForItem.Add(i.Key, i.Value); } - var item = new Item() - { - NodeId = currentPage.Id.ToString(), - Field = fieldAlias, - TextIfEmpty = altText, - LegacyAttributes = attributesForItem - }; + var item = new Item() + { + //NodeId = currentPage.Id.ToString(); + Field = fieldAlias, + TextIfEmpty = altText, + LegacyAttributes = attributesForItem + }; + var containerPage = new FormlessPage(); containerPage.Controls.Add(item); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs index 7a0b7a50f9..1d7371c5ac 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs @@ -107,7 +107,7 @@ namespace umbraco.presentation.templateControls // content class to lookup field items try { - tempElementContent = GetContentFromDatabase(item.Attributes, tempNodeId.Value, currentField); + tempElementContent = GetContentFromDatabase(item.LegacyAttributes, tempNodeId.Value, currentField); } catch { @@ -248,7 +248,7 @@ namespace umbraco.presentation.templateControls /// The node id. /// The field that should be fetched. /// The contents of the from the content object - protected virtual string GetContentFromDatabase(AttributeCollection itemAttributes, int nodeIdInt, string currentField) + protected virtual string GetContentFromDatabase(AttributeCollectionAdapter itemAttributes, int nodeIdInt, string currentField) { Content c = new Content(nodeIdInt); @@ -256,7 +256,7 @@ namespace umbraco.presentation.templateControls if (property == null) throw new ArgumentException(String.Format("Could not find property {0} of node {1}.", currentField, nodeIdInt)); - item umbItem = new item(property.Value.ToString(), new AttributeCollectionAdapter(itemAttributes)); + item umbItem = new item(property.Value.ToString(), itemAttributes); string tempElementContent = umbItem.FieldContent; // If the current content object is a document object, we'll only output it if it's published