();
- public static string pageName = "";
-
- public publish()
- {
- CurrentApp = DefaultApps.content.ToString();
- }
-
- protected void Page_Load(object sender, EventArgs e)
- {
- _nodeId = int.Parse(helper.Request("id"));
- var d = new cms.businesslogic.web.Document(_nodeId);
- pageName = d.Text;
-
- if (d.Level > 1 && d.PathPublished == false)
- {
- TheForm.Visible = false;
- theEnd.Visible = true;
- feedbackMsg.type = uicontrols.Feedback.feedbacktype.notice;
- feedbackMsg.Text = ui.Text("publish", "contentPublishedFailedByParent", d.Text, getUser()) + "" + ui.Text("closeThisWindow") + "";
-
- return;
- }
-
- // add control prefix to variable for support with masterpages
- var prefix = PublishUnpublishedItems.ClientID.Replace(PublishUnpublishedItems.ID, "");
- masterPagePrefix.Text = prefix;
-
- // by default we only count the published ones
- var totalNodesToPublish = cms.businesslogic.web.Document.CountSubs(_nodeId, true);
- try
- {
- Application.Lock();
- // We add both all nodes and only published nodes to the application variables so we can ajax query depending on checkboxes
- Application["publishTotalAll" + _nodeId.ToString()] = cms.businesslogic.CMSNode.CountSubs(_nodeId).ToString();
- Application["publishTotal" + _nodeId.ToString()] = totalNodesToPublish.ToString();
- Application["publishDone" + _nodeId.ToString()] = "0";
- }
- finally
- {
- Application.UnLock();
- }
- total.Text = totalNodesToPublish.ToString();
-
- // Put user code to initialize the page here
- if (!IsPostBack)
- {
- // Add caption to checkbox
- PublishAll.Text = ui.Text("publish", "publishAll", d.Text, getUser());
- ok.Text = ui.Text("content", "publish", getUser());
- ok.Attributes.Add("style", "width: 60px");
- ok.Attributes.Add("onClick", "startPublication();");
-
- // Add checkbox event, so the publish unpublished childs gets enabled
- PublishUnpublishedItems.LabelAttributes.Add("disabled", "true");
- PublishUnpublishedItems.LabelAttributes.Add("id", "publishUnpublishedItemsLabel");
- PublishUnpublishedItems.InputAttributes.Add("disabled", "true");
- PublishAll.InputAttributes.Add("onclick", "togglePublishingModes(this)");
- }
- else
- {
-
- if (PublishAll.Checked)
- {
- _nodesPublished = 0;
-
- DoPublishSubs(d);
-
- Application.Lock();
- Application["publishTotal" + _nodeId.ToString()] = 0;
- Application.UnLock();
-
- feedbackMsg.type = uicontrols.Feedback.feedbacktype.success;
-
- feedbackMsg.Text = ui.Text("publish", "nodePublishAll", d.Text, getUser()) + "
" + ui.Text("closeThisWindow") + "";
-
- ClientTools.ReloadActionNode(true, true);
-
- Application.Lock();
-
- Application["publishTotal" + _nodeId.ToString()] = null;
- Application["publishDone" + _nodeId.ToString()] = null;
- Application.UnLock();
- }
- else
- {
- if (d.PublishWithResult(getUser()))
- {
- feedbackMsg.type = uicontrols.Feedback.feedbacktype.success;
- feedbackMsg.Text = ui.Text("publish", "nodePublish", d.Text, getUser()) + "
" + ui.Text("closeThisWindow") + "";
- }
- else {
- feedbackMsg.type = uicontrols.Feedback.feedbacktype.notice;
- feedbackMsg.Text = ui.Text("publish", "contentPublishedFailedByEvent", d.Text, getUser()) + "
" + ui.Text("closeThisWindow") + "";
- }
- ClientTools.ReloadActionNode(true, false);
- }
-
- TheForm.Visible = false;
- theEnd.Visible = true;
- }
- }
-
- private void DoPublishSubs(cms.businesslogic.web.Document d)
- {
- if (d.Published || PublishUnpublishedItems.Checked)
- {
- if (d.PublishWithResult(UmbracoUser))
- {
-
-
- _nodesPublished++;
- Application.Lock();
- Application["publishDone" + _nodeId.ToString()] = _nodesPublished.ToString();
- Application.UnLock();
- foreach (var dc in d.Children)
- {
- DoPublishSubs(dc);
- }
- }
- else
- {
- LogHelper.Warn("Publishing failed due to event cancelling the publishing for document " + d.Id);
- }
- }
- }
-
- protected override void OnPreRender(EventArgs e)
- {
- base.OnPreRender(e);
-
- ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/publication.asmx"));
- ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
- }
-
- ///
- /// masterPagePrefix control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Literal masterPagePrefix;
-
- ///
- /// JsInclude1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
- ///
- /// TheForm control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Panel TheForm;
-
- ///
- /// PublishAll control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.CheckBox PublishAll;
-
- ///
- /// PublishUnpublishedItems control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.CheckBox PublishUnpublishedItems;
-
- ///
- /// 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;
-
- ///
- /// ProgBar1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.ProgressBar ProgBar1;
-
- ///
- /// theEnd control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Panel theEnd;
-
- ///
- /// feedbackMsg control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::umbraco.uicontrols.Feedback feedbackMsg;
- }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Node.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Node.cs
index 104c30f827..8ec10f2c2c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Node.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/nodeFactory/Node.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -24,9 +23,7 @@ namespace umbraco.NodeFactory
[XmlType(Namespace = "http://umbraco.org/webservices/")]
public class Node : INode
{
- private Hashtable _aliasToNames = new Hashtable();
-
- private bool _initialized = false;
+ private bool _initialized = false;
private Nodes _children = new Nodes();
private Node _parent = null;
private int _id;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
index 9e9e4b7802..5edefcc594 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
@@ -25,7 +25,6 @@ namespace umbraco.cms.presentation.settings.stylesheet
}
private businesslogic.web.StylesheetProperty _stylesheetproperty;
- private DropDownList _ddl = new DropDownList();
protected void Page_Load(object sender, EventArgs e)
{
diff --git a/src/umbraco.controls/TabPage.cs b/src/umbraco.controls/TabPage.cs
index aae552de98..8f065116a0 100644
--- a/src/umbraco.controls/TabPage.cs
+++ b/src/umbraco.controls/TabPage.cs
@@ -16,7 +16,6 @@ namespace umbraco.uicontrols {
// Ensure that a TabPage cannot be instatiated outside
// this assembly -> New instances of a tabpage can only be retrieved through the tabview
private bool _hasMenu = true;
- private readonly ScrollingMenu _menu = new ScrollingMenu();
protected LiteralControl ErrorHeaderControl = new LiteralControl();
private LiteralControl _closeButtonControl = new LiteralControl();
private readonly ValidationSummary _vs = new ValidationSummary();
diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
deleted file mode 100644
index f6ec580a3d..0000000000
--- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
+++ /dev/null
@@ -1,623 +0,0 @@
-using System;
-using System.Collections;
-using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.UI;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using umbraco.BasePages;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.editorControls.tinymce;
-using umbraco.editorControls.tinyMCE3.webcontrol;
-using umbraco.editorControls.wysiwyg;
-using umbraco.interfaces;
-using Umbraco.Core.IO;
-using umbraco.presentation;
-using umbraco.uicontrols;
-
-namespace umbraco.editorControls.tinyMCE3
-{
- [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
- public class TinyMCE : TinyMCEWebControl, IDataEditor, IMenuElement
- {
- private readonly string _activateButtons = "";
- private readonly string _advancedUsers = "";
- private readonly SortedList _buttons = new SortedList();
- private readonly IData _data;
- private readonly string _disableButtons = "help,visualaid,";
- private readonly string _editorButtons = "";
- private readonly bool _enableContextMenu;
- private readonly bool _fullWidth;
- private readonly int _height;
- private readonly SortedList _mceButtons = new SortedList();
- private readonly ArrayList _menuIcons = new ArrayList();
- private readonly bool _showLabel;
- private readonly ArrayList _stylesheets = new ArrayList();
- private readonly int _width;
-
- private readonly int m_maxImageWidth = 500;
- private bool _isInitialized;
- private string _plugins = "";
-
- public TinyMCE(IData Data, string Configuration)
- {
- _data = Data;
- try
- {
- string[] configSettings = Configuration.Split("|".ToCharArray());
-
- if (configSettings.Length > 0)
- {
- _editorButtons = configSettings[0];
-
- if (configSettings.Length > 1)
- if (configSettings[1] == "1")
- _enableContextMenu = true;
-
- if (configSettings.Length > 2)
- _advancedUsers = configSettings[2];
-
- if (configSettings.Length > 3)
- {
- if (configSettings[3] == "1")
- _fullWidth = true;
- else if (configSettings[4].Split(',').Length > 1)
- {
- _width = int.Parse(configSettings[4].Split(',')[0]);
- _height = int.Parse(configSettings[4].Split(',')[1]);
- }
- }
-
- // default width/height
- if (_width < 1)
- _width = 500;
- if (_height < 1)
- _height = 400;
-
- // add stylesheets
- if (configSettings.Length > 4)
- {
- foreach (string s in configSettings[5].Split(",".ToCharArray()))
- _stylesheets.Add(s);
- }
-
- if (configSettings.Length > 6 && configSettings[6] != "")
- _showLabel = bool.Parse(configSettings[6]);
-
- if (configSettings.Length > 7 && configSettings[7] != "")
- m_maxImageWidth = int.Parse(configSettings[7]);
-
- // sizing
- if (!_fullWidth)
- {
- config.Add("width", _width.ToString());
- config.Add("height", _height.ToString());
- }
-
- if (_enableContextMenu)
- _plugins += ",contextmenu";
-
-
- // If the editor is used in umbraco, use umbraco's own toolbar
- bool onFront = false;
- if (GlobalSettings.RequestIsInUmbracoApplication(HttpContext.Current))
- {
- config.Add("theme_umbraco_toolbar_location", "external");
- config.Add("skin", "umbraco");
- config.Add("inlinepopups_skin ", "umbraco");
- }
- else
- {
- onFront = true;
- config.Add("theme_umbraco_toolbar_location", "top");
- }
-
- // load plugins
- IDictionaryEnumerator pluginEnum = tinyMCEConfiguration.Plugins.GetEnumerator();
- while (pluginEnum.MoveNext())
- {
- var plugin = (tinyMCEPlugin)pluginEnum.Value;
- if (plugin.UseOnFrontend || (!onFront && !plugin.UseOnFrontend))
- _plugins += "," + plugin.Name;
- }
-
- // add the umbraco overrides to the end
- // NB: It is !!REALLY IMPORTANT!! that these plugins are added at the end
- // as they make runtime modifications to default plugins, so require
- // those plugins to be loaded first.
- _plugins += ",umbracopaste,umbracolink,umbracocontextmenu";
-
- if (_plugins.StartsWith(","))
- _plugins = _plugins.Substring(1, _plugins.Length - 1);
- if (_plugins.EndsWith(","))
- _plugins = _plugins.Substring(0, _plugins.Length - 1);
-
- config.Add("plugins", _plugins);
-
- // Check advanced settings
- if (UmbracoEnsuredPage.CurrentUser != null && ("," + _advancedUsers + ",").IndexOf("," + UmbracoEnsuredPage.CurrentUser.UserType.Id + ",") >
- -1)
- config.Add("umbraco_advancedMode", "true");
- else
- config.Add("umbraco_advancedMode", "false");
-
- // Check maximum image width
- config.Add("umbraco_maximumDefaultImageWidth", m_maxImageWidth.ToString());
-
- // Styles
- string cssFiles = String.Empty;
- string styles = string.Empty;
- foreach (string styleSheetId in _stylesheets)
- {
- if (styleSheetId.Trim() != "")
- try
- {
- var s = StyleSheet.GetStyleSheet(int.Parse(styleSheetId), false, false);
-
- if (s.nodeObjectType == StyleSheet.ModuleObjectType)
- {
- cssFiles += IOHelper.ResolveUrl(SystemDirectories.Css + "/" + s.Text + ".css");
-
- foreach (StylesheetProperty p in s.Properties)
- {
- if (styles != string.Empty)
- {
- styles += ";";
- }
- if (p.Alias.StartsWith("."))
- styles += p.Text + "=" + p.Alias;
- else
- styles += p.Text + "=" + p.Alias;
- }
-
- cssFiles += ",";
- }
- }
- catch (Exception ee)
- {
- LogHelper.Error("Error adding stylesheet to tinymce Id:" + styleSheetId, ee);
- }
- }
- // remove any ending comma (,)
- if (!string.IsNullOrEmpty(cssFiles))
- {
- cssFiles = cssFiles.TrimEnd(',');
- }
-
- // language
- string userLang = (UmbracoEnsuredPage.CurrentUser != null) ?
- (User.GetCurrent().Language.Contains("-") ?
- User.GetCurrent().Language.Substring(0, User.GetCurrent().Language.IndexOf("-")) : User.GetCurrent().Language)
- : "en";
- config.Add("language", userLang);
-
- config.Add("content_css", cssFiles);
- config.Add("theme_umbraco_styles", styles);
-
- // Add buttons
- IDictionaryEnumerator ide = tinyMCEConfiguration.Commands.GetEnumerator();
- while (ide.MoveNext())
- {
- var cmd = (tinyMCECommand)ide.Value;
- if (_editorButtons.IndexOf("," + cmd.Alias + ",") > -1)
- _activateButtons += cmd.Alias + ",";
- else
- _disableButtons += cmd.Alias + ",";
- }
-
- if (_activateButtons.Length > 0)
- _activateButtons = _activateButtons.Substring(0, _activateButtons.Length - 1);
- if (_disableButtons.Length > 0)
- _disableButtons = _disableButtons.Substring(0, _disableButtons.Length - 1);
-
- // Add buttons
- initButtons();
- _activateButtons = "";
-
- int separatorPriority = 0;
- ide = _mceButtons.GetEnumerator();
- while (ide.MoveNext())
- {
- string mceCommand = ide.Value.ToString();
- var curPriority = (int)ide.Key;
-
- // Check priority
- if (separatorPriority > 0 &&
- Math.Floor(decimal.Parse(curPriority.ToString()) / 10) >
- Math.Floor(decimal.Parse(separatorPriority.ToString()) / 10))
- _activateButtons += "separator,";
-
- _activateButtons += mceCommand + ",";
-
- separatorPriority = curPriority;
- }
-
-
- config.Add("theme_umbraco_buttons1", _activateButtons);
- config.Add("theme_umbraco_buttons2", "");
- config.Add("theme_umbraco_buttons3", "");
- config.Add("theme_umbraco_toolbar_align", "left");
- config.Add("theme_umbraco_disable", _disableButtons);
-
- config.Add("theme_umbraco_path ", "true");
- config.Add("extended_valid_elements", "div[*]");
- config.Add("document_base_url", "/");
- config.Add("relative_urls", "false");
- config.Add("remove_script_host", "true");
- config.Add("event_elements", "div");
- config.Add("paste_auto_cleanup_on_paste", "true");
-
- config.Add("valid_elements",
- tinyMCEConfiguration.ValidElements.Substring(1,
- tinyMCEConfiguration.ValidElements.Length -
- 2));
- config.Add("invalid_elements", tinyMCEConfiguration.InvalidElements);
-
- // custom commands
- if (tinyMCEConfiguration.ConfigOptions.Count > 0)
- {
- ide = tinyMCEConfiguration.ConfigOptions.GetEnumerator();
- while (ide.MoveNext())
- {
- config.Add(ide.Key.ToString(), ide.Value.ToString());
- }
- }
-
- //if (HttpContext.Current.Request.Path.IndexOf(Umbraco.Core.IO.SystemDirectories.Umbraco) > -1)
- // config.Add("language", User.GetUser(BasePage.GetUserId(BasePage.umbracoUserContextID)).Language);
- //else
- // config.Add("language", System.Threading.Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName);
-
- if (_fullWidth)
- {
- config.Add("auto_resize", "true");
- base.Columns = 30;
- base.Rows = 30;
- }
- else
- {
- base.Columns = 0;
- base.Rows = 0;
- }
- EnableViewState = false;
- }
- }
- catch (Exception ex)
- {
- throw new ArgumentException("Incorrect TinyMCE configuration.", "Configuration", ex);
- }
- }
-
- #region TreatAsRichTextEditor
-
- public virtual bool TreatAsRichTextEditor
- {
- get { return false; }
- }
-
- #endregion
-
- #region ShowLabel
-
- public virtual bool ShowLabel
- {
- get { return _showLabel; }
- }
-
- #endregion
-
- #region Editor
-
- public Control Editor
- {
- get { return this; }
- }
-
- #endregion
-
- #region Save()
-
- public virtual void Save()
- {
- string parsedString = base.Text.Trim();
- string parsedStringForTinyMce = parsedString;
- if (parsedString != string.Empty)
- {
- parsedString = replaceMacroTags(parsedString).Trim();
-
- // tidy html - refactored, see #30534
- if (UmbracoConfig.For.UmbracoSettings().Content.TidyEditorContent)
- {
- // always wrap in a - using
was a bad idea
- parsedString = "
" + parsedString + "
";
-
- string tidyTxt = library.Tidy(parsedString, false);
- if (tidyTxt != "[error]")
- {
- parsedString = tidyTxt;
-
- // remove pesky \r\n, and other empty chars
- parsedString = parsedString.Trim(new char[] { '\r', '\n', '\t', ' ' });
-
- // compensate for breaking macro tags by tidy (?)
- parsedString = parsedString.Replace("/?>", "/>");
-
- // remove the wrapping
- safer to check that it is still here
- if (parsedString.StartsWith("
") && parsedString.EndsWith("
"))
- parsedString = parsedString.Substring("
".Length, parsedString.Length - "
".Length);
- }
- }
-
- // rescue umbraco tags
- parsedString = parsedString.Replace("|||?", "").Replace("|*|", "\"");
-
- // fix images
- parsedString = tinyMCEImageHelper.cleanImages(parsedString);
-
- // parse current domain and instances of slash before anchor (to fix anchor bug)
- // NH 31-08-2007
- if (HttpContext.Current.Request.ServerVariables != null)
- {
- parsedString = parsedString.Replace(helper.GetBaseUrl(HttpContext.Current) + "/#", "#");
- parsedString = parsedString.Replace(helper.GetBaseUrl(HttpContext.Current), "");
- }
- // if a paragraph is empty, remove it
- if (parsedString.ToLower() == "
")
- parsedString = "";
-
- // save string after all parsing is done, but before CDATA replacement - to put back into TinyMCE
- parsedStringForTinyMce = parsedString;
-
- //Allow CDATA nested into RTE without exceptions
- // GE 2012-01-18
- parsedString = parsedString.Replace("").Replace("]]>", "");
- }
-
- _data.Value = parsedString;
-
- // update internal webcontrol value with parsed result
- base.Text = parsedStringForTinyMce;
- }
-
- #endregion
-
- public virtual string Plugins
- {
- get { return _plugins; }
- set { _plugins = value; }
- }
-
- public object[] MenuIcons
- {
- get
- {
- initButtons();
-
- var tempIcons = new object[_menuIcons.Count];
- for (int i = 0; i < _menuIcons.Count; i++)
- tempIcons[i] = _menuIcons[i];
- return tempIcons;
- }
- }
-
-
- #region IMenuElement Members
-
- public string ElementName
- {
- get { return "div"; }
- }
-
- public string ElementIdPreFix
- {
- get { return "umbTinymceMenu"; }
- }
-
- public string ElementClass
- {
- get { return "tinymceMenuBar"; }
- }
-
- public int ExtraMenuWidth
- {
- get
- {
- initButtons();
- return _buttons.Count * 40 + 300;
- }
- }
-
- #endregion
-
- protected override void OnLoad(EventArgs e)
- {
- try
- {
- // add current page info
- base.NodeId = ((cms.businesslogic.datatype.DefaultData)_data).NodeId;
- if (NodeId != 0)
- {
- base.VersionId = ((cms.businesslogic.datatype.DefaultData)_data).Version;
- config.Add("theme_umbraco_pageId", base.NodeId.ToString());
- config.Add("theme_umbraco_versionId", base.VersionId.ToString());
-
- // we'll need to make an extra check for the liveediting as that value is set after the constructor have initialized
- config.Add("umbraco_toolbar_id",
- ElementIdPreFix +
- ((cms.businesslogic.datatype.DefaultData)_data).PropertyId);
- }
- else
- {
- // this is for use when tinymce is used for non default Umbraco pages
- config.Add("umbraco_toolbar_id",
- ElementIdPreFix + "_" + this.ClientID);
- }
- }
- catch
- {
- // Empty catch as this is caused by the document doesn't exists yet,
- // like when using this on an autoform, partly replaced by the if/else check on nodeId above though
- }
- base.OnLoad(e);
- }
-
- protected override void OnInit(EventArgs e)
- {
- base.OnInit(e);
- //Allow CDATA nested into RTE without exceptions
- // GE 2012-01-18
- if (_data != null && _data.Value != null)
- base.Text = _data.Value.ToString().Replace("", "", "]]>");
- }
-
- private string replaceMacroTags(string text)
- {
- while (findStartTag(text) > -1)
- {
- string result = text.Substring(findStartTag(text), findEndTag(text) - findStartTag(text));
- text = text.Replace(result, generateMacroTag(result));
- }
- return text;
- }
-
- private string generateMacroTag(string macroContent)
- {
- string macroAttr = macroContent.Substring(5, macroContent.IndexOf(">") - 5);
- string macroTag = "|||?UMBRACO_MACRO ";
- Hashtable attributes = ReturnAttributes(macroAttr);
- IDictionaryEnumerator ide = attributes.GetEnumerator();
- while (ide.MoveNext())
- {
- if (ide.Key.ToString().IndexOf("umb_") != -1)
- {
- // Hack to compensate for Firefox adding all attributes as lowercase
- string orgKey = ide.Key.ToString();
- if (orgKey == "umb_macroalias")
- orgKey = "umb_macroAlias";
-
- macroTag += orgKey.Substring(4, orgKey.Length - 4) + "=|*|" +
- ide.Value.ToString().Replace("\\r\\n", Environment.NewLine) + "|*| ";
- }
- }
- macroTag += "/|||";
-
- return macroTag;
- }
-
- [Obsolete("Has been superceded by Umbraco.Core.XmlHelper.GetAttributesFromElement")]
- public static Hashtable ReturnAttributes(String tag)
- {
- var h = new Hashtable();
- foreach (var i in Umbraco.Core.XmlHelper.GetAttributesFromElement(tag))
- {
- h.Add(i.Key, i.Value);
- }
- return h;
- }
-
- private int findStartTag(string text)
- {
- string temp = "";
- text = text.ToLower();
- if (text.IndexOf("ismacro=\"true\"") > -1)
- {
- temp = text.Substring(0, text.IndexOf("ismacro=\"true\""));
- return temp.LastIndexOf("<");
- }
- return -1;
- }
-
- private int findEndTag(string text)
- {
- string find = "";
-
- int endMacroIndex = text.ToLower().IndexOf(find);
- string tempText = text.ToLower().Substring(endMacroIndex + find.Length,
- text.Length - endMacroIndex - find.Length);
- int finalEndPos = 0;
- while (tempText.Length > 5)
- if (tempText.Substring(finalEndPos, 6) == "
")
- break;
- else
- finalEndPos++;
-
- return endMacroIndex + find.Length + finalEndPos + 6;
- }
-
- private void initButtons()
- {
- if (!_isInitialized)
- {
- _isInitialized = true;
-
- // Add icons for the editor control:
- // Html
- // Preview
- // Style picker, showstyles
- // Bold, italic, Text Gen
- // Align: left, center, right
- // Lists: Bullet, Ordered, indent, undo indent
- // Link, Anchor
- // Insert: Image, macro, table, formular
-
- foreach (string button in _activateButtons.Split(','))
- {
- if (button.Trim() != "")
- {
- try
- {
- var cmd = (tinyMCECommand)tinyMCEConfiguration.Commands[button];
-
- string appendValue = "";
- if (cmd.Value != "")
- appendValue = ", '" + cmd.Value + "'";
- _mceButtons.Add(cmd.Priority, cmd.Command);
- _buttons.Add(cmd.Priority,
- new editorButton(cmd.Alias, ui.Text("buttons", cmd.Alias), cmd.Icon,
- "tinyMCE.execInstanceCommand('" + ClientID + "', '" +
- cmd.Command + "', " + cmd.UserInterface + appendValue + ")"));
- }
- catch (Exception ee)
- {
- LogHelper.Error
(string.Format("TinyMCE: Error initializing button '{0}'", button), ee);
- }
- }
- }
-
- // add save icon
- int separatorPriority = 0;
- IDictionaryEnumerator ide = _buttons.GetEnumerator();
- while (ide.MoveNext())
- {
- object buttonObj = ide.Value;
- var curPriority = (int)ide.Key;
-
- // Check priority
- if (separatorPriority > 0 &&
- Math.Floor(decimal.Parse(curPriority.ToString()) / 10) >
- Math.Floor(decimal.Parse(separatorPriority.ToString()) / 10))
- _menuIcons.Add("|");
-
- try
- {
- var e = (editorButton)buttonObj;
-
- MenuIconI menuItem = new MenuIconClass();
-
- menuItem.OnClickCommand = e.onClickCommand;
- menuItem.ImageURL = e.imageUrl;
- menuItem.AltText = e.alttag;
- menuItem.ID = e.id;
- _menuIcons.Add(menuItem);
- }
- catch
- {
- }
-
- separatorPriority = curPriority;
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs b/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs
deleted file mode 100644
index dfc2f54d61..0000000000
--- a/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Umbraco.Core;
-
-namespace umbraco.editorControls.tinyMCE3
-{
- [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
- public class tinyMCE3dataType : umbraco.cms.businesslogic.datatype.BaseDataType, umbraco.interfaces.IDataType
- {
- private umbraco.interfaces.IDataEditor _Editor;
- private umbraco.interfaces.IData _baseData;
- private umbraco.interfaces.IDataPrevalue _prevalueeditor;
-
- public override umbraco.interfaces.IDataEditor DataEditor
- {
- get
- {
- if (_Editor == null)
- _Editor = new TinyMCE(Data, ((umbraco.editorControls.tinymce.tinyMCEPreValueConfigurator)PrevalueEditor).Configuration);
- return _Editor;
- }
- }
-
- public override umbraco.interfaces.IData Data
- {
- get
- {
- if (_baseData == null)
- _baseData = new cms.businesslogic.datatype.DefaultData(this);
- return _baseData;
- }
- }
- public override Guid Id
- {
- get { return new Guid(Constants.PropertyEditors.TinyMCEv3); }
- }
-
- public override string DataTypeName
- {
- get { return "TinyMCE v3 wysiwyg"; }
- }
-
- public override umbraco.interfaces.IDataPrevalue PrevalueEditor
- {
- get
- {
- if (_prevalueeditor == null)
- _prevalueeditor = new tinymce.tinyMCEPreValueConfigurator(this);
- return _prevalueeditor;
- }
- }
- }
-}
diff --git a/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs b/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
deleted file mode 100644
index 313e2326ed..0000000000
--- a/src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
+++ /dev/null
@@ -1,397 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using ClientDependency.Core.Controls;
-using ClientDependency.Core;
-using File = System.IO.File;
-
-namespace umbraco.editorControls.tinyMCE3.webcontrol
-{
- [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
- public class TinyMCEWebControl : TextBox
- {
- internal readonly MediaFileSystem _fs;
-
- public NameValueCollection config = new NameValueCollection();
- private string temp;
-
- private int _nodeId = 0;
- private Guid _versionId;
-
- public int NodeId
- {
- set { _nodeId = value; }
- get { return _nodeId; }
- }
-
- public Guid VersionId
- {
- set { _versionId = value; }
- get { return _versionId; }
- }
-
- public string InstallPath
- {
- get
- {
- if (installPath == null)
- installPath = this.config["InstallPath"];
-
- return installPath;
- }
- set { installPath = value; }
- }
-
- #region private
- private static readonly object TextChangedEvent = new object();
- private int rows = 10;
- private int cols = 70;
- private bool gzipEnabled, merged;
- private string installPath, mode;
- private System.Text.StringBuilder m_scriptInitBlock = new StringBuilder();
- #endregion
-
- public TinyMCEWebControl()
- : base()
- {
- _fs = FileSystemProviderManager.Current.GetFileSystemProvider();
-
- base.TextMode = TextBoxMode.MultiLine;
- base.Attributes.Add("style", "visibility: hidden");
- config.Add("mode", "exact");
- config.Add("theme", "umbraco");
- config.Add("umbraco_path", global::Umbraco.Core.IO.IOHelper.ResolveUrl(global::Umbraco.Core.IO.SystemDirectories.Umbraco));
- CssClass = "tinymceContainer";
- plugin.ConfigSection configSection = (plugin.ConfigSection)System.Web.HttpContext.Current.GetSection("TinyMCE");
-
- if (configSection != null)
- {
- this.installPath = configSection.InstallPath;
- this.mode = configSection.Mode;
- this.gzipEnabled = configSection.GzipEnabled;
-
- // Copy items into local config collection
- foreach (string key in configSection.GlobalSettings.Keys)
- this.config[key] = configSection.GlobalSettings[key];
- }
- else
- {
- configSection = new plugin.ConfigSection();
- configSection.GzipExpiresOffset = TimeSpan.FromDays(10).Ticks;
- this.gzipEnabled = false;
- this.InstallPath = umbraco.editorControls.tinymce.tinyMCEConfiguration.JavascriptPath;
-
- }
-
- }
-
- protected override void OnPreRender(EventArgs e)
- {
- base.OnPreRender(e);
- // update macro's and images in text
- if (_nodeId != 0)
- {
- base.Text = ParseMacrosToHtml(FormatMedia(base.Text));
- }
-
- }
-
- protected override void Render(HtmlTextWriter writer)
- {
- base.Render(writer);
- // add a marker to tell Live Editing when a tinyMCE control is on the page
- writer.Write("");
- }
-
- protected override void OnLoad(EventArgs args)
- {
- this.config["elements"] = this.ClientID;
-
-
- bool first = true;
-
- //TinyMCE uses it's own compressor so leave it up to ScriptManager to render
- ScriptManager.RegisterClientScriptInclude(this, this.GetType(), _versionId.ToString(), this.ScriptURI);
-
- // Write script tag start
- m_scriptInitBlock.Append(HtmlTextWriter.TagLeftChar.ToString());
- m_scriptInitBlock.Append("script");
- m_scriptInitBlock.Append(" type=\"text/javascript\"");
- m_scriptInitBlock.Append(HtmlTextWriter.TagRightChar.ToString());
- m_scriptInitBlock.Append("\n");
-
- m_scriptInitBlock.Append("tinyMCE.init({\n");
-
- // Write options
- foreach (string key in this.config.Keys)
- {
- //TODO: This is a hack to test if we can prevent tinymce from automatically download languages
- string val = this.config[key];
-
- if (!first)
- m_scriptInitBlock.Append(",\n");
- else
- first = false;
-
- // Is boolean state or string
- if (val == "true" || val == "false")
- m_scriptInitBlock.Append(key + ":" + this.config[key]);
- else
- m_scriptInitBlock.Append(key + ":'" + this.config[key] + "'");
- }
-
- m_scriptInitBlock.Append("\n});\n");
-
-
- // Write script tag end
- m_scriptInitBlock.Append(HtmlTextWriter.EndTagLeftChars);
- m_scriptInitBlock.Append("script");
- m_scriptInitBlock.Append(HtmlTextWriter.TagRightChar.ToString());
-
-
- }
-
-
- string ScriptURI
- {
- get
- {
- string suffix = "", outURI;
-
- if (this.InstallPath == null)
- throw new Exception("Required installPath setting is missing, add it to your web.config. You can also add it directly to your tinymce:TextArea element using InstallPath but the web.config method is recommended since it allows you to switch over to gzip compression.");
-
- if (this.mode != null)
- suffix = "_" + this.mode;
-
- outURI = this.InstallPath + "/tiny_mce_src" + suffix + ".js";
- if (!File.Exists(global::Umbraco.Core.IO.IOHelper.MapPath(outURI)))
- throw new Exception("Could not locate TinyMCE by URI:" + outURI + ", Physical path:" + global::Umbraco.Core.IO.IOHelper.MapPath(outURI) + ". Make sure that you configured the installPath to a valid location in your web.config. This path should be an relative or site absolute URI to where TinyMCE is located.");
-
- // Collect themes, languages and plugins and build gzip URI
- // TODO: Make sure gzip is re-enabled
- this.gzipEnabled = true;
- if (this.gzipEnabled)
- {
- ArrayList themes = new ArrayList(), plugins = new ArrayList(), languages = new ArrayList();
-
- // Add themes
- if (config["theme"] == null)
- config["theme"] = "simple";
-
- foreach (string theme in config["theme"].Split(','))
- {
- string themeVal = theme.Trim();
-
- if (themes.IndexOf(themeVal) == -1)
- themes.Add(themeVal);
- }
-
- // Add plugins
- if (config["plugins"] != null)
- {
- foreach (string plugin in config["plugins"].Split(','))
- {
- string pluginVal = plugin.Trim();
-
- if (plugins.IndexOf(pluginVal) == -1)
- plugins.Add(pluginVal);
- }
- }
-
- // Add language
- if (config["language"] == null)
- config["language"] = "en";
-
- if (languages.IndexOf(config["language"]) == -1)
- languages.Add(config["language"]);
-
- // NH: No clue why these extra dashes are added, but the affect other parts of the implementation
- // Skip loading of themes and plugins
- // area.config["theme"] = "-" + area.config["theme"];
-
- // if (area.config["plugins"] != null)
- // area.config["plugins"] = "-" + String.Join(",-", area.config["plugins"].Split(','));
-
- // Build output URI
- // NH: Use versionId for randomize to ensure we don't download a new tinymce on every single call
- outURI = umbraco.editorControls.tinymce.tinyMCEConfiguration.PluginPath + "/tinymce3tinymceCompress.aspx?rnd=" + this._versionId.ToString() + "&module=gzipmodule";
-
- if (themes.Count > 0)
- outURI += "&themes=" + String.Join(",", ((string[])themes.ToArray(typeof(string))));
-
- if (plugins.Count > 0)
- outURI += "&plugins=" + String.Join(",", ((string[])plugins.ToArray(typeof(string))));
-
- if (languages.Count > 0)
- outURI += "&languages=" + String.Join(",", ((string[])languages.ToArray(typeof(string))));
- }
-
- return outURI;
- }
- }
-
-
- private string FormatMedia(string html)
- {
- // root media url
- var rootMediaUrl = _fs.GetUrl("");
-
- // Find all media images
- var pattern = string.Format("![]()
]*src=\"(?{0}[^\"]*)\" [^>]*>", rootMediaUrl);
-
- var tags = Regex.Matches(html, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-
- foreach (Match tag in tags)
- {
- if (tag.Groups.Count <= 0)
- continue;
-
- // Replace /> to ensure we're in old-school html mode
- var tempTag = "", " >"),
- "(?\\S*)=\"(?[^\"]*)\"|(?\\S*)=(?[^\"|\\s]*)\\s",
- RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-
- //GE: Add ContainsKey check and expand the ifs for readability
- foreach (Match attributeSet in m)
- {
- if (attributeSet.Groups["attributeName"].Value.ToLower() != "src" && ht.ContainsKey(attributeSet.Groups["attributeName"].Value) == false)
- {
- ht.Add(attributeSet.Groups["attributeName"].Value, attributeSet.Groups["attributeValue"].Value);
- }
- }
-
- // build the element
- // Build image tag
- var ide = ht.GetEnumerator();
- while (ide.MoveNext())
- tempTag += string.Format(" {0}=\"{1}\"", ide.Key, ide.Value);
-
- orgSrc = IOHelper.ResolveUrl(orgSrc.Replace("%20", " "));
-
- var mediaService = ApplicationContext.Current.Services.MediaService;
- var imageMedia = mediaService.GetMediaByPath(orgSrc);
-
- if (imageMedia == null)
- {
- tempTag = string.Format("{0} src=\"{1}\" />", tempTag, IOHelper.ResolveUrl(orgSrc));
- }
- else
- {
- // We're doing .Any checks here instead of FirstOrDefault because the default value of Properties
- // is not null but default(KeyedCollection). This is a bit easier to read.
- // To clarify: imageMedia.Properties.FirstOrDefault(x => x.Alias == "umbracoWidth") == null; will NOT work.
-
- var widthValue = string.Empty;
- if (imageMedia.Properties.Any(x => x.Alias == "umbracoWidth"))
- widthValue = imageMedia.Properties.First(x => x.Alias == "umbracoWidth").Value.ToString();
-
- var heightValue = string.Empty;
- if (imageMedia.Properties.Any(x => x.Alias == "umbracoHeight"))
- heightValue = imageMedia.Properties.First(x => x.Alias == "umbracoHeight").Value.ToString();
-
- // Format the tag
- if (imageMedia.Properties.Any(x => x.Alias == "umbracoFile"))
- {
- var umbracoFileProperty = imageMedia.Properties.First(x => x.Alias == "umbracoFile");
- tempTag = string.Format("{0} rel=\"{1},{2}\" src=\"{3}\" />", tempTag, widthValue, heightValue, umbracoFileProperty.Value);
- }
- }
-
- html = html.Replace(tag.Value, tempTag);
- }
-
- return html;
- }
-
- private string ParseMacrosToHtml(string input)
- {
- int nodeId = _nodeId;
- Guid versionId = _versionId;
- string content = input;
-
-
- string pattern = @"(<\?UMBRACO_MACRO\W*[^>]*/>)";
- MatchCollection tags =
- Regex.Matches(content, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-
- // Page for macro rendering
- // page p = new page(nodeId, versionId);
-
-
- System.Web.HttpContext.Current.Items["macrosAdded"] = 0;
- System.Web.HttpContext.Current.Items["pageID"] = nodeId.ToString();
-
- foreach (Match tag in tags)
- {
- try
- {
- // Create div
- Hashtable attributes = helper.ReturnAttributes(tag.Groups[1].Value);
- string div = macro.RenderMacroStartTag(attributes, nodeId, versionId); //.Replace(""", """);
-
- // Insert macro contents here...
- macro m;
- if (helper.FindAttribute(attributes, "macroID") != "")
- m = macro.GetMacro(int.Parse(helper.FindAttribute(attributes, "macroID")));
- else
- {
- // legacy: Check if the macroAlias is typed in lowercasing
- string macroAlias = helper.FindAttribute(attributes, "macroAlias");
- if (macroAlias == "")
- {
- macroAlias = helper.FindAttribute(attributes, "macroalias");
- attributes.Remove("macroalias");
- attributes.Add("macroAlias", macroAlias);
- }
-
- if (macroAlias != "")
- m = macro.GetMacro(macroAlias);
- else
- throw new ArgumentException("umbraco is unable to identify the macro. No id or macroalias was provided for the macro in the macro tag.", tag.Groups[1].Value);
- }
-
- if (helper.FindAttribute(attributes, "macroAlias") == "")
- attributes.Add("macroAlias", m.Alias);
-
-
- try
- {
- div += macro.MacroContentByHttp(nodeId, versionId, attributes);
- }
- catch
- {
- div += "No macro content available for WYSIWYG editing";
- }
-
-
- div += macro.RenderMacroEndTag();
- content = content.Replace(tag.Groups[1].Value, div);
- }
- catch (Exception ee)
- {
- LogHelper.Error("Macro Parsing Error", ee);
- string div = "umbraco was unable to parse a macro tag, which means that parts of this content might be corrupt.
Best solution is to rollback to a previous version by right clicking the node in the tree and then try to insert the macro again.
Please report this to your system administrator as well - this error has been logged.
![]()
]*>";
- var tags = Regex.Matches(html + " ", pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
- foreach (Match tag in tags)
- {
- if (tag.Value.ToLower().IndexOf("umbraco_macro", StringComparison.Ordinal) == -1)
- {
- var cleanTag = "", " >"), "(?\\S*?)=\"(?[^\"]*)\"|(?\\S*?)=(?[^\"|\\s]*)\\s", RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
- foreach (Match attributeSet in matches)
- {
- ht.Add(attributeSet.Groups["attributeName"].Value.ToLower(),
- attributeSet.Groups["attributeValue"].Value);
- }
-
- // If rel attribute exists and if it's different from current sizing we should resize the image!
- if (helper.FindAttribute(ht, "rel") != "")
- {
- // if size has changed resize image serverside
- var newDims = helper.FindAttribute(ht, "rel").Split(",".ToCharArray());
- if (newDims.Length > 0 && (newDims[0] != helper.FindAttribute(ht, "width") || newDims[1] != helper.FindAttribute(ht, "height")))
- {
- try
- {
- int newWidth;
- int newHeight;
- string newSrc;
-
- cleanTag += DoResize(ht, out newWidth, out newHeight, out newSrc);
-
- ht["src"] = newSrc;
- }
- catch (Exception err)
- {
- cleanTag += " src=\"" + helper.FindAttribute(ht, "src") + "\"";
- if (helper.FindAttribute(ht, "width") != "")
- {
- cleanTag += " width=\"" + helper.FindAttribute(ht, "width") + "\"";
- cleanTag += " height=\"" + helper.FindAttribute(ht, "height") + "\"";
- }
- LogHelper.Error("Error resizing image in editor", err);
- }
- }
- else
- {
- if (helper.FindAttribute(ht, "width") != "")
- {
- cleanTag += " width=\"" + helper.FindAttribute(ht, "width") + "\"";
- cleanTag += " height=\"" + helper.FindAttribute(ht, "height") + "\"";
- }
-
- }
- }
- else
- {
- if (helper.FindAttribute(ht, "width") != "")
- {
- cleanTag += " width=\"" + helper.FindAttribute(ht, "width") + "\"";
- cleanTag += " height=\"" + helper.FindAttribute(ht, "height") + "\"";
- }
- }
-
- // Build image tag
- foreach (var attr in allowedAttributes)
- {
- if (helper.FindAttribute(ht, attr) != "")
- {
- var attrValue = helper.FindAttribute(ht, attr);
- cleanTag += " " + attr + "=\"" + attrValue + "\"";
- }
- }
-
- if (bool.Parse(GlobalSettings.EditXhtmlMode))
- cleanTag += "/";
-
- cleanTag += ">";
- html = html.Replace(tag.Value, cleanTag);
- }
- }
-
- return html;
- }
-
- private static string DoResize(IDictionary attributes, out int finalWidth, out int finalHeight, out string newSrc)
- {
- var fs = FileSystemProviderManager.Current.GetFileSystemProvider();
- var orgSrc = HttpContext.Current.Server.HtmlDecode(helper.FindAttribute(attributes, "src").Replace("%20", " "));
- var orgDim = helper.FindAttribute(attributes, "rel").Split(",".ToCharArray());
- var orgWidth = float.Parse(orgDim[0]);
- var orgHeight = float.Parse(orgDim[1]);
- var newWidth = int.Parse(helper.FindAttribute(attributes, "width"));
- var newHeight = int.Parse(helper.FindAttribute(attributes, "height"));
-
- newSrc = "";
-
- if (orgHeight > 0 && orgWidth > 0 && orgSrc != "")
- {
- // Check dimensions
- if (Math.Abs(orgWidth / newWidth) > Math.Abs(orgHeight / newHeight))
- {
- newHeight = (int)Math.Round(newWidth * (orgHeight / orgWidth));
- }
- else
- {
- newWidth = (int)Math.Round(newHeight * (orgWidth / orgHeight));
- }
-
- var orgPath = fs.GetRelativePath(orgSrc);
- if (fs.FileExists(orgPath))
- {
- var uf = new UmbracoFile(orgPath);
-
- try
- {
- newSrc = uf.Resize(newWidth, newHeight);
- }
- catch (Exception ex)
- {
- LogHelper.Error(string.Format("The file {0} could not be resized, reverting the image src attribute to the original source: {1}", orgPath, orgSrc), ex);
- newSrc = orgSrc;
- }
- }
- else
- {
- LogHelper.Warn(string.Format("The file {0} does not exist, reverting the image src attribute to the original source: {1}", orgPath, orgSrc));
- newSrc = orgSrc;
- }
- }
-
- finalWidth = newWidth;
- finalHeight = newHeight;
-
- return " width=\"" + newWidth + "\" height=\"" + newHeight + "\"";
- }
- }
-}
\ No newline at end of file
diff --git a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
deleted file mode 100644
index 533a961416..0000000000
--- a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Collections;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-using umbraco.BusinessLogic;
-using umbraco.DataLayer;
-
-namespace umbraco.editorControls.tinymce
-{
- [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
- public class tinyMCEPreValueConfigurator : System.Web.UI.WebControls.PlaceHolder, interfaces.IDataPrevalue
- {
- // UI controls
- private CheckBoxList _editorButtons;
- private CheckBox _enableRightClick;
- private DropDownList _dropdownlist;
- private CheckBoxList _advancedUsersList;
- private CheckBoxList _stylesheetList;
- private TextBox _width = new TextBox();
- private TextBox _height = new TextBox();
- private TextBox _maxImageWidth = new TextBox();
- private CheckBox _fullWidth = new CheckBox();
- private CheckBox _showLabel = new CheckBox();
- private RegularExpressionValidator _widthValidator = new RegularExpressionValidator();
- private RegularExpressionValidator _heightValidator = new RegularExpressionValidator();
- private RegularExpressionValidator _maxImageWidthValidator = new RegularExpressionValidator();
-
- // referenced datatype
- private cms.businesslogic.datatype.BaseDataType _datatype;
- private string _selectedButtons = "";
- private string _advancedUsers = "";
- private string _stylesheets = "";
-
- public static ISqlHelper SqlHelper
- {
- get { return Application.SqlHelper; }
- }
-
- public tinyMCEPreValueConfigurator(cms.businesslogic.datatype.BaseDataType DataType)
- {
- // state it knows its datatypedefinitionid
- _datatype = DataType;
- setupChildControls();
- }
-
- private void setupChildControls()
- {
- _dropdownlist = new DropDownList();
- _dropdownlist.ID = "dbtype";
- _dropdownlist.Items.Add(DBTypes.Date.ToString());
- _dropdownlist.Items.Add(DBTypes.Integer.ToString());
- _dropdownlist.Items.Add(DBTypes.Ntext.ToString());
- _dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
-
- _editorButtons = new CheckBoxList();
- _editorButtons.ID = "editorButtons";
- _editorButtons.RepeatColumns = 4;
- _editorButtons.CellPadding = 3;
-
- _enableRightClick = new CheckBox();
- _enableRightClick.ID = "enableRightClick";
-
- _advancedUsersList = new CheckBoxList();
- _advancedUsersList.ID = "advancedUsersList";
-
- _stylesheetList = new CheckBoxList();
- _stylesheetList.ID = "stylesheetList";
-
- _showLabel = new CheckBox();
- _showLabel.ID = "showLabel";
-
- _maxImageWidth = new TextBox();
- _maxImageWidth.ID = "maxImageWidth";
-
- // put the childcontrols in context - ensuring that
- // the viewstate is persisted etc.
- Controls.Add(_dropdownlist);
- Controls.Add(_enableRightClick);
- Controls.Add(_editorButtons);
- Controls.Add(_advancedUsersList);
- Controls.Add(_stylesheetList);
- Controls.Add(_width);
- Controls.Add(_widthValidator);
- Controls.Add(_height);
- Controls.Add(_heightValidator);
- Controls.Add(_showLabel);
- Controls.Add(_maxImageWidth);
- Controls.Add(_maxImageWidthValidator);
- // Controls.Add(_fullWidth);
-
- }
-
- protected override void OnLoad(EventArgs e)
- {
- base.OnLoad (e);
- // add ids to controls
- _width.ID = "width";
- _height.ID = "height";
-
-
- // initialize validators
- _widthValidator.ValidationExpression = "0*[1-9][0-9]*";
- _widthValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab", ui.Text("width"), new BasePages.BasePage().getUser());
- _widthValidator.Display = ValidatorDisplay.Dynamic;
- _widthValidator.ControlToValidate = _width.ID;
- _heightValidator.ValidationExpression = "0*[1-9][0-9]*";
- _heightValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab", ui.Text("height"), new BasePages.BasePage().getUser());
- _heightValidator.ControlToValidate = _height.ID;
- _heightValidator.Display = ValidatorDisplay.Dynamic;
- _maxImageWidthValidator.ValidationExpression = "0*[1-9][0-9]*";
- _maxImageWidthValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab","'" + ui.Text("rteMaximumDefaultImgSize") + "'", new BasePages.BasePage().getUser());
- _maxImageWidthValidator.ControlToValidate = _maxImageWidth.ID;
- _maxImageWidthValidator.Display = ValidatorDisplay.Dynamic;
-
- if (!Page.IsPostBack)
- {
- if (Configuration != null)
- {
- string[] config = Configuration.Split("|".ToCharArray());
- if (config.Length > 0)
- {
- _selectedButtons = config[0];
-
- if (config.Length > 1)
- if (config[1] == "1")
- _enableRightClick.Checked = true;
-
- if (config.Length > 2)
- _advancedUsers = config[2];
-
- if (config.Length > 4 && config[4].Split(',').Length > 1)
- {
-// if (config[3] == "1")
-// _fullWidth.Checked = true;
-// else
-// {
- _width.Text = config[4].Split(',')[0];
- _height.Text = config[4].Split(',')[1];
-// }
- }
-
- // if width and height are empty or lower than 0 then set default sizes:
- int tempWidth, tempHeight;
- int.TryParse(_width.Text, out tempWidth);
- int.TryParse(_height.Text, out tempHeight);
- if (_width.Text.Trim() == "" || tempWidth < 1)
- _width.Text = "500";
- if (_height.Text.Trim() == "" || tempHeight < 1)
- _height.Text = "400";
-
- if (config.Length > 5)
- _stylesheets = config[5];
- if (config.Length > 6 && config[6] != "")
- _showLabel.Checked = bool.Parse(config[6]);
-
- if (config.Length > 7 && config[7] != "")
- _maxImageWidth.Text = config[7];
- else
- _maxImageWidth.Text = "500";
- }
-
- // add editor buttons
- IDictionaryEnumerator ide = tinyMCEConfiguration.SortedCommands.GetEnumerator();
- while (ide.MoveNext())
- {
- tinyMCECommand cmd = (tinyMCECommand) ide.Value;
- ListItem li =
- new ListItem(
- string.Format("![\"{1}\"](\"{0}\")
", cmd.Icon,
- cmd.Alias), cmd.Alias);
- if (_selectedButtons.IndexOf(cmd.Alias) > -1)
- li.Selected = true;
-
- _editorButtons.Items.Add(li);
- }
-
- // add users
- foreach (BusinessLogic.UserType ut in BusinessLogic.UserType.getAll)
- {
- ListItem li = new ListItem(ut.Name, ut.Id.ToString());
- if (("," + _advancedUsers + ",").IndexOf("," + ut.Id.ToString() + ",") > -1)
- li.Selected = true;
-
- _advancedUsersList.Items.Add(li);
- }
-
- // add stylesheets
- foreach (cms.businesslogic.web.StyleSheet st in cms.businesslogic.web.StyleSheet.GetAll())
- {
- ListItem li = new ListItem(st.Text, st.Id.ToString());
- if (("," + _stylesheets + ",").IndexOf("," + st.Id.ToString() + ",") > -1)
- li.Selected = true;
-
- _stylesheetList.Items.Add(li);
- }
- }
-
- // Mark the current db type
- _dropdownlist.SelectedValue = _datatype.DBType.ToString();
-
- }
- }
-
- public Control Editor
- {
- get
- {
- return this;
- }
- }
-
- public virtual void Save()
- {
- _datatype.DBType = (cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
-
- // Generate data-string
- string data = ",";
-
- foreach (ListItem li in _editorButtons.Items)
- if (li.Selected)
- data += li.Value + ",";
-
- data += "|";
-
- if (_enableRightClick.Checked)
- data += "1";
- else
- data += "0";
-
- data += "|";
-
- foreach (ListItem li in _advancedUsersList.Items)
- if (li.Selected)
- data += li.Value + ",";
-
- data += "|";
-
-
- data += "0|";
- /*
- if (_fullWidth.Checked)
- data += "1|";
- else
- data += "0|";
- */
-
- data += _width.Text + "," + _height.Text + "|";
-
- foreach (ListItem li in _stylesheetList.Items)
- if (li.Selected)
- data += li.Value + ",";
- data += "|";
- data += _showLabel.Checked.ToString() + "|";
- data += _maxImageWidth.Text + "|";
-
-
- // If the add new prevalue textbox is filled out - add the value to the collection.
- IParameter[] SqlParams = new IParameter[] {
- SqlHelper.CreateParameter("@value",data),
- SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
- SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
- // we need to populate the parameters again due to an issue with SQL CE
- SqlParams = new IParameter[] {
- SqlHelper.CreateParameter("@value",data),
- SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
- SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",SqlParams);
- }
-
- protected override void Render(HtmlTextWriter writer)
- {
- writer.WriteLine("");
- writer.WriteLine("| " + ui.Text("editdatatype", "dataBaseDatatype") + ": | ");
- _dropdownlist.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| " + ui.Text("editdatatype", "rteButtons") + ": | ");
- _editorButtons.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| " + ui.Text("editdatatype", "rteRelatedStylesheets") + ": | ");
- _stylesheetList.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| " + ui.Text("editdatatype", "rteEnableContextMenu") + ": | ");
- _enableRightClick.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| " + ui.Text("editdatatype", "rteEnableAdvancedSettings") + ": | ");
- _advancedUsersList.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| ");
- //"Size: | Maximum width and height: ");
- // _fullWidth.RenderControl(writer);
-
- writer.Write(ui.Text("editdatatype", "rteWidthAndHeight") + ": | ");
- _width.RenderControl(writer);
- _widthValidator.RenderControl(writer);
- writer.Write(" x ");
- _height.RenderControl(writer);
- _heightValidator.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| ");
- writer.Write(ui.Text("editdatatype", "rteMaximumDefaultImgSize") + ": | ");
- _maxImageWidth.RenderControl(writer);
- _maxImageWidthValidator.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("| " + ui.Text("editdatatype", "rteShowLabel") + ": | ");
- _showLabel.RenderControl(writer);
- writer.Write(" |
|---|
");
- writer.Write("
");
- }
-
- public string Configuration
- {
- get
- {
- try
- {
- return SqlHelper.ExecuteScalar("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid", SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
- }
- catch
- {
- return "";
- }
- }
- }
-
- }
-}
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 723ad1fc66..62ee324b2b 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -1,4 +1,4 @@
-
+
Local
@@ -383,22 +383,9 @@
Code
-
-
-
-
-
-
-
-
-
-
-
-
-