DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB
Remove IFormHandler dependencies completely [TFS Changeset #58467]
This commit is contained in:
Shandem
@@ -1,4 +1,4 @@
|
||||
* //TODO: All removed files will be in the umbraco.Legacy project
|
||||
* //TODO: All removed files will be in the umbraco.Legacy project unless otherwise noted
|
||||
|
||||
* DataType: 'editor' removed (editor.cs)
|
||||
* removed WysiwygDataType.cs
|
||||
@@ -18,4 +18,13 @@ exists in the current context, and if it doesn't it registers the scripts?)
|
||||
to use the UmbracoClientPath setting
|
||||
|
||||
* removed CheckBoxTree.cs [permanently!, not in legacy package]
|
||||
* removed windowCloser.cs
|
||||
* removed windowCloser.cs
|
||||
|
||||
* All references to the old Client Dependency libraries have been removed completely.
|
||||
|
||||
* Moved treeIcons.css to ~/umbraco_client/Tree/treeIcons.css
|
||||
|
||||
* Removed all IFormHandler dependencies and therefore removed the idea of FormHandlers all together:
|
||||
- IFormHandler
|
||||
- /umbraco/formhandler.cs
|
||||
- StandardFormHandlers
|
||||
@@ -1,23 +0,0 @@
|
||||
using System;
|
||||
using System.Xml;
|
||||
namespace umbraco.interfaces
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Umbraco form handler interface. Has a simple execute statement and a redirect ID.
|
||||
/// </summary>
|
||||
public interface IFormhandler
|
||||
{
|
||||
/// <summary>
|
||||
/// Executes the specified form handler node.
|
||||
/// </summary>
|
||||
/// <param name="formHandlerNode">The form handler node.</param>
|
||||
/// <returns></returns>
|
||||
bool Execute(XmlNode formHandlerNode);
|
||||
/// <summary>
|
||||
/// Gets the redirect ID.
|
||||
/// </summary>
|
||||
/// <value>The redirect ID.</value>
|
||||
int redirectID {get;}
|
||||
}
|
||||
}
|
||||
@@ -122,9 +122,6 @@
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="IDataWithPreview.cs" />
|
||||
<Compile Include="IFormhandler.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ILiveEditingDataEditor.cs" />
|
||||
<Compile Include="IMacroGuiRendering.cs">
|
||||
<SubType>Code</SubType>
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Xml;
|
||||
using System.Xml.XPath;
|
||||
|
||||
namespace umbraco
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for formHandler.
|
||||
/// </summary>
|
||||
public class formHandler
|
||||
{
|
||||
private string _alias = "";
|
||||
private string _fhAssembly = "";
|
||||
private string _fhType = "";
|
||||
private XmlNode _formHandler;
|
||||
public formHandler(string alias)
|
||||
{
|
||||
_alias = alias;
|
||||
XmlDocument formHandlers = new XmlDocument();
|
||||
formHandlers.Load(System.Web.HttpContext.Current.Server.MapPath(GlobalSettings.Path + "/../config/formHandlers.config"));
|
||||
_formHandler = formHandlers.SelectSingleNode("//formHandler [@alias='" + alias + "']");
|
||||
if (_formHandler != null)
|
||||
{
|
||||
_fhAssembly = _formHandler.Attributes.GetNamedItem("assembly").Value;
|
||||
_fhType = _formHandler.Attributes.GetNamedItem("type").Value;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public int Execute()
|
||||
{
|
||||
int redirectID = -1;
|
||||
try
|
||||
{
|
||||
// Reflect to execute and check whether the type is umbraco.main.IFormhandler
|
||||
Assembly assembly = Assembly.LoadFrom(System.Web.HttpContext.Current.Server.MapPath(GlobalSettings.Path + "/../bin/"+_fhAssembly+".dll"));
|
||||
Type type = assembly.GetType(_fhAssembly+"."+_fhType);
|
||||
interfaces.IFormhandler typeInstance = Activator.CreateInstance(type) as interfaces.IFormhandler;
|
||||
if (typeInstance != null)
|
||||
{
|
||||
typeInstance.Execute(_formHandler);
|
||||
if (typeInstance.redirectID > 0)
|
||||
{
|
||||
redirectID = typeInstance.redirectID;
|
||||
}
|
||||
System.Web.HttpContext.Current.Trace.Write("formHandler", "Formhandler '" + _alias + "' executed with redirectID = " + redirectID);
|
||||
}
|
||||
else
|
||||
System.Web.HttpContext.Current.Trace.Warn("formhandler", "Formhandler '" + _alias + "' doesn't implements interface umbraco.interfaces.IFormhandler");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
System.Web.HttpContext.Current.Trace.Warn("formhandler", "Error implementing formhandler '" + _alias + "'", e);
|
||||
}
|
||||
|
||||
return redirectID;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -320,23 +320,7 @@ namespace umbraco {
|
||||
}
|
||||
HttpContext.Current.Trace.Write("umbracoRequestHandler", "Access checking ended");
|
||||
|
||||
// Run formhandler
|
||||
if (HttpContext.Current.Request["umbracoAction"] != null)
|
||||
if (HttpContext.Current.Request["umbracoAction"] != string.Empty) {
|
||||
if (HttpContext.Current.Items["redir"] == null) {
|
||||
string[] actions = helper.Request("umbracoAction").Split(',');
|
||||
foreach (string action in actions) {
|
||||
formHandler fh = new formHandler(action);
|
||||
int redirectID = fh.Execute();
|
||||
if (redirectID > -1) {
|
||||
HttpContext.Current.Items["redir"] = "1";
|
||||
requestHandler redirHandler = new requestHandler(null, redirectID.ToString());
|
||||
if (redirHandler.currentPage != null)
|
||||
currentPage = redirHandler.currentPage;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -205,9 +205,6 @@
|
||||
<Compile Include="default.aspx.designer.cs">
|
||||
<DependentUpon>default.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="formHandler.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Global.asax.cs">
|
||||
<DependentUpon>Global.asax</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
@@ -486,13 +483,6 @@
|
||||
<Compile Include="umbraco\dialogs\insertMasterpagePlaceholder.aspx.designer.cs">
|
||||
<DependentUpon>insertMasterpagePlaceholder.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\mediaPicker.aspx.cs">
|
||||
<DependentUpon>mediaPicker.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\mediaPicker.aspx.designer.cs">
|
||||
<DependentUpon>mediaPicker.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\dialogs\republish.aspx.cs">
|
||||
<DependentUpon>republish.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1097,6 +1087,13 @@
|
||||
<Compile Include="umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx.designer.cs">
|
||||
<DependentUpon>tinymce3tinymceCompress.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\insertMacro.aspx.cs">
|
||||
<DependentUpon>insertMacro.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\insertMacro.aspx.designer.cs">
|
||||
<DependentUpon>insertMacro.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\insertImage.aspx.cs">
|
||||
<DependentUpon>insertImage.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1111,13 +1108,6 @@
|
||||
<Compile Include="umbraco\plugins\tinymce\insertLink.aspx.designer.cs">
|
||||
<DependentUpon>insertLink.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\insertMacro.aspx.cs">
|
||||
<DependentUpon>insertMacro.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\insertMacro.aspx.designer.cs">
|
||||
<DependentUpon>insertMacro.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\plugins\tinymce\paste.aspx.cs">
|
||||
<DependentUpon>paste.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1213,11 +1203,6 @@
|
||||
<Compile Include="umbraco\dialogs\sort.aspx.designer.cs">
|
||||
<DependentUpon>sort.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\webservices\MediaPickerService.asmx.cs">
|
||||
<DependentUpon>MediaPickerService.asmx</DependentUpon>
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco\webservices\MediaPickerServiceHelpers.cs" />
|
||||
<Compile Include="umbraco\webservices\TreeClientService.asmx.cs">
|
||||
<DependentUpon>TreeClientService.asmx</DependentUpon>
|
||||
<SubType>Component</SubType>
|
||||
@@ -1503,19 +1488,7 @@
|
||||
<Content Include="umbraco\controls\TreeControl.ascx" />
|
||||
<Content Include="umbraco\css\permissionsEditor.css" />
|
||||
<Content Include="umbraco\dialogs\ExportCode.aspx" />
|
||||
<Content Include="umbraco\dialogs\mediaPicker.aspx" />
|
||||
<Content Include="umbraco\images\editor\spellchecker.gif" />
|
||||
<Content Include="umbraco\plugins\tinymce3\InsertAnchor.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertChar.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertImage.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertLink.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertMacro.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\insertImage.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\insertLink.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\insertMacro.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\paste.aspx" />
|
||||
<Content Include="umbraco\webservices\MediaPickerService.asmx" />
|
||||
<Content Include="umbraco_client\Application\JQuery\jquery.cookie.js" />
|
||||
<Content Include="umbraco_client\imagecropper\Jcrop.gif" />
|
||||
<Content Include="umbraco_client\tablesorting\img\bg.gif" />
|
||||
@@ -1594,6 +1567,8 @@
|
||||
<Content Include="umbraco_client\Tree\tree_component.min.js" />
|
||||
<Content Include="umbraco_client\Tree\UmbracoTree.js" />
|
||||
<Content Include="umbraco_client\Application\UmbracoClientManager.js" />
|
||||
<Content Include="umbraco\plugins\tinymce3\InsertAnchor.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertChar.aspx" />
|
||||
<Content Include="umbraco\webservices\TreeClientService.asmx" />
|
||||
<Content Include="umbraco_client\Application\NamespaceManager.js" />
|
||||
<Content Include="umbraco_client\passwordStrength\passwordstrength.js" />
|
||||
@@ -1909,6 +1884,10 @@
|
||||
<Content Include="umbraco\LiveEditing\Modules\UnpublishModule\unpublish.png" />
|
||||
<Content Include="umbraco\LiveEditing\Modules\UnpublishModule\UnpublishModule.js" />
|
||||
<Content Include="umbraco\members\ViewMembers.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertImage.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertLink.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\insertMacro.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
@@ -1946,6 +1925,8 @@
|
||||
<Content Include="umbraco\js\submodal\maskBG.png" />
|
||||
<Content Include="umbraco\js\submodal\subModal.css" />
|
||||
<Content Include="umbraco\js\submodal\subModal.js" />
|
||||
<Content Include="umbraco\plugins\tinymce\images\sample.gif" />
|
||||
<Content Include="umbraco\plugins\tinymce\paste.aspx" />
|
||||
<Content Include="umbraco\reindex.aspx" />
|
||||
<Content Include="umbraco\settings\DictionaryItemList.aspx" />
|
||||
<Content Include="umbraco\settings\scripts\editScript.aspx" />
|
||||
@@ -2314,6 +2295,9 @@
|
||||
<Content Include="umbraco\ping.aspx">
|
||||
<SubType>Form</SubType>
|
||||
</Content>
|
||||
<Content Include="umbraco\plugins\tinymce\insertMacro.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\insertImage.aspx" />
|
||||
<Content Include="umbraco\plugins\tinymce\insertLink.aspx" />
|
||||
<Content Include="umbraco\publishStatus.aspx" />
|
||||
<Content Include="umbraco\schemas\umbraco.xsd">
|
||||
<SubType>Designer</SubType>
|
||||
|
||||
221
umbraco/presentation/web.config
Normal file
221
umbraco/presentation/web.config
Normal file
@@ -0,0 +1,221 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter"/>
|
||||
<!-- ASPNETAJAX -->
|
||||
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
|
||||
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
|
||||
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
|
||||
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
|
||||
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
</sectionGroup>
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core"/>
|
||||
</configSections>
|
||||
<urlrewritingnet configSource="config\UrlRewriting.config"/>
|
||||
<appSettings>
|
||||
<add key="umbracoDbDSN" value=""/>
|
||||
<add key="umbracoConfigurationStatus" value="4.0.2.1" />
|
||||
<add key="umbracoReservedUrls" value="/config/splashes/booting.aspx,/install/default.aspx,/config/splashes/noNodes.aspx" />
|
||||
<add key="umbracoReservedPaths" value="/umbraco,/install/" />
|
||||
<add key="umbracoContentXML" value="/data/umbraco.config" />
|
||||
<add key="umbracoStorageDirectory" value="/data" />
|
||||
<add key="umbracoPath" value="/umbraco" />
|
||||
<add key="umbracoEnableStat" value="false" />
|
||||
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
|
||||
<add key="umbracoEditXhtmlMode" value="true" />
|
||||
<add key="umbracoUseDirectoryUrls" value="false" />
|
||||
<add key="umbracoDebugMode" value="true" />
|
||||
<add key="umbracoTimeOutInMinutes" value="20" />
|
||||
<add key="umbracoVersionCheckPeriod" value="7" />
|
||||
<add key="umbracoDisableXsltExtensions" value="true" />
|
||||
<add key="umbracoDefaultUILanguage" value="en" />
|
||||
<add key="umbracoProfileUrl" value="profiler" />
|
||||
<add key="umbracoUseSSL" value="false" />
|
||||
<add key="umbracoUseMediumTrust" value="false" />
|
||||
</appSettings>
|
||||
<clientDependency defaultProvider="PageHeaderProvider" compositeFilePath="~/data/ClientDependency" enableCompositeFiles="true" fileDependencyExtensions="js,css" isDebugMode="false">
|
||||
<providers>
|
||||
<add name="PageHeaderProvider" type="ClientDependency.Core.Providers.PageHeaderProvider" />
|
||||
<add name="ClientSideRegistrationProvider" type="ClientDependency.Core.Providers.ClientSideRegistrationProvider" />
|
||||
</providers>
|
||||
</clientDependency>
|
||||
<system.net>
|
||||
<mailSettings>
|
||||
<smtp>
|
||||
<network host="127.0.0.1" userName="username" password="password"/>
|
||||
</smtp>
|
||||
</mailSettings>
|
||||
</system.net>
|
||||
<!-- REMOVE FOR BETA -->
|
||||
<!-- added by NH to test foreign membership providers-->
|
||||
<connectionStrings>
|
||||
<remove name="LocalSqlServer"/>
|
||||
<!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
|
||||
</connectionStrings>
|
||||
<system.web>
|
||||
<!-- <trust level="Medium" originUrl=".*" />-->
|
||||
<customErrors mode="Off"/>
|
||||
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true"/>
|
||||
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20"/>
|
||||
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8"/>
|
||||
<xhtmlConformance mode="Strict"/>
|
||||
<pages enableEventValidation="false">
|
||||
<!-- ASPNETAJAX -->
|
||||
<controls>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco"/>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</controls>
|
||||
</pages>
|
||||
<httpModules>
|
||||
<!-- URL REWRTIER -->
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter"/>
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule"/>
|
||||
<!-- UMBRACO -->
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule"/>
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule"/>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</httpModules>
|
||||
<httpHandlers>
|
||||
<remove verb="*" path="*.asmx"/>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<!-- UMBRACO CHANNELS -->
|
||||
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco"/>
|
||||
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco"/>
|
||||
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeDependencyHandler, ClientDependency.Core"/>
|
||||
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
|
||||
</httpHandlers>
|
||||
<compilation defaultLanguage="c#" debug="true" batch="false">
|
||||
<assemblies>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
|
||||
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<authentication mode="Forms">
|
||||
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/"/>
|
||||
</authentication>
|
||||
<authorization>
|
||||
<allow users="?"/>
|
||||
</authorization>
|
||||
<!-- Membership Provider -->
|
||||
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
|
||||
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
|
||||
</providers>
|
||||
</membership>
|
||||
<!-- added by NH to support membership providers in access layer -->
|
||||
<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
|
||||
</providers>
|
||||
</roleManager>
|
||||
<!-- Sitemap provider-->
|
||||
<siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
|
||||
<providers>
|
||||
<clear/>
|
||||
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
|
||||
</providers>
|
||||
</siteMap>
|
||||
</system.web>
|
||||
<!-- ASPNETAJAX -->
|
||||
<system.web.extensions>
|
||||
<scripting>
|
||||
<scriptResourceHandler enableCompression="true" enableCaching="true"/>
|
||||
</scripting>
|
||||
</system.web.extensions>
|
||||
<applicationSettings>
|
||||
<umbraco.presentation.Properties.Settings>
|
||||
<setting name="umbraco_com_regexlib_Webservices" serializeAs="String">
|
||||
<value>http://regexlib.com/WebServices.asmx</value>
|
||||
</setting>
|
||||
</umbraco.presentation.Properties.Settings>
|
||||
</applicationSettings>
|
||||
<!-- IIS 7 Integrated Mode Configuration
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<modules>
|
||||
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
</modules>
|
||||
|
||||
<handlers accessPolicy="Read, Write, Script, Execute">
|
||||
<remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="WebServiceHandlerFactory-ISAPI-2.0" />
|
||||
|
||||
|
||||
<add verb="*" name="ScriptHandlerFactory" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add verb="*" name="ScriptHandlerFactory_AppService" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add verb="GET,HEAD" name="ScriptResourceHandler" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
|
||||
|
||||
<add verb="*" name="Channels" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" name="Channels_Word" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
|
||||
<add verb="*" name="ClientDependency" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeDependencyHandler, ClientDependency.Core"/>
|
||||
<add verb="GET,HEAD,POST" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
-->
|
||||
<system.codedom>
|
||||
<compilers>
|
||||
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
|
||||
<providerOption name="CompilerVersion" value="v3.5"/>
|
||||
<providerOption name="WarnAsError" value="false"/>
|
||||
</compiler>
|
||||
</compilers>
|
||||
</system.codedom>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<modules>
|
||||
<remove name="ScriptModule"/>
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</modules>
|
||||
<handlers>
|
||||
<remove name="WebServiceHandlerFactory-Integrated"/>
|
||||
<remove name="ScriptHandlerFactory"/>
|
||||
<remove name="ScriptHandlerFactoryAppServices"/>
|
||||
<remove name="ScriptResource"/>
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -1,149 +0,0 @@
|
||||
using System;
|
||||
using System.Web;
|
||||
using System.Xml;
|
||||
using System.Xml.XPath;
|
||||
using System.Text;
|
||||
using System.Web.Mail;
|
||||
using System.IO;
|
||||
|
||||
namespace umbraco.standardFormhandlers
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for Class1.
|
||||
/// </summary>
|
||||
public class formMail : interfaces.IFormhandler
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="formMail"/> class.
|
||||
/// </summary>
|
||||
public formMail()
|
||||
{
|
||||
//
|
||||
// TODO: Add constructor logic here
|
||||
//
|
||||
}
|
||||
#region IFormhandler Members
|
||||
|
||||
private int _redirectID = -1;
|
||||
|
||||
/// <summary>
|
||||
/// Executes the specified formhandler node.
|
||||
/// </summary>
|
||||
/// <param name="formhandlerNode">The formhandler node.</param>
|
||||
/// <returns></returns>
|
||||
public bool Execute(XmlNode formhandlerNode)
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
XmlDocument document = new XmlDocument();
|
||||
document.LoadXml("<mail submitted=\"" + DateTime.Now.ToString("s") + "\"></mail>");
|
||||
if (helper.Request("umbHeader") != "")
|
||||
{
|
||||
builder.Append(helper.Request("umbheader"));
|
||||
}
|
||||
foreach (string text in HttpContext.Current.Request.Form.Keys)
|
||||
{
|
||||
if (text.StartsWith("umbForm"))
|
||||
{
|
||||
builder.Append("\n\n" + text.Replace("umbForm", "") + ": " + HttpContext.Current.Request.Form[text]);
|
||||
document.DocumentElement.AppendChild(xmlHelper.addCDataNode(document, text.Replace("umbForm", ""), HttpContext.Current.Request.Form[text]));
|
||||
}
|
||||
}
|
||||
if (helper.Request("umbFooter") != "")
|
||||
{
|
||||
builder.Append(helper.Request("umbFooter"));
|
||||
}
|
||||
string subject = helper.Request("umbSubject");
|
||||
if (subject.Trim() == "")
|
||||
{
|
||||
subject = formhandlerNode.SelectSingleNode("//parameter [@alias='subject']").FirstChild.Value;
|
||||
}
|
||||
if (helper.Request("umbFormNoXml") != "")
|
||||
{
|
||||
document = null;
|
||||
}
|
||||
this.sendMail(formhandlerNode.SelectSingleNode("//parameter [@alias='sender']").FirstChild.Value, HttpContext.Current.Request.Form["sendTo"], subject, builder.ToString(), formhandlerNode.SelectSingleNode("//parameter [@alias='debug']").FirstChild.Value, document);
|
||||
if (helper.Request("umbExtraMailTo") != "")
|
||||
{
|
||||
this.sendMail(formhandlerNode.SelectSingleNode("//parameter [@alias='sender']").FirstChild.Value, helper.Request("umbExtraMailto"), subject, builder.ToString(), formhandlerNode.SelectSingleNode("//parameter [@alias='debug']").FirstChild.Value, document);
|
||||
}
|
||||
string redir = HttpContext.Current.Request["umbracoRedirect"].ToString();
|
||||
if ((redir != null) && (redir != ""))
|
||||
{
|
||||
this._redirectID = Convert.ToInt32(redir);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets the redirect ID.
|
||||
/// </summary>
|
||||
/// <value>The redirect ID.</value>
|
||||
public int redirectID
|
||||
{
|
||||
get
|
||||
{
|
||||
// TODO: Add formMail.redirectID getter implementation
|
||||
return _redirectID;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private void sendMail(string From, string To, string Subject, string Body, string Debug, XmlDocument XmlDoc)
|
||||
{
|
||||
System.Net.Mail.MailMessage message = new System.Net.Mail.MailMessage(From, To);
|
||||
message.Subject = Subject;
|
||||
message.Body = Body;
|
||||
Guid guid = Guid.NewGuid();
|
||||
string fileName = HttpContext.Current.Server.MapPath(GlobalSettings.StorageDirectory) + @"\" + guid.ToString() + ".xml";
|
||||
if (XmlDoc != null)
|
||||
{
|
||||
FileStream stream = File.Open(fileName, FileMode.Create);
|
||||
StreamWriter writer = new StreamWriter(stream);
|
||||
writer.WriteLine(XmlDoc.OuterXml);
|
||||
writer.Close();
|
||||
stream.Close();
|
||||
message.Attachments.Add(new System.Net.Mail.Attachment(fileName));
|
||||
}
|
||||
System.Net.Mail.SmtpClient smtpClient = new System.Net.Mail.SmtpClient();
|
||||
|
||||
try
|
||||
{
|
||||
smtpClient.Send(message);
|
||||
if (Debug == "true")
|
||||
{
|
||||
HttpContext.Current.Response.Write(string.Concat(new string[] { "<!-- Mail send from ", message.From.Address, " to ", message.To[0].Address, " through ", GlobalSettings.SmtpServer, " -->" }));
|
||||
}
|
||||
HttpContext.Current.Trace.Write("sendMail", string.Concat(new string[] { "Mail send from ", message.From.Address, " to ", message.To[0].Address, " through ", GlobalSettings.SmtpServer }));
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
HttpContext.Current.Trace.Warn("sendMail", string.Concat(new string[] { "Error sending mail from ", message.From.Address, " to ", message.To[0].Address, " through ", GlobalSettings.SmtpServer, "." }), exception);
|
||||
if (Debug == "true")
|
||||
{
|
||||
string exp = "";
|
||||
while (exception.InnerException != null)
|
||||
{
|
||||
exp = exp + "--------------------------------\n";
|
||||
exp = exp + exception.InnerException.ToString() + ", \n";
|
||||
exception = exception.InnerException;
|
||||
}
|
||||
HttpContext.Current.Response.Write(string.Concat(new string[] { "<!-- Error sending mail from ", message.From.Address, " to ", message.To[0].Address, " through ", GlobalSettings.SmtpServer, ": ", exp, " -->" }));
|
||||
}
|
||||
return;
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (XmlDoc != null)
|
||||
{
|
||||
File.Delete(fileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
namespace umbraco.standardFormhandlers
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for memberLogoff.
|
||||
/// </summary>
|
||||
public class memberLogoff : interfaces.IFormhandler
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="memberLogoff"/> class.
|
||||
/// </summary>
|
||||
public memberLogoff()
|
||||
{
|
||||
}
|
||||
|
||||
#region IFormhandler Members
|
||||
|
||||
private int _redirectID = -1;
|
||||
|
||||
/// <summary>
|
||||
/// Executes the specified formhandler node.
|
||||
/// </summary>
|
||||
/// <param name="formhandlerNode">The formhandler node.</param>
|
||||
/// <returns></returns>
|
||||
public bool Execute(XmlNode formhandlerNode)
|
||||
{
|
||||
int _currentMemberId = cms.businesslogic.member.Member.CurrentMemberId();
|
||||
if (_currentMemberId > 0 )
|
||||
cms.businesslogic.member.Member.ClearMemberFromClient(_currentMemberId);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the redirect ID.
|
||||
/// </summary>
|
||||
/// <value>The redirect ID.</value>
|
||||
public int redirectID
|
||||
{
|
||||
get
|
||||
{
|
||||
// TODO: Add formMail.redirectID getter implementation
|
||||
return _redirectID;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
using System;
|
||||
using System.Xml;
|
||||
|
||||
namespace umbraco.standardFormhandlers
|
||||
{
|
||||
/// <summary>
|
||||
/// Summary description for validateLogin.
|
||||
/// </summary>
|
||||
public class validateLogin : interfaces.IFormhandler
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="validateLogin"/> class.
|
||||
/// </summary>
|
||||
public validateLogin()
|
||||
{
|
||||
}
|
||||
|
||||
#region IFormhandler Members
|
||||
|
||||
private int _redirectID = -1;
|
||||
|
||||
/// <summary>
|
||||
/// Executes the specified formhandler node.
|
||||
/// </summary>
|
||||
/// <param name="formhandlerNode">The formhandler node.</param>
|
||||
/// <returns></returns>
|
||||
public bool Execute(XmlNode formhandlerNode)
|
||||
{
|
||||
bool temp = false;
|
||||
if (helper.Request("umbracoMemberLogin") != "" && helper.Request("umbracoMemberPassword") != "")
|
||||
{
|
||||
cms.businesslogic.member.Member m = cms.businesslogic.member.Member.GetMemberFromLoginNameAndPassword(helper.Request("umbracoMemberLogin"), helper.Request("umbracoMemberPassword"));
|
||||
if (m != null)
|
||||
{
|
||||
System.Web.HttpContext.Current.Trace.Write("validateLogin", "Member found...");
|
||||
cms.businesslogic.member.Member.AddMemberToCache(m);
|
||||
temp = true;
|
||||
} else
|
||||
System.Web.HttpContext.Current.Trace.Write("validateLogin", "No member found...");
|
||||
} else
|
||||
System.Web.HttpContext.Current.Trace.Write("validateLogin", "No login or password requested...");
|
||||
return temp;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the redirect ID.
|
||||
/// </summary>
|
||||
/// <value>The redirect ID.</value>
|
||||
public int redirectID
|
||||
{
|
||||
get
|
||||
{
|
||||
// TODO: Add formMail.redirectID getter implementation
|
||||
return _redirectID;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -70,9 +70,6 @@
|
||||
<Compile Include="editorControls\wysiwyg\editor.cs" />
|
||||
<Compile Include="editorControls\wysiwyg\WysiwygDataType.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="standardFormHandlers\formMail.cs" />
|
||||
<Compile Include="standardFormHandlers\memberLogoff.cs" />
|
||||
<Compile Include="standardFormHandlers\validateLogin.cs" />
|
||||
<Compile Include="umbraco\ContentItem\edit.aspx.cs">
|
||||
<DependentUpon>edit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
Reference in New Issue
Block a user