("copyTo");
- Services.MediaService.Move(media, copyToId, Security.CurrentUser.Id);
- }
-
- feedback.Text = Services.TextService.Localize("moveOrCopy/moveDone", nodes) + "" + Services.TextService.Localize("closeThisWindow") + "";
- feedback.type = uicontrols.Feedback.feedbacktype.success;
-
- // refresh tree
- ClientTools.MoveNode(currContent.Id.ToString(), currContent.Path);
- }
- else
- {
- //NOTE: We ONLY support Copy on content not media for some reason.
-
- var newContent = (IContent)currContent;
- Services.ContentService.Copy(newContent, Request.GetItemAs("copyTo"), RelateDocuments.Checked, Security.CurrentUser.Id);
-
- feedback.Text = Services.TextService.Localize("moveOrCopy/copyDone", nodes) + "
" + Services.TextService.Localize("closeThisWindow") + "";
- feedback.type = uicontrols.Feedback.feedbacktype.success;
-
- // refresh tree
- ClientTools.CopyNode(currContent.Id.ToString(), newContent.Path);
- }
- }
- }
- }
-
- ///
- /// JsInclude1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
- ///
- /// feedback control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.Feedback feedback;
-
- ///
- /// pane_form control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.Pane pane_form;
-
- ///
- /// JTree control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.controls.Tree.TreeControl JTree;
-
- ///
- /// pp_relate control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.PropertyPanel pp_relate;
-
- ///
- /// RelateDocuments control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.CheckBox RelateDocuments;
-
- ///
- /// pane_form_notice control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.PlaceHolder pane_form_notice;
-
- ///
- /// pane_settings control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.Pane pane_settings;
-
- ///
- /// PropertyPanel1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.PropertyPanel PropertyPanel1;
-
- ///
- /// masterType control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ListBox masterType;
-
- ///
- /// rename control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.TextBox rename;
-
- ///
- /// RequiredFieldValidator1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-
- ///
- /// panel_buttons control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Panel panel_buttons;
-
- ///
- /// ok control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Button ok;
-
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
index 48420d34ee..0b5bebc114 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
@@ -2,16 +2,12 @@ using Umbraco.Core.Services;
using System;
using System.Collections;
using System.Linq;
-using System.Web.UI;
-using System.Web.UI.HtmlControls;
using System.Web.UI.WebControls;
-using umbraco.cms.businesslogic;
-using umbraco.cms.businesslogic.workflow;
using Umbraco.Core;
+using Umbraco.Core.Models.EntityBase;
using Umbraco.Web;
using Umbraco.Web.UI.Pages;
using Umbraco.Web._Legacy.Actions;
-using Action = Umbraco.Web._Legacy.Actions.Action;
namespace umbraco.dialogs
{
@@ -21,7 +17,7 @@ namespace umbraco.dialogs
public partial class notifications : UmbracoEnsuredPage
{
private ArrayList actions = new ArrayList();
- private CMSNode node;
+ private IUmbracoEntity node;
public notifications()
{
@@ -32,7 +28,7 @@ namespace umbraco.dialogs
protected void Page_Load(object sender, EventArgs e)
{
Button1.Text = Services.TextService.Localize("update");
- pane_form.Text = Services.TextService.Localize("notifications/editNotifications", new[] { node.Text});
+ pane_form.Text = Services.TextService.Localize("notifications/editNotifications", new[] { node.Name});
}
#region Web Form Designer generated code
@@ -45,7 +41,7 @@ namespace umbraco.dialogs
InitializeComponent();
base.OnInit(e);
- node = new cms.businesslogic.CMSNode(int.Parse(Request.GetItemAsString("id")));
+ node = Services.EntityService.Get(int.Parse(Request.GetItemAsString("id")));
var actionList = ActionsResolver.Current.Actions;
@@ -96,7 +92,8 @@ namespace umbraco.dialogs
if (c.Checked)
notifications += c.ID;
}
- Notification.UpdateNotifications(Security.CurrentUser, node, notifications);
+
+ ApplicationContext.Current.Services.NotificationService.SetNotifications(Security.CurrentUser, node, notifications.ToCharArray().Select(x => x.ToString()).ToArray());
var feedback = new umbraco.uicontrols.Feedback();
feedback.Text = Services.TextService.Localize("notifications") + " " + Services.TextService.Localize("ok") + "
" + Services.TextService.Localize("closeThisWindow") + "";
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
index ba28342018..0eecffa2ff 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
@@ -9,7 +9,6 @@
.gridItem{border-color: #D9D7D7;}
-
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs
index 0a1d0f54a4..986351af0d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs
@@ -12,15 +12,6 @@ namespace umbraco.presentation.umbraco.dialogs {
public partial class viewAuditTrail {
- ///
- /// CssInclude3 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::ClientDependency.Core.Controls.CssInclude CssInclude3;
-
///
/// auditLog control.
///
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.cs
deleted file mode 100644
index 26cdd17453..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/publishStatus.aspx.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using Umbraco.Core;
-
-namespace umbraco.cms.presentation
-{
- ///
- /// Summary description for publishStatus.
- ///
- [Obsolete("This class is no longer used and will be removed from the codebase in future versions")]
- public partial class publishStatus : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
- {
- public publishStatus()
- {
- CurrentApp = Constants.Applications.Content.ToString();
-
- }
-
- protected void Page_Load(object sender, System.EventArgs e)
- {
- // Put user code to initialize the page here
- int totalNodes = cms.businesslogic.CMSNode.CountByObjectType(cms.businesslogic.web.Document._objectType);
- if (library.IsPublishing)
- {
- Panel1.Controls.Add(new LiteralControl("Der er nu publiseret " + library.NodesPublished.ToString() + " ud af " + totalNodes.ToString() + " noder..."));
- ClientTools.RefreshAdmin(2);
- }
- else
- Panel1.Controls.Add(new LiteralControl("Færdig. Der er ialt publiseret " + library.NodesPublished.ToString() + " noder og det tog " + ((long)((System.DateTime.Now.Ticks - library.PublishStart.Ticks) / 10000000)).ToString() + " sekunder..."));
- }
-
- #region Web Form Designer generated code
- override protected void OnInit(EventArgs e)
- {
- //
- // CODEGEN: This call is required by the ASP.NET Web Form Designer.
- //
- InitializeComponent();
- base.OnInit(e);
- }
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
-
- }
- #endregion
-
- ///
- /// Form1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlForm Form1;
-
- ///
- /// Panel1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.UmbracoPanel Panel1;
- }
-}
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 3a73db386f..bbae68379c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
@@ -274,15 +274,7 @@ namespace umbraco.cms.presentation.user
lapps.RepeatDirection = RepeatDirection.Vertical;
}
- protected override void OnPreRender(EventArgs e)
- {
- base.OnPreRender(e);
-
- ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/CMSNode.asmx"));
- // ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
-
- }
-
+
///
/// This handles changing the password
///
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
index 24153c0270..740c6d2b3c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
@@ -41,15 +41,14 @@ namespace umbraco.cms.presentation.user
if (!int.TryParse(Request.QueryString["id"], out m_userTypeID))
return;
- if (!IsPostBack)
- {
- BindActions();
-
- ClientTools
- .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias)
- .SyncTree(m_userTypeID.ToString(), false);
- }
+ if (!IsPostBack)
+ {
+ BindActions();
+ ClientTools
+ .SetActiveTreeType(Constants.Trees.UserTypes)
+ .SyncTree(m_userTypeID.ToString(), false);
+ }
}
void save_Click(object sender, EventArgs e)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx
deleted file mode 100644
index 2f46849377..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="CMSNode.asmx.cs" Class="umbraco.presentation.webservices.CMSNode" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx.cs
deleted file mode 100644
index e71d405d62..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CMSNode.asmx.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Data;
-using System.Web;
-using System.Collections;
-using System.Web.Script.Services;
-using System.Web.Services;
-using System.Web.Services.Protocols;
-using System.ComponentModel;
-using Umbraco.Web.WebServices;
-using umbraco.cms.businesslogic;
-using umbraco.BusinessLogic;
-
-namespace umbraco.presentation.webservices
-{
- ///
- /// Summary description for CMSNode
- ///
- [WebService(Namespace = "http://umbraco.org/webservices/")]
- [ScriptService]
- public class CMSNode : UmbracoAuthorizedWebService
- {
-
- [WebMethod]
- public string GetNodeName(string ContextID, int NodeId)
- {
- return ValidateUserContextId(ContextID)
- ? GetNodeName(NodeId)
- : string.Empty;
- }
-
- private string GetNodeName(int nodeId)
- {
- if (!AuthorizeRequest()) return string.Empty;
- var n = new cms.businesslogic.CMSNode(nodeId);
- return n.Text;
- }
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx
deleted file mode 100644
index 593d4f5037..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="MacroContainerService.asmx.cs" Class="umbraco.presentation.webservices.MacroContainerService" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx.cs
deleted file mode 100644
index 207995fbd6..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MacroContainerService.asmx.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Services;
-using System.Web.Script.Services;
-using Umbraco.Web.WebServices;
-
-namespace umbraco.presentation.webservices
-{
- ///
- /// Summary description for MacroContainerService
- ///
- [WebService(Namespace = "http://umbraco.org/webservices")]
- [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
- [System.ComponentModel.ToolboxItem(false)]
- [ScriptService]
- public class MacroContainerService : UmbracoAuthorizedWebService
- {
-
- [WebMethod(EnableSession = true)]
- [ScriptMethod]
- public void SetSortOrder(string id, string sortorder)
- {
- if (AuthorizeRequest())
- {
- HttpContext.Current.Session[id + "sortorder"] = sortorder;
- }
- }
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/RegexComWebservice.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/RegexComWebservice.cs
deleted file mode 100644
index 4edd8a98ca..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/RegexComWebservice.cs
+++ /dev/null
@@ -1,586 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Web.Services;
-using System.Web.Services.Protocols;
-using System.Xml.Serialization;
-
-//
-// This source code was auto-generated by wsdl, Version=2.0.50727.42.
-//
-
-namespace umbraco.presentation.webservices {
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Web.Services.WebServiceBindingAttribute(Name="WebservicesSoap", Namespace="http://regexlib.com/webservices.asmx")]
-[System.Xml.Serialization.XmlIncludeAttribute(typeof(BaseDataObject))]
-public partial class RegexComWebservice : System.Web.Services.Protocols.SoapHttpClientProtocol {
-
- private System.Threading.SendOrPostCallback getRegExpDetailsOperationCompleted;
-
- private System.Threading.SendOrPostCallback ListAllAsXmlOperationCompleted;
-
- private System.Threading.SendOrPostCallback listRegExpOperationCompleted;
-
- ///
- public RegexComWebservice() {
- this.Url = "http://regexlib.com/WebServices.asmx";
- }
-
- ///
- public event getRegExpDetailsCompletedEventHandler getRegExpDetailsCompleted;
-
- ///
- public event ListAllAsXmlCompletedEventHandler ListAllAsXmlCompleted;
-
- ///
- public event listRegExpCompletedEventHandler listRegExpCompleted;
-
- ///
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://regexlib.com/webservices.asmx/getRegExpDetails", RequestNamespace="http://regexlib.com/webservices.asmx", ResponseNamespace="http://regexlib.com/webservices.asmx", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public RegExpDetails getRegExpDetails(int regexpId) {
- object[] results = this.Invoke("getRegExpDetails", new object[] {
- regexpId});
- return ((RegExpDetails)(results[0]));
- }
-
- ///
- public System.IAsyncResult BegingetRegExpDetails(int regexpId, System.AsyncCallback callback, object asyncState) {
- return this.BeginInvoke("getRegExpDetails", new object[] {
- regexpId}, callback, asyncState);
- }
-
- ///
- public RegExpDetails EndgetRegExpDetails(System.IAsyncResult asyncResult) {
- object[] results = this.EndInvoke(asyncResult);
- return ((RegExpDetails)(results[0]));
- }
-
- ///
- public void getRegExpDetailsAsync(int regexpId) {
- this.getRegExpDetailsAsync(regexpId, null);
- }
-
- ///
- public void getRegExpDetailsAsync(int regexpId, object userState) {
- if ((this.getRegExpDetailsOperationCompleted == null)) {
- this.getRegExpDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OngetRegExpDetailsOperationCompleted);
- }
- this.InvokeAsync("getRegExpDetails", new object[] {
- regexpId}, this.getRegExpDetailsOperationCompleted, userState);
- }
-
- private void OngetRegExpDetailsOperationCompleted(object arg) {
- if ((this.getRegExpDetailsCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.getRegExpDetailsCompleted(this, new getRegExpDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- ///
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://regexlib.com/webservices.asmx/ListAllAsXml", RequestNamespace="http://regexlib.com/webservices.asmx", ResponseNamespace="http://regexlib.com/webservices.asmx", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public Expression[] ListAllAsXml(int maxrows) {
- object[] results = this.Invoke("ListAllAsXml", new object[] {
- maxrows});
- return ((Expression[])(results[0]));
- }
-
- ///
- public System.IAsyncResult BeginListAllAsXml(int maxrows, System.AsyncCallback callback, object asyncState) {
- return this.BeginInvoke("ListAllAsXml", new object[] {
- maxrows}, callback, asyncState);
- }
-
- ///
- public Expression[] EndListAllAsXml(System.IAsyncResult asyncResult) {
- object[] results = this.EndInvoke(asyncResult);
- return ((Expression[])(results[0]));
- }
-
- ///
- public void ListAllAsXmlAsync(int maxrows) {
- this.ListAllAsXmlAsync(maxrows, null);
- }
-
- ///
- public void ListAllAsXmlAsync(int maxrows, object userState) {
- if ((this.ListAllAsXmlOperationCompleted == null)) {
- this.ListAllAsXmlOperationCompleted = new System.Threading.SendOrPostCallback(this.OnListAllAsXmlOperationCompleted);
- }
- this.InvokeAsync("ListAllAsXml", new object[] {
- maxrows}, this.ListAllAsXmlOperationCompleted, userState);
- }
-
- private void OnListAllAsXmlOperationCompleted(object arg) {
- if ((this.ListAllAsXmlCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.ListAllAsXmlCompleted(this, new ListAllAsXmlCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- ///
- [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://regexlib.com/webservices.asmx/listRegExp", RequestNamespace="http://regexlib.com/webservices.asmx", ResponseNamespace="http://regexlib.com/webservices.asmx", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public System.Data.DataSet listRegExp(string keyword, string regexp_substring, int min_rating, int howmanyrows) {
- object[] results = this.Invoke("listRegExp", new object[] {
- keyword,
- regexp_substring,
- min_rating,
- howmanyrows});
- return ((System.Data.DataSet)(results[0]));
- }
-
- ///
- public System.IAsyncResult BeginlistRegExp(string keyword, string regexp_substring, int min_rating, int howmanyrows, System.AsyncCallback callback, object asyncState) {
- return this.BeginInvoke("listRegExp", new object[] {
- keyword,
- regexp_substring,
- min_rating,
- howmanyrows}, callback, asyncState);
- }
-
- ///
- public System.Data.DataSet EndlistRegExp(System.IAsyncResult asyncResult) {
- object[] results = this.EndInvoke(asyncResult);
- return ((System.Data.DataSet)(results[0]));
- }
-
- ///
- public void listRegExpAsync(string keyword, string regexp_substring, int min_rating, int howmanyrows) {
- this.listRegExpAsync(keyword, regexp_substring, min_rating, howmanyrows, null);
- }
-
- ///
- public void listRegExpAsync(string keyword, string regexp_substring, int min_rating, int howmanyrows, object userState) {
- if ((this.listRegExpOperationCompleted == null)) {
- this.listRegExpOperationCompleted = new System.Threading.SendOrPostCallback(this.OnlistRegExpOperationCompleted);
- }
- this.InvokeAsync("listRegExp", new object[] {
- keyword,
- regexp_substring,
- min_rating,
- howmanyrows}, this.listRegExpOperationCompleted, userState);
- }
-
- private void OnlistRegExpOperationCompleted(object arg) {
- if ((this.listRegExpCompleted != null)) {
- System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
- this.listRegExpCompleted(this, new listRegExpCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
- }
- }
-
- ///
- public new void CancelAsync(object userState) {
- base.CancelAsync(userState);
- }
-}
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.SerializableAttribute()]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://regexlib.com/webservices.asmx")]
-public partial class RegExpDetails {
-
- private int user_idField;
-
- private int regexp_idField;
-
- private string regular_expressionField;
-
- private string matchesField;
-
- private string not_matchesField;
-
- private string sourceField;
-
- private string descriptionField;
-
- private System.DateTime create_dateField;
-
- private bool disableField;
-
- private int ratingField;
-
- ///
- public int user_id {
- get {
- return this.user_idField;
- }
- set {
- this.user_idField = value;
- }
- }
-
- ///
- public int regexp_id {
- get {
- return this.regexp_idField;
- }
- set {
- this.regexp_idField = value;
- }
- }
-
- ///
- public string regular_expression {
- get {
- return this.regular_expressionField;
- }
- set {
- this.regular_expressionField = value;
- }
- }
-
- ///
- public string matches {
- get {
- return this.matchesField;
- }
- set {
- this.matchesField = value;
- }
- }
-
- ///
- public string not_matches {
- get {
- return this.not_matchesField;
- }
- set {
- this.not_matchesField = value;
- }
- }
-
- ///
- public string source {
- get {
- return this.sourceField;
- }
- set {
- this.sourceField = value;
- }
- }
-
- ///
- public string description {
- get {
- return this.descriptionField;
- }
- set {
- this.descriptionField = value;
- }
- }
-
- ///
- public System.DateTime create_date {
- get {
- return this.create_dateField;
- }
- set {
- this.create_dateField = value;
- }
- }
-
- ///
- public bool disable {
- get {
- return this.disableField;
- }
- set {
- this.disableField = value;
- }
- }
-
- ///
- public int rating {
- get {
- return this.ratingField;
- }
- set {
- this.ratingField = value;
- }
- }
-}
-
-///
-[System.Xml.Serialization.XmlIncludeAttribute(typeof(Expression))]
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.SerializableAttribute()]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://regexlib.com/webservices.asmx")]
-public abstract partial class BaseDataObject {
-
- private int idField;
-
- private System.DateTime dateCreatedField;
-
- private System.DateTime dateModifiedField;
-
- private bool isDirtyField;
-
- ///
- public int Id {
- get {
- return this.idField;
- }
- set {
- this.idField = value;
- }
- }
-
- ///
- public System.DateTime DateCreated {
- get {
- return this.dateCreatedField;
- }
- set {
- this.dateCreatedField = value;
- }
- }
-
- ///
- public System.DateTime DateModified {
- get {
- return this.dateModifiedField;
- }
- set {
- this.dateModifiedField = value;
- }
- }
-
- ///
- public bool IsDirty {
- get {
- return this.isDirtyField;
- }
- set {
- this.isDirtyField = value;
- }
- }
-}
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.SerializableAttribute()]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://regexlib.com/webservices.asmx")]
-public partial class Expression : BaseDataObject {
-
- private System.Guid authorIdField;
-
- private string authorNameField;
-
- private int providerIdField;
-
- private string titleField;
-
- private string patternField;
-
- private string matchingTextField;
-
- private string nonMatchingTextField;
-
- private bool enabledField;
-
- private int ratingField;
-
- private string sourceField;
-
- private string descriptionField;
-
- ///
- public System.Guid AuthorId {
- get {
- return this.authorIdField;
- }
- set {
- this.authorIdField = value;
- }
- }
-
- ///
- public string AuthorName {
- get {
- return this.authorNameField;
- }
- set {
- this.authorNameField = value;
- }
- }
-
- ///
- public int ProviderId {
- get {
- return this.providerIdField;
- }
- set {
- this.providerIdField = value;
- }
- }
-
- ///
- public string Title {
- get {
- return this.titleField;
- }
- set {
- this.titleField = value;
- }
- }
-
- ///
- public string Pattern {
- get {
- return this.patternField;
- }
- set {
- this.patternField = value;
- }
- }
-
- ///
- public string MatchingText {
- get {
- return this.matchingTextField;
- }
- set {
- this.matchingTextField = value;
- }
- }
-
- ///
- public string NonMatchingText {
- get {
- return this.nonMatchingTextField;
- }
- set {
- this.nonMatchingTextField = value;
- }
- }
-
- ///
- public bool Enabled {
- get {
- return this.enabledField;
- }
- set {
- this.enabledField = value;
- }
- }
-
- ///
- public int Rating {
- get {
- return this.ratingField;
- }
- set {
- this.ratingField = value;
- }
- }
-
- ///
- public string Source {
- get {
- return this.sourceField;
- }
- set {
- this.sourceField = value;
- }
- }
-
- ///
- public string Description {
- get {
- return this.descriptionField;
- }
- set {
- this.descriptionField = value;
- }
- }
-}
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-public delegate void getRegExpDetailsCompletedEventHandler(object sender, getRegExpDetailsCompletedEventArgs e);
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class getRegExpDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal getRegExpDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- ///
- public RegExpDetails Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((RegExpDetails)(this.results[0]));
- }
- }
-}
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-public delegate void ListAllAsXmlCompletedEventHandler(object sender, ListAllAsXmlCompletedEventArgs e);
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class ListAllAsXmlCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal ListAllAsXmlCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- ///
- public Expression[] Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((Expression[])(this.results[0]));
- }
- }
-}
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-public delegate void listRegExpCompletedEventHandler(object sender, listRegExpCompletedEventArgs e);
-
-///
-[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-[System.Diagnostics.DebuggerStepThroughAttribute()]
-[System.ComponentModel.DesignerCategoryAttribute("code")]
-public partial class listRegExpCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-
- private object[] results;
-
- internal listRegExpCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
- base(exception, cancelled, userState) {
- this.results = results;
- }
-
- ///
- public System.Data.DataSet Result {
- get {
- this.RaiseExceptionIfNecessary();
- return ((System.Data.DataSet)(this.results[0]));
- }
- }
-}
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx
deleted file mode 100644
index 0b2a13a854..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="c#" Codebehind="Settings.asmx.cs" Class="umbraco.webservices.Settings" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs
deleted file mode 100644
index 4b5f90a681..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/Settings.asmx.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Web;
-using System.Web.Services;
-using System.Linq;
-using System.Xml;
-using Umbraco.Core;
-using Umbraco.Web.WebServices;
-using umbraco.BusinessLogic;
-
-namespace umbraco.webservices
-{
-
- public class Settings : UmbracoAuthorizedWebService
- {
-
- [WebMethod]
- public XmlNode GetTabs(string ContextID, int ContentTypeId)
- {
- if (!AuthorizeRequest(Constants.Applications.Settings.ToString()))
- {
- var xmlDoc = new XmlDocument();
- var tabs = xmlDoc.CreateElement("tabs");
- foreach (var t in new cms.businesslogic.ContentType(ContentTypeId).getVirtualTabs.ToList())
- {
- var mXml = xmlDoc.CreateElement("tab");
- mXml.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "id", t.Id.ToString()));
- mXml.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "caption", t.Caption));
- tabs.AppendChild(mXml);
- }
- return tabs;
- }
-
- return null;
- }
- }
-}
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 082b98a6b9..8a17236944 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
@@ -33,30 +33,6 @@ 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)
- {
- if (AuthorizeRequest(Constants.Applications.Settings.ToString()))
- {
- var stylesheet = Services.FileService.GetStylesheetByName(oldName.EnsureEndsWith(".css"));
- if (stylesheet == null) throw new InvalidOperationException("No stylesheet found with name " + oldName);
-
- stylesheet.Content = fileContents;
- if (fileName.InvariantEquals(oldName) == false)
- {
- //it's changed which means we need to change the path
- stylesheet.Path = stylesheet.Path.TrimEnd(oldName.EnsureEndsWith(".css")) + fileName.EnsureEndsWith(".css");
- }
-
- Services.FileService.SaveStylesheet(stylesheet, Security.CurrentUser.Id);
-
- return "true";
- }
- return "false";
- }
-
[WebMethod]
public string SaveXslt(string fileName, string oldName, string fileContents, bool ignoreDebugging)
{
@@ -215,140 +191,5 @@ namespace umbraco.presentation.webservices
}
return "false";
}
-
- //[WebMethod]
- //public string SavePartialView(string filename, string oldName, string contents)
- //{
- // if (BasePage.ValidateUserContextID(BasePage.umbracoUserContextID))
- // {
- // var folderPath = SystemDirectories.MvcViews + "/Partials/";
-
- // // validate file
- // IOHelper.ValidateEditPath(IOHelper.MapPath(folderPath + filename), folderPath);
- // // validate extension
- // IOHelper.ValidateFileExtension(IOHelper.MapPath(folderPath + filename), new[] {"cshtml"}.ToList());
-
-
- // var val = contents;
- // string returnValue;
- // var saveOldPath = oldName.StartsWith("~/") ? IOHelper.MapPath(oldName) : IOHelper.MapPath(folderPath + oldName);
- // var savePath = filename.StartsWith("~/") ? IOHelper.MapPath(filename) : IOHelper.MapPath(folderPath + filename);
-
- // //Directory check.. only allow files in script dir and below to be edited
- // if (savePath.StartsWith(IOHelper.MapPath(folderPath)))
- // {
- // //deletes the old file
- // if (savePath != saveOldPath)
- // {
- // if (File.Exists(saveOldPath))
- // File.Delete(saveOldPath);
- // }
- // using (var sw = File.CreateText(savePath))
- // {
- // sw.Write(val);
- // }
- // returnValue = "true";
- // }
- // else
- // {
- // returnValue = "illegalPath";
- // }
-
- // return returnValue;
- // }
- // 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)
- {
- if (AuthorizeRequest(Constants.Applications.Settings.ToString()))
- {
-
- // validate file
- IOHelper.ValidateEditPath(IOHelper.MapPath(SystemDirectories.Scripts + "/" + filename),
- SystemDirectories.Scripts);
- // validate extension
- IOHelper.ValidateFileExtension(IOHelper.MapPath(SystemDirectories.Scripts + "/" + filename),
- UmbracoConfig.For.UmbracoSettings().Content.ScriptFileTypes.ToList());
-
-
- var val = contents;
- string returnValue;
- try
- {
- var saveOldPath = "";
- saveOldPath = oldName.StartsWith("~/")
- ? IOHelper.MapPath(oldName)
- : IOHelper.MapPath(SystemDirectories.Scripts + "/" + oldName);
-
- var savePath = "";
- savePath = filename.StartsWith("~/")
- ? IOHelper.MapPath(filename)
- : IOHelper.MapPath(SystemDirectories.Scripts + "/" + filename);
-
- //Directory check.. only allow files in script dir and below to be edited
- if (savePath.StartsWith(IOHelper.MapPath(SystemDirectories.Scripts + "/")) || savePath.StartsWith(IOHelper.MapPath(SystemDirectories.Masterpages + "/")))
- {
- //deletes the old file
- if (savePath != saveOldPath)
- {
- if (File.Exists(saveOldPath))
- File.Delete(saveOldPath);
- }
-
- //ensure the folder exists before saving
- Directory.CreateDirectory(Path.GetDirectoryName(savePath));
-
- using (var sw = File.CreateText(savePath))
- {
- sw.Write(val);
- sw.Close();
- }
-
- returnValue = "true";
- }
- else
- {
- returnValue = "illegalPath";
- }
- }
- catch
- {
- returnValue = "false";
- }
-
-
- return returnValue;
- }
- return "false";
- }
-
- [Obsolete("This method has been superceded by the REST service /Umbraco/RestServices/SaveFile/SaveTemplate which is powered by the SaveFileController.")]
- [WebMethod]
- public string SaveTemplate(string templateName, string templateAlias, string templateContents, int templateID, int masterTemplateID)
- {
- if (AuthorizeRequest(Constants.Applications.Settings.ToString()))
- {
- var _template = new Template(templateID);
- string retVal = "false";
-
- if (_template != null)
- {
- _template.Text = templateName;
- _template.Alias = templateAlias;
- _template.MasterTemplate = masterTemplateID;
- _template.Design = templateContents;
-
- _template.Save();
-
- retVal = "true";
- }
- return retVal;
- }
- return "false";
- }
-
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx
deleted file mode 100644
index f18a82d386..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="c#" Codebehind="progressStatus.asmx.cs" Class="presentation.umbraco.webservices.progressStatus" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs
deleted file mode 100644
index c70b5df17e..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/progressStatus.asmx.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Web;
-using System.Web.Services;
-using Umbraco.Web.WebServices;
-
-namespace presentation.umbraco.webservices
-{
- ///
- /// Summary description for progressStatus.
- ///
- [WebService(Namespace="http://umbraco.org/webservices/")]
- public class progressStatus : UmbracoAuthorizedWebService
- {
-
- [WebMethod]
- public int GetStatus(string key)
- {
- if (!AuthorizeRequest()) return 0;
-
- try
- {
- return int.Parse(Application[key].ToString());
- }
- catch
- {
- return 0;
- }
- }
-
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx
deleted file mode 100644
index 49626d763a..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="c#" Codebehind="publication.asmx.cs" Class="umbraco.webservices.publication" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs
deleted file mode 100644
index 1a89a6d80d..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/publication.asmx.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Web.Services;
-using System.Web.Script.Services;
-using Umbraco.Web.WebServices;
-using umbraco.BusinessLogic;
-using umbraco.presentation.webservices;
-using Umbraco.Core;
-
-namespace umbraco.webservices
-{
- ///
- /// Summary description for publication.
- ///
- [WebService(Namespace="http://umbraco.org/webservices/")]
- [ScriptService]
- public class publication : UmbracoAuthorizedWebService
- {
-
- [WebMethod]
- [ScriptMethod]
- public int GetPublicationStatus(string key)
- {
- if (!AuthorizeRequest(Constants.Applications.Content.ToString()))
- return 0;
-
- try
- {
- return int.Parse(Application["publishDone" + key].ToString());
- }
- catch
- {
- return 0;
- }
- }
-
- [WebMethod]
- [ScriptMethod]
- public int GetPublicationStatusMax(string key)
- {
- if (!AuthorizeRequest(Constants.Applications.Content.ToString()))
- return 0;
-
- try
- {
- return int.Parse(Application["publishTotal" + key].ToString());
- }
- catch
- {
- return 0;
- }
- }
-
- [WebMethod]
- [ScriptMethod]
- public int GetPublicationStatusMaxAll(string key)
- {
- if (!AuthorizeRequest(Constants.Applications.Content.ToString()))
- return 0;
-
- try
- {
- return int.Parse(Application["publishTotalAll" + key].ToString());
- }
- catch
- {
- return 0;
- }
- }
-
- [Obsolete("This doesn't do anything and will be removed in future versions")]
- [WebMethod]
- public void HandleReleaseAndExpireDates(Guid PublishingServiceKey)
- {
- }
-
- [Obsolete("This doesn't do anything and will be removed in future versions")]
- [WebMethod]
- public void SaveXmlCacheToDisk()
- {
- if (!AuthorizeRequest(Constants.Applications.Content.ToString()))
- return;
- }
-
-
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx
deleted file mode 100644
index c83c8c7a5c..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="tagService.asmx.cs" Class="umbracoTags.webservice.tagService" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx.cs
deleted file mode 100644
index e7bfebdd5f..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/tagService.asmx.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Data;
-using System.Web;
-using System.Collections;
-using System.Web.Services;
-using System.Web.Services.Protocols;
-using System.ComponentModel;
-
-using umbraco.DataLayer;
-
-namespace umbracoTags.webservice {
- ///
- /// Summary description for tagService
- ///
- [WebService(Namespace = "http://tempuri.org/")]
- [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
- [ToolboxItem(false)]
- [System.Web.Script.Services.ScriptService]
- public class tagService : System.Web.Services.WebService {
-
- private static ISqlHelper _sqlHelper;
- private static string _ConnString = umbraco.GlobalSettings.DbDSN;
-
- public static ISqlHelper SqlHelper
- {
- get
- {
- if (_sqlHelper == null)
- {
- try
- {
- _sqlHelper = DataLayerHelper.CreateSqlHelper(_ConnString);
- }
- catch { }
- }
- return _sqlHelper;
- }
- }
-
-
- ///
- /// Gets the tag list.
- ///
- /// The prefix text.
- /// The count.
- /// string array.
- [WebMethod]
- public string[] getTagList(string prefixText, int count) {
-
- IRecordsReader rr = SqlHelper.ExecuteReader("SELECT TOP 20 tag FROM cmsTags WHERE tag LIKE @prefix;",
- SqlHelper.CreateParameter("@count", count),
- SqlHelper.CreateParameter("@prefix", prefixText + "%" )
- );
- string result = "";
-
- while (rr.Read()) {
- result += rr.GetString("tag") + ",";
- }
-
- return result.Trim(',').Split(',');
- }
-
- ///
- /// Gets the tag list.
- ///
- /// The prefix text.
- /// The count.
- /// The context key.
- /// string array
- [WebMethod]
- public string[] getTagList(string prefixText, int count, string contextKey)
- {
- umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, prefixText + " " + count + " " + contextKey);
-
- string[] groupAndId = contextKey.Trim().Split('|');
- //fallback...
- string sql;
-
- IRecordsReader rr;
-
- try {
- //if all is correct
- if (groupAndId.Length == 2) {
- sql = @"SELECT TOP 20 tag FROM cmsTags WHERE tag LIKE @prefix AND cmsTags.id not in
- (SELECT tagID FROM cmsTagRelationShip WHERE NodeId = @nodeId) AND cmstags.[group] = @group;";
-
- rr = SqlHelper.ExecuteReader(sql,
- SqlHelper.CreateParameter("@count", count),
- SqlHelper.CreateParameter("@prefix", prefixText + "%"),
- SqlHelper.CreateParameter("@nodeId", groupAndId[0]),
- SqlHelper.CreateParameter("@group", groupAndId[1])
- );
-
-
- umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "correct param " + groupAndId[1] + " " + groupAndId[0]);
-
-
- } else {
- //fallback...
- sql = "SELECT TOP 20 tag FROM cmsTags WHERE tag LIKE @prefix";
-
- rr = SqlHelper.ExecuteReader(sql,
- SqlHelper.CreateParameter("@count", count),
- SqlHelper.CreateParameter("@prefix", prefixText + "%")
- );
- }
-
- string result = "";
-
- while (rr.Read()) {
- result += rr.GetString("tag") + ",";
- }
-
-
- umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, "result");
- return result.Trim(',').Split(',');
-
- } catch (Exception ex) {
- umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, ex.ToString());
- }
-
- return ("jaxx,pik,hat").Split(',');
- }
-
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs
index 3a4d52c026..41eec94fda 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs
@@ -21,67 +21,7 @@ namespace umbraco.webservices
[WebService(Namespace="http://umbraco.org/webservices/")]
[ScriptService]
public class templates : UmbracoAuthorizedWebService
- {
-
- [WebMethod]
- public XmlNode GetTemplates(string Login, string Password)
- {
- if (ValidateCredentials(Login, Password) && UserHasAppAccess(Constants.Applications.Settings.ToString(), Login))
- {
- var xmlDoc = new XmlDocument();
- xmlDoc.LoadXml("");
- foreach (cms.businesslogic.template.Template t in cms.businesslogic.template.Template.GetAllAsList())
- {
- var tt = xmlDoc.CreateElement("template");
- tt.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "id", t.Id.ToString()));
- tt.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "name", t.Text));
- xmlDoc.DocumentElement.AppendChild(tt);
- }
- return xmlDoc.DocumentElement;
- }
- return null;
- }
-
- [WebMethod]
- public XmlNode GetTemplate(int Id, string Login, string Password)
- {
- if (ValidateCredentials(Login, Password) && UserHasAppAccess(Constants.Applications.Settings.ToString(), Login))
- {
- var t = new cms.businesslogic.template.Template(Id);
- var xmlDoc = new XmlDocument();
- var tXml = xmlDoc.CreateElement("template");
- tXml.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "id", t.Id.ToString()));
- tXml.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "master", t.MasterTemplate.ToString()));
- tXml.Attributes.Append(XmlHelper.AddAttribute(xmlDoc, "name", t.Text));
- tXml.AppendChild(XmlHelper.AddCDataNode(xmlDoc, "design", t.Design));
- return tXml;
- }
- return null;
- }
-
- [WebMethod]
- public bool UpdateTemplate(int Id, int Master, string Design, string Login, string Password)
- {
- if (ValidateCredentials(Login, Password) && UserHasAppAccess(Constants.Applications.Settings.ToString(), Login))
- {
- try
- {
- var t = new cms.businesslogic.template.Template(Id)
- {
- MasterTemplate = Master,
- Design = Design
- };
- //ensure events are raised
- t.Save();
- return true;
- }
- catch (ArgumentException)
- {
- return false;
- }
- }
- return false;
- }
+ {
[WebMethod]
[ScriptMethod]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx
deleted file mode 100644
index f075057517..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="trashcan.asmx.cs" Class="umbraco.presentation.webservices.trashcan" %>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx.cs
deleted file mode 100644
index baa692ef34..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/trashcan.asmx.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Web.Script.Services;
-using System.Web.Services;
-using System.ComponentModel;
-using Umbraco.Web.WebServices;
-using umbraco.cms.businesslogic;
-using Umbraco.Core;
-
-namespace umbraco.presentation.webservices
-{
- ///
- /// Summary description for trashcan
- ///
- [WebService(Namespace = "http://umbraco.org/webservices")]
- [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
- [ToolboxItem(false)]
- [ScriptService]
- public class trashcan : UmbracoAuthorizedWebService
- {
- [WebMethod]
- public void EmptyTrashcan(RecycleBin.RecycleBinType type)
- {
- //validate against the app type!
- switch (type)
- {
- case RecycleBin.RecycleBinType.Content:
- if (!AuthorizeRequest(Constants.Applications.Content.ToString())) return;
- break;
- case RecycleBin.RecycleBinType.Media:
- if (!AuthorizeRequest(Constants.Applications.Media.ToString())) return;
- break;
- default:
- throw new ArgumentOutOfRangeException("type");
- }
-
- //TODO: This will never work in LB scenarios
- Application["trashcanEmptyLeft"] = RecycleBin.Count(type).ToString();
- emptyTrashCanDo(type);
- }
-
- [WebMethod]
- public string GetTrashStatus()
- {
- //TODO: This will never work in LB scenarios
-
- if (AuthorizeRequest())
- {
- return Application["trashcanEmptyLeft"] != null
- ? Application["trashcanEmptyLeft"].ToString()
- : "";
- }
-
- return "-";
-
- }
-
- private void emptyTrashCanDo(RecycleBin.RecycleBinType type)
- {
- var trashCan = new RecycleBin(type);
-
- var callback = new Action(x =>
- {
- Application.Lock();
- Application["trashcanEmptyLeft"] = x.ToString();
- Application.UnLock();
- });
-
- trashCan.CallTheGarbageMan(callback);
-
- }
- }
-}
diff --git a/src/UmbracoExamine/ExamineHelper.cs b/src/UmbracoExamine/ExamineHelper.cs
deleted file mode 100644
index 2df27390cc..0000000000
--- a/src/UmbracoExamine/ExamineHelper.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-using Examine;
-using Examine.LuceneEngine.Config;
-using Umbraco.Core;
-
-namespace UmbracoExamine
-{
- internal class ExamineHelper
- {
-
- public static IndexSet GetConfiguredIndexSet(string name, System.Collections.Specialized.NameValueCollection config, string matchingVerb, Func alreadyConfiguredCheck)
- {
- //Need to check if the index set or IndexerData is specified...
-
- if (config["indexSet"] == null && alreadyConfiguredCheck() == false)
- {
- //if we don't have either, then we'll try to set the index set by naming conventions
- if (name.EndsWith(matchingVerb))
- {
- var setNameByConvension = name.Remove(name.LastIndexOf(matchingVerb)) + "IndexSet";
- //check if we can assign the index set by naming convention
- var set = IndexSets.Instance.Sets.Cast().SingleOrDefault(x => x.SetName == setNameByConvension);
-
- if (set != null)
- {
- //we've found an index set by naming conventions :)
- return set;
- }
- }
-
- throw new ArgumentNullException("indexSet on LuceneExamineIndexer provider has not been set in configuration and/or the IndexerData property has not been explicitly set");
- }
-
- if (config["indexSet"] != null)
- {
- //if an index set is specified, ensure it exists and initialize the indexer based on the set
-
- if (IndexSets.Instance.Sets[config["indexSet"]] == null)
- {
- throw new ArgumentException("The indexSet specified for the LuceneExamineIndexer provider does not exist");
- }
- var indexSetName = config["indexSet"];
- return IndexSets.Instance.Sets[indexSetName];
- }
-
- //it's already configured internally
- return null;
- }
- }
-}
diff --git a/src/UmbracoExamine/LegacyLibrary.cs b/src/UmbracoExamine/LegacyLibrary.cs
index 651c57b00e..58ea6319c0 100644
--- a/src/UmbracoExamine/LegacyLibrary.cs
+++ b/src/UmbracoExamine/LegacyLibrary.cs
@@ -35,18 +35,7 @@ namespace UmbracoExamine
return _libraryType;
}
}
-
- internal static XPathNodeIterator GetXmlNodeById(string id)
- {
- var meth = LibraryType.GetMethod("GetXmlNodeById", BindingFlags.Public | BindingFlags.Static);
- return (XPathNodeIterator)meth.Invoke(null, new object[] { id });
- }
-
- internal static XPathNodeIterator GetMember(int id)
- {
- var meth = LibraryType.GetMethod("GetMember", BindingFlags.Public | BindingFlags.Static);
- return (XPathNodeIterator)meth.Invoke(null, new object[] { id });
- }
+
internal static XPathNodeIterator GetXmlNodeByXPath(string xpathQuery)
{
diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj
index ef8d87535d..7f137d11d0 100644
--- a/src/UmbracoExamine/UmbracoExamine.csproj
+++ b/src/UmbracoExamine/UmbracoExamine.csproj
@@ -121,7 +121,6 @@
-
diff --git a/src/UmbracoExamine/app.config b/src/UmbracoExamine/app.config
index 84d45d20fd..65f505d522 100644
--- a/src/UmbracoExamine/app.config
+++ b/src/UmbracoExamine/app.config
@@ -12,7 +12,7 @@