Merge sgay patches

umbraco/presentation/config/Dashboard.config

@@ -35,7 +35,7 @@
         /umbraco/dashboard/mediadashboardintro.ascx
       </control>
       <control showOnce="true" addPanel="true" panelCaption="">
-        /umbraco/dashboard/zipupload.ascx
+        /umbraco/dashboard/desktopmediauploader.ascx
       </control>
       <control showOnce="true" addPanel="true" panelCaption="">
         /umbraco/dashboard/mediadashboardvideos.ascx

umbraco/presentation/umbraco.presentation.csproj

@@ -110,9 +110,6 @@
     <Reference Include="Lucene.Net, Version=2.9.2.2, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>C:\Users\Shannon\Documents\Visual Studio 2008\Projects\Umbraco\Branch-4.1\foreign dlls\Lucene.Net.dll</HintPath>
     </Reference>
-    <Reference Include="Nibble.Umb.ZipUpload">
-      <HintPath>..\..\foreign dlls\Nibble.Umb.ZipUpload.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -554,6 +551,13 @@
     <Compile Include="umbraco\dashboard\ChangePassword.ascx.designer.cs">
       <DependentUpon>ChangePassword.ascx</DependentUpon>
     </Compile>
+    <Compile Include="umbraco\dashboard\DesktopMediaUploader.ascx.cs">
+      <DependentUpon>DesktopMediaUploader.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco\dashboard\DesktopMediaUploader.ascx.designer.cs">
+      <DependentUpon>DesktopMediaUploader.ascx</DependentUpon>
+    </Compile>
     <Compile Include="umbraco\dashboard\DeveloperDashboardIntro.ascx.designer.cs">
       <DependentUpon>DeveloperDashboardIntro.ascx</DependentUpon>
     </Compile>
@@ -1400,6 +1404,9 @@
       <DependentUpon>MacroContainerService.asmx</DependentUpon>
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="umbraco\webservices\MediaUploader.ashx.cs">
+      <DependentUpon>MediaUploader.ashx</DependentUpon>
+    </Compile>
     <Compile Include="umbraco\webservices\TagsAutoCompleteHandler.ashx.cs">
       <DependentUpon>TagsAutoCompleteHandler.ashx</DependentUpon>
     </Compile>
@@ -1642,6 +1649,16 @@
     </Compile>
     <Content Include="config\splashes\booting.aspx" />
     <Content Include="config\splashes\noNodes.aspx" />
+    <Content Include="umbraco\dashboard\DesktopMediaUploader.ascx" />
+    <Content Include="umbraco\dashboard\images\dmu-badge.jpg" />
+    <Content Include="umbraco\dashboard\images\dmu.png" />
+    <Content Include="umbraco\dashboard\images\logo32x32.png" />
+    <Content Include="umbraco\dashboard\images\membersearch.png" />
+    <Content Include="umbraco\dashboard\images\starterkit32x32.png" />
+    <Content Include="umbraco\dashboard\images\TV.png" />
+    <Content Include="umbraco\dashboard\images\ZipFile.png" />
+    <Content Include="umbraco\dashboard\swfs\AIRInstallBadge.swf" />
+    <Content Include="umbraco\dashboard\swfs\expressinstall.swf" />
     <Content Include="umbraco_client\Installer\images\bg-inp-big.png" />
     <Content Include="umbraco_client\modal\jquery.simplemodal.1.4.1.custom.js" />
     <Content Include="web.config.INDIGO64SSD.xslt" />
@@ -1769,7 +1786,6 @@
     <Content Include="umbraco\dashboard\StartupDashboardIntro.ascx" />
     <Content Include="umbraco\dashboard\StartupDashboardKits.ascx" />
     <Content Include="umbraco\dashboard\StartupDashboardVideos.ascx" />
-    <Content Include="umbraco\dashboard\zipupload.ascx" />
     <Content Include="umbraco\developer\Packages\StarterKits.aspx" />
     <Content Include="umbraco\dialogs\TemplateSkinning.aspx" />
     <Content Include="umbraco\helpRedirect.aspx" />
@@ -2365,6 +2381,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
     </None>
+    <None Include="umbraco\dashboard\air\DesktopMediaUploader.air" />
     <None Include="umbraco\LiveEditing\LiveEditing.cd" />
     <Content Include="umbraco\masterpages\umbracoPage.Master" />
     <Content Include="umbraco\masterpages\umbracoDialog.Master" />
@@ -3087,6 +3104,7 @@
     </None>
     <Content Include="umbraco\webservices\TagsAutoCompleteHandler.ashx" />
     <Content Include="umbraco\webservices\UltimatePickerAutoCompleteHandler.ashx" />
+    <Content Include="umbraco\webservices\MediaUploader.ashx" />
     <None Include="umbraco_client\CodeMirror\LICENSE" />
     <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
     <Content Include="web.config.APOWELL-BC-WIN7.xslt" />

umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx

@@ -0,0 +1,48 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DesktopMediaUploader.ascx.cs" Inherits="umbraco.presentation.umbraco.dashboard.DesktopMediaUploader" %>
+<script type="text/javascript" src="/umbraco/dashboard/scripts/swfobject.js"></script>
+<div class="dashboardWrapper">
+    <h2>Desktop Media Uploader</h2>
+    <img src="/umbraco/dashboard/images/dmu.png" alt="Umbraco" class="dashboardIcon" />
+    <p><strong>Desktop Media Uploader</strong> is a small desktop application that you can install on your computer which allows you to easily upload media items directly to the media section.</p>
+    <p>The badge below will auto configure itself based upon whether you already have <strong>Desktop Media Uploader</strong> installed or not.</p>
+    <p>Just click the <strong>Install Now / Upgrade Now / Launch Now</strong> link to perform that action.</p>
+    <div class="dashboardColWrapper">
+        <div class="dashboardCols">
+            <div class="dashboardCol">
+                <asp:Panel ID="Panel1" runat="server">
+                </asp:Panel>
+                <asp:Panel ID="Panel2" runat="server">
+                    <p>
+                        <div id="dmu-badge">
+                            Download <a href="<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air">Desktop Media Uploader</a> now.<br /><br /><span id="Span1">This application requires Adobe&#174;&nbsp;AIR&#8482; to be installed for <a href="http://airdownload.adobe.com/air/mac/download/latest/AdobeAIR.dmg">Mac OS</a> or <a href="http://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe">Windows</a>.
+                        </div>
+                    </p>
+                    <script type="text/javascript">
+                    // <![CDATA[
+
+                        var flashvars = {
+                            appid: "org.umbraco.DesktopMediaUploader",
+                            appname: "Desktop Media Uploader",
+                            appversion: "v2.1.0",
+                            appurl: "<%= FullyQualifiedAppPath %>umbraco/dashboard/air/desktopmediauploader.air",
+                            applauncharg: "<%= AppLaunchArg %>",
+                            image: "/umbraco/dashboard/images/dmu-badge.jpg?2.1.0",
+                            airversion: "2.0"
+                        };
+                        var params = {
+                            menu: "false",
+                            wmode: "opaque"
+                        };
+                        var attributes = {
+                            style: "margin-bottom:10px;"
+                        };
+
+                        swfobject.embedSWF("/umbraco/dashboard/swfs/airinstallbadge.swf", "dmu-badge", "215", "180", "9.0.115", "/umbraco/dashboard/swfs/expressinstall.swf", flashvars, params, attributes);
+
+                    // ]]>
+                    </script>
+                </asp:Panel>
+            </div>
+        </div>
+    </div>
+</div>

umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using umbraco.BasePages;
+
+namespace umbraco.presentation.umbraco.dashboard
+{
+    public partial class DesktopMediaUploader : System.Web.UI.UserControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected string FullyQualifiedAppPath
+        {
+            get
+            {
+                var appPath = "";
+                var context = HttpContext.Current;
+
+                if (context != null)
+                {
+                    appPath = string.Format("{0}://{1}{2}{3}",
+                        context.Request.Url.Scheme,
+                        context.Request.Url.Host,
+                        (context.Request.Url.Port == 80) ? string.Empty : ":" + context.Request.Url.Port,
+                        context.Request.ApplicationPath);
+                }
+
+                if (!appPath.EndsWith("/"))
+                    appPath += "/";
+
+                return appPath;
+            }
+        }
+
+        protected string AppLaunchArg
+        {
+            get
+            {
+                //var ticket = ((FormsIdentity) HttpContext.Current.User.Identity).Ticket;
+                var ticket = new FormsAuthenticationTicket(1,
+                    UmbracoEnsuredPage.CurrentUser.LoginName,
+                    DateTime.Now,
+                    DateTime.Now,
+                    false,
+                    "");
+
+                return HttpUtility.UrlEncode(Base64Encode(string.Format("{0};{1};{2}",
+                    FullyQualifiedAppPath.TrimEnd('/'),
+                    UmbracoEnsuredPage.CurrentUser.LoginName,
+                    FormsAuthentication.Encrypt(ticket)
+                )));
+            }
+        }
+
+        private string Base64Encode(string input)
+        {
+            byte[] toEncodeAsBytes = UTF8Encoding.UTF8.GetBytes(input);
+
+            return Convert.ToBase64String(toEncodeAsBytes);
+        }
+    }
+}

umbraco/presentation/umbraco/dashboard/DesktopMediaUploader.ascx.designer.cs

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace umbraco.presentation.umbraco.dashboard {
+    
+    
+    public partial class DesktopMediaUploader {
+        
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel Panel1;
+        
+        /// <summary>
+        /// Panel2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel Panel2;
+    }
+}

umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx

@@ -8,7 +8,7 @@
     <h3>
         Get started with Media right now</h3>
     <p>
-        Use the tool below to upload a ZIP file of your images or documents to a media folder.
+        Use the tool below to upload your images or documents to a media folder.
     </p>
     <h3>
         Follow these steps:</h3>
@@ -16,15 +16,13 @@
         <div class="dashboardCols">
             <div class="dashboardCol">
                 <ul>
-                    <li>Create a media folder by right-clicking on the Media root folder, selecting Create,
-                        then give your folder a name, select the Media Type Folder, and click create</li>
-                    <li>Select the created folder by click the Choose link</li>
-                    <li>Use the Browse button below to select a ZIP file containing your images (you can
-                        even organize them into folders and the tool will create these for you)</li>
-                    <li>Click the Upload zip file button</li>
-                    <li>Refresh the Media section by right-clicking the Media root folder and selecting
-                        Reload Nodes</li>
+                    <li>Click <strong>Install</strong> and follow the on screen instructions to install the <strong>Desktop Media Uploader</strong></li>
+                    <li>Enter your login details for the site and click <strong>Sign In</strong></li>
+                    <li>Choose a media folder to upload files to from the <strong>Upload files to...</strong> dropdown list</li>
+                    <li>Drag the files and folders you wish to upload directly into the <strong>Desktop Media Uploader</strong> application</li>
+                    <li>Click <strong>Upload</strong> to start uploading</li>
                 </ul>
+                <p>For a more thorough guide on how to use the <strong>Desktop Media Uploader</strong>, <a href="http://screenr.com/vXr" target="_blank">checkout this video</a>.</p>
             </div>
         </div>
     </div>

umbraco/presentation/umbraco/dashboard/zipupload.ascx

@@ -1,19 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="zipupload.ascx.cs" Inherits="Nibble.Umb.ZipUpload.zipupload" %>
-<div class="dashboardWrapper">
-    <h2>
-        Zip Upload</h2>
-    <img src="/umbraco/dashboard/images/zipfile.png" alt="Umbraco" class="dashboardIcon" />
-    <p>
-        Quickly upload an archive of media assets to Umbraco.</p>
-    <div class="dashboardColWrapper">
-        <div class="dashboardCols">
-            <div class="dashboardCol">
-                <asp:Panel ID="Panel1" runat="server">
-                </asp:Panel>
-                <asp:Panel ID="Panel2" runat="server">
-                    <asp:Literal ID="Literal1" runat="server"></asp:Literal>
-                </asp:Panel>
-            </div>
-        </div>
-    </div>
-</div>

umbraco/presentation/umbraco/webservices/MediaUploader.ashx

@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="MediaUploader.ashx.cs" Class="umbraco.presentation.umbraco.webservices.MediaUploader" %>

umbraco/presentation/umbraco/webservices/MediaUploader.ashx.cs

@@ -0,0 +1,264 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Configuration;
+using System.Web.Security;
+using System.Xml;
+using umbraco.BusinessLogic;
+using umbraco.cms.businesslogic.media;
+
+namespace umbraco.presentation.umbraco.webservices
+{
+    public class MediaUploader : IHttpHandler
+    {
+        protected User AuthenticatedUser { get; set; }
+
+        public bool IsReusable
+        {
+            get { return true; }
+        }
+
+        public void ProcessRequest(HttpContext context)
+        {
+            context.Response.Clear();
+            context.Response.ContentType = @"text\xml";
+            context.Response.Charset = "UTF-8";
+            context.Response.Cache.SetCacheability(HttpCacheability.NoCache);
+            context.Response.Cache.SetAllowResponseInBrowserHistory(true);
+
+            var xmlTextWriter = new XmlTextWriter(context.Response.OutputStream, Encoding.UTF8);
+            xmlTextWriter.WriteStartDocument();
+            xmlTextWriter.WriteStartElement("response");
+
+            string action = context.Request["action"];
+
+            if (IsValidRequest(context, xmlTextWriter) && !string.IsNullOrEmpty(action))
+            {
+                switch (action.ToLower())
+                {
+                    case "config":
+                        ProcessConfigRequest(context, xmlTextWriter);
+                        break;
+                    case "folderlist":
+                        ProcessFolderListRequest(context, xmlTextWriter);
+                        break;
+                    case "upload":
+                        ProcessUploadRequest(context, xmlTextWriter);
+                        break;
+                }
+            }
+
+            xmlTextWriter.WriteEndElement();
+            xmlTextWriter.WriteEndDocument();
+            xmlTextWriter.Flush();
+            xmlTextWriter.Close();
+
+            context.Response.End();
+        }
+
+        public void ProcessConfigRequest(HttpContext context, XmlTextWriter xmlTextWriter)
+        {
+            xmlTextWriter.WriteElementString("displayName", new User(context.Request["username"]).Name);
+            xmlTextWriter.WriteElementString("umbracoPath", VirtualPathUtility.ToAbsolute(GlobalSettings.Path));
+            xmlTextWriter.WriteElementString("maxRequestLength", GetMaxRequestLength().ToString());
+        }
+
+        public void ProcessFolderListRequest(HttpContext context, XmlTextWriter xmlTextWriter)
+        {
+            xmlTextWriter.WriteStartElement("folder");
+
+            var startMediaId = AuthenticatedUser.StartMediaId;
+            if (startMediaId < 1)
+            {
+                xmlTextWriter.WriteAttributeString("id", "-1");
+                xmlTextWriter.WriteAttributeString("name", "Media");
+
+                CreateMediaTree(Media.GetRootMedias(), xmlTextWriter);
+            }
+            else
+            {
+                var root = new Media(startMediaId);
+
+                xmlTextWriter.WriteAttributeString("id", root.Id.ToString());
+                xmlTextWriter.WriteAttributeString("name", root.Text);
+
+                CreateMediaTree(root.Children, xmlTextWriter);
+            }
+
+            xmlTextWriter.WriteEndElement();
+        }
+
+        public void ProcessUploadRequest(HttpContext context, XmlTextWriter xmlTextWriter)
+        {
+            int parentNodeId;
+            if (int.TryParse(context.Request["parentNodeId"], out parentNodeId) && context.Request.Files.Count > 0)
+            {
+                try
+                {
+                    // Check Path
+                    if (!string.IsNullOrEmpty(context.Request["path"]))
+                    {
+                        var pathParts = context.Request["path"].Trim('/').Split('/');
+
+                        var parentNode = new Media(parentNodeId);
+                        foreach (var pathPart in pathParts)
+                        {
+                            if (!string.IsNullOrEmpty(pathPart))
+                            {
+                                parentNode = GetOrCreateFolder(parentNode, pathPart);
+                            }
+                        }
+                        parentNodeId = parentNode.Id;
+                    }
+
+                    // Check whether to replace existing
+                    bool replaceExisting = (context.Request["replaceExisting"] == "1");
+
+                    // loop through uploaded files
+                    for (var j = 0; j < context.Request.Files.Count; j++)
+                    {
+                        // get the current file
+                        var uploadFile = context.Request.Files[j];
+
+                        // if there was a file uploded
+                        if (uploadFile.ContentLength > 0)
+                        {
+                            var postedMediaFile = new PostedMediaFile
+                            {
+                                FileName = uploadFile.FileName,
+                                ContentType = uploadFile.ContentType,
+                                ContentLength = uploadFile.ContentLength,
+                                InputStream = uploadFile.InputStream
+                            };
+
+                            // Get concrete MediaFactory
+                            var factory = MediaFactory.GetMediaFactory(parentNodeId, postedMediaFile, AuthenticatedUser);
+
+                            // Handle media Item
+                            var media = factory.HandleMedia(parentNodeId, postedMediaFile, AuthenticatedUser, replaceExisting);
+                        }
+                    }
+
+                    // log succes
+                    Log.Add(LogTypes.New, parentNodeId, "Succes");
+                }
+                catch (Exception e)
+                {
+                    // log error
+                    Log.Add(LogTypes.Error, parentNodeId, e.ToString());
+                }
+            }
+            else
+            {
+                // log error
+                Log.Add(LogTypes.Error, -1, "Parent node id is in incorrect format");
+            }
+        }
+
+        #region Helper Methods
+
+        private bool IsValidRequest(HttpContext context, XmlTextWriter xmlTextWriter)
+        {
+            string username = context.Request["username"];
+            string password = context.Request["password"];
+            string ticket = context.Request["ticket"];
+
+            bool isValid = false;
+
+            if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
+            {
+                var mp = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider];
+                if (mp.ValidateUser(username, password))
+                {
+                    var user = new User(username);
+                    isValid = user.Applications.Any(app => app.alias == "media");
+
+                    if (isValid)
+                        AuthenticatedUser = user;
+                }
+            }
+            else if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(ticket))
+            {
+                var t = FormsAuthentication.Decrypt(ticket);
+                var user = new User(username);
+                isValid = user.LoginName.ToLower() == t.Name.ToLower() && user.Applications.Any(app => app.alias == "media");
+
+                if (isValid)
+                    AuthenticatedUser = user;
+            }
+
+            xmlTextWriter.WriteAttributeString("success", isValid.ToString().ToLower());
+
+            return isValid;
+        }
+
+        private void CreateMediaTree(IEnumerable<Media> nodes, XmlWriter xmlTextWriter)
+        {
+            foreach (var media in nodes.Where(media => media != null && media.ContentType != null && media.ContentType.Alias == "Folder"))
+            {
+                xmlTextWriter.WriteStartElement("folder");
+                xmlTextWriter.WriteAttributeString("id", media.Id.ToString());
+                xmlTextWriter.WriteAttributeString("name", media.Text);
+
+                if (media.HasChildren)
+                {
+                    CreateMediaTree(media.Children, xmlTextWriter);
+                }
+
+                xmlTextWriter.WriteEndElement();
+            }
+        }
+
+        private int GetMaxRequestLength()
+        {
+            var appSetting = Convert.ToInt32(ConfigurationManager.AppSettings["DesktopMediaUploaderMaxRequestLength"]);
+            if (appSetting > 0)
+                return appSetting;
+
+            var configXml = new XmlDocument();
+            configXml.PreserveWhitespace = true;
+            configXml.Load(HttpContext.Current.Server.MapPath("/web.config"));
+
+            var requestLimitsNode = configXml.SelectSingleNode("//configuration/system.webServer/security/requestFiltering/requestLimits");
+            if (requestLimitsNode != null)
+            {
+                if (requestLimitsNode.Attributes["maxAllowedContentLength"] != null)
+                {
+                    var maxAllowedContentLength = Convert.ToInt32(requestLimitsNode.Attributes["maxAllowedContentLength"].Value);
+                    if (maxAllowedContentLength > 0)
+                        return maxAllowedContentLength;
+                }
+            }
+
+            var httpRuntime = ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection;
+            if (httpRuntime != null)
+                return httpRuntime.MaxRequestLength;
+
+            return 4096;
+        }
+
+        private Media GetOrCreateFolder(Media parent, string name)
+        {
+            var children = parent.Id == -1 ? Media.GetRootMedias() : parent.Children;
+            if (children.Length > 0)
+            {
+                foreach (var node in children.Where(node => node.Text.ToLower() == name.ToLower()))
+                {
+                    return node;
+                }
+            }
+
+            var media = Media.MakeNew(name, MediaType.GetByAlias("Folder"), User.GetUser(0), parent.Id);
+            media.sortOrder = 0;
+            media.Save();
+
+            return media;
+        }
+
+        #endregion
+    }
+}

umbraco/presentation/umbracobase/baseHttpModule.cs

@@ -28,7 +28,7 @@ namespace umbraco.presentation.umbracobase
 
         public void Init(HttpApplication httpApp)
         {
-            //            httpApp.PostAuthorizeRequest += new EventHandler(httpApp_PreRequestHandlerExecute);
+            //httpApp.PostAuthorizeRequest += new EventHandler(httpApp_PreRequestHandlerExecute);
             httpApp.PostAcquireRequestState += new EventHandler(httpApp_PostAcquireRequestState);
             httpApp.PostMapRequestHandler += new EventHandler(httpApp_PostMapRequestHandler);
         }
@@ -39,10 +39,10 @@ namespace umbraco.presentation.umbracobase
             HttpApplication httpApp = (HttpApplication)sender;
             string url = httpApp.Context.Request.RawUrl;
 
+            string urlStart = IO.IOHelper.ResolveUrl( IO.SystemDirectories.Base ).TrimEnd('/').ToLower() + "/";
 
-            if (url.ToLower().StartsWith("/base/"))
+            if (url.ToLower().StartsWith(urlStart))
             {
-
                 if (httpApp.Context.Handler is IReadOnlySessionState || httpApp.Context.Handler is IRequiresSessionState)
                 {
                     // no need to replace the current handler
@@ -51,7 +51,6 @@ namespace umbraco.presentation.umbracobase
 
                 // swap the current handler
                 httpApp.Context.Handler = new MyHttpHandler(httpApp.Context.Handler);
-
             }
         }
 
@@ -61,10 +60,10 @@ namespace umbraco.presentation.umbracobase
 
             //remove extension and split the url
             string url = httpApp.Context.Request.RawUrl;
+            string urlStart = IO.IOHelper.ResolveUrl(IO.SystemDirectories.Base).TrimEnd('/').ToLower() + "/";
 
-
-            if (url.ToLower().StartsWith("/base/"))
-            {
+            if (url.ToLower().StartsWith(urlStart))
+            {                
                 MyHttpHandler resourceHttpHandler = HttpContext.Current.Handler as MyHttpHandler;
 
                 if (resourceHttpHandler != null)
@@ -73,6 +72,11 @@ namespace umbraco.presentation.umbracobase
                     HttpContext.Current.Handler = resourceHttpHandler.OriginalHandler;
                 }
 
+                string basedir = "/" + IO.SystemDirectories.Base.TrimStart('~').Trim('/') + "/";
+                int indexOfBase = url.ToLower().IndexOf(basedir);
+                url = url.Substring(indexOfBase);
+
+
                 if (url.ToLower().Contains(".aspx"))
                     url = url.Substring(0, url.IndexOf(".aspx"));
 

umbraco/presentation/web.STANDARD.config

@@ -199,6 +199,11 @@
             <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
             <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
         </handlers>
+
+      <staticContent>
+        <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+      </staticContent>
+
     </system.webServer>
 
 

umbraco/presentation/web.config

@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
+    <configSections >
+        <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
+        <!--
       <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
     
 
       ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
       USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
       -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+
+        <!--<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">
@@ -20,183 +21,204 @@
         </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" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="Data Source=.\SQLEXPRESS;Initial Catalog=Dev.Umbraco.4x;integrated security=false;user id=umbraco;pwd=umbraco" />
-    <add key="umbracoConfigurationStatus" value="" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_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" />
-    <!-- 
+
+        <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" requirePermission="false"/>
+        <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false"/>
+        <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false"/>
+    </configSections>
+    <urlrewritingnet configSource="config\UrlRewriting.config" />
+    <!-- <microsoft.scripting configSource="config\scripting.config" />-->
+    <clientDependency configSource="config\ClientDependency.config" />
+    <Examine configSource="config\ExamineSettings.config" />
+    <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+
+    <appSettings>
+        <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=umbraco;user id=web;password=farmer" />
+        <add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
+        <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+        <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+        <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+        <add key="umbracoStorageDirectory" value="~/App_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" />
+
+        <!-- 
       Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
       Alex Norcliffe 2010 02 for 4.1
     -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-  </appSettings>
-  <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, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <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" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <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.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, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.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>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <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" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <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" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" 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>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+    </appSettings>
+    <system.net>
+        <mailSettings>
+            <smtp>
+                <network host="127.0.0.1" userName="username" password="password" />
+            </smtp>
+        </mailSettings>
+    </system.net>
+
+    <connectionStrings>
+        <remove name="LocalSqlServer" />
+        <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
+    </connectionStrings>
+    <system.web>
+        <httpRuntime requestValidationMode="2.0" />
+        <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, umbraco" />
+            <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+            <!-- ASPNETAJAX -->
+            <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <!-- CLIENT DEPENDENCY -->
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        </httpModules>
+        <httpHandlers>
+            <remove verb="*" path="*.asmx"/>
+            <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+            <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" />
+            <!-- CLIENT DEPENDENCY -->
+            <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <!-- SPELL CHECKER -->
+            <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.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, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
+                <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+                <!--<add assembly="Microsoft.Scripting, Version=1.0.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>
+
+    <system.webServer>
+        <validation validateIntegratedModeConfiguration="false" />
+        <modules>
+            <remove name="ScriptModule" />
+            <remove name="UrlRewriteModule" />
+            <remove name="umbracoRequestModule" />
+            <remove name="viewstateMoverModule" />
+            <remove name="umbracoBaseRequestModule" />
+            <remove name="ClientDependencyModule" />
+
+            <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" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+        </modules>
+
+        <handlers accessPolicy="Read, Write, Script, Execute">
+            <remove name="WebServiceHandlerFactory-Integrated" />
+            <remove name="ScriptHandlerFactory" />
+            <remove name="ScriptHandlerFactoryAppServices" />
+            <remove name="ScriptResource" />
+            <remove name="Channels" />
+            <remove name="Channels_Word" />
+            <remove name="ClientDependency" />
+            <remove name="SpellChecker" />
+
+            <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" />
+            <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+            <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+            <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+            <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
+        </handlers>
+
+      <staticContent>
+        <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+      </staticContent>
+
+    </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>
+
+
+    <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"/>
@@ -207,5 +229,6 @@
       </dependentAssembly>
     </assemblyBinding>
 -->
-  </runtime>
+    </runtime>
+
 </configuration>